Merge pull request #549 from Cadasta/bugfix/#543

Fix #543: Always show logged-in user's full name or username in page …

cadasta/organization/tests/test_views_default_organizations.py

@@ -709,7 +709,6 @@ def test_get_with_authorized_user(self):
         context['organization'] = self.org
         context['form'] = forms.EditOrganizationMemberForm(
             None, self.org, self.member)
-        context['user'] = self.member
 
         expected = render_to_string(
             'organization/organization_members_edit.html',

cadasta/organization/views/default.py

@@ -177,6 +177,11 @@ def get_success_url(self):
     def get_queryset(self):
         return self.get_organization().users.all()
 
+    def get_context_object_name(self, obj):
+        # Dummy context so that the currently viewed user does not
+        # override the logged-in user
+        return 'org_member'
+
     def get_form(self):
         if self.request.method == 'POST':
             return self.form_class(self.request.POST,