Fixing https://github.com/Cadasta/cadasta-platform/issues/632

cadasta/organization/fields.py

@@ -7,7 +7,8 @@ def __init__(self, user, *args, **kwargs):
         super().__init__(*args, **kwargs)
         self.user = user
         choices = kwargs.get('choices', ())
-        self.widget = ProjectRoleWidget(user=user, choices=choices)
+        role = kwargs.get('initial', ())
+        self.widget = ProjectRoleWidget(user=user, role=role, choices=choices)
 
 
 class PublicPrivateField(forms.CharField):

cadasta/organization/tests/test_widgets.py

@@ -15,7 +15,9 @@ def setUp(self):
             email='[email protected]',
             full_name='Bob Smith'
         )
-        self.widget = ProjectRoleWidget(user=self.user, choices=FORM_CHOICES)
+        self.widget = ProjectRoleWidget(user=self.user,
+                                        role='A',
+                                        choices=FORM_CHOICES)
 
     def test_render_with_admin(self):
         html = self.widget.render(self.user.username, 'A')
@@ -34,7 +36,36 @@ def test_render_with_admin(self):
         )
         assert expected == html
 
+    def test_render_with_admin_next_page_submission(self):
+        """
+            When admin user submit member permission page when clicking
+            previous and come back again to member permission page,
+            widget gets None as value for admin user. So additional
+            role parameter added to widget to check user is a Administrative
+            user or not
+        """
+        html = self.widget.render(self.user.username, None)
+
+        expected = (
+            '<tr>'
+            '  <td>'
+            '    <p>Bob Smith</p>'
+            '    <p>bob</p>'
+            '  </td>'
+            '  <td class="hidden-xs hidden-sm">[email protected]</td>'
+            '  <td>'
+            '    Administrator'
+            '  </td>'
+            '</tr>'
+        )
+        assert expected == html
+
     def test_render_with_manager(self):
+        """
+         Setting widget role attribute to empty as it's initialize
+         as a Administrative user
+        """
+        self.widget.role = ''
         html = self.widget.render(self.user.username, 'PM')
 
         expected = (

cadasta/organization/widgets.py

@@ -16,12 +16,13 @@ class ProjectRoleWidget(Select):
         '</tr>'
     )
 
-    def __init__(self, user, *args, **kwargs):
+    def __init__(self, user, role, *args, **kwargs):
         super().__init__(*args, **kwargs)
         self.user = user
+        self.role = role
 
     def render(self, name, value, attrs=None, choices=()):
-        if value == 'A':
+        if value == 'A' or self.role == 'A':
             select = _("Administrator")
         else:
             select = super().render(name, value, attrs=attrs, choices=choices)