# HG changeset patch # User ymh # Date 1469226930 -7200 # Node ID e1875fb5dac0a887519c70ae0a28899abc5cd01b # Parent 96e011e2633cba7718e99e6448ebfee1bb590e0b Invert middleware and add case when user is anonymous diff -r 96e011e2633c -r e1875fb5dac0 server/src/metaeducation/settings/__init__.py --- a/server/src/metaeducation/settings/__init__.py Fri Jul 22 23:57:32 2016 +0200 +++ b/server/src/metaeducation/settings/__init__.py Sat Jul 23 00:35:30 2016 +0200 @@ -72,9 +72,8 @@ 'django.contrib.messages.middleware.MessageMiddleware', 'django.middleware.clickjacking.XFrameOptionsMiddleware', 'django.middleware.security.SecurityMiddleware','guardian.backends.ObjectPermissionBackend', + 'metaeducation.tracking.middleware.TrackingMiddleware', 'metaeducation.middleware.MtdcLoginRequiredWithContextMiddleware', - 'metaeducation.tracking.middleware.TrackingMiddleware' - ) ROOT_URLCONF = 'metaeducation.urls' diff -r 96e011e2633c -r e1875fb5dac0 server/src/metaeducation/views/renkan.py --- a/server/src/metaeducation/views/renkan.py Fri Jul 22 23:57:32 2016 +0200 +++ b/server/src/metaeducation/views/renkan.py Sat Jul 23 00:35:30 2016 +0200 @@ -55,7 +55,7 @@ def get(self, request, *args, **kwargs): renkan = get_object_or_404(Renkan.objects.select_related('current_revision'), renkan_guid=kwargs['renkan_guid']) context = self.get_context_data(**kwargs) - send_open_read_renkan(renkan, str(request.user.external_id), str(context['registration'])) + send_open_read_renkan(renkan, str(getattr(request.user,'external_id', 'n/a')), str(context['registration'])) return self.render_to_response(context) @@ -70,7 +70,7 @@ def get(self, request, *args, **kwargs): renkan = get_object_or_404(Renkan.objects.select_related('current_revision'), renkan_guid=kwargs['renkan_guid']) context = self.get_context_data(**kwargs) - send_open_edit_renkan(renkan, str(request.user.external_id), str(context['registration'])) + send_open_edit_renkan(renkan, str(getattr(request.user,'external_id', 'n/a')), str(context['registration'])) return self.render_to_response(context) class DeleteForm(forms.Form):