use a managed_user property to differentiate admin, non-admin and system

users. rockstor#688
Mchakravartula · Jul 6, 2015 · a768c5b · a768c5b
1 parent d01bc36
commit a768c5b
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 2 deletions.
diff --git a/src/rockstor/storageadmin/models/user.py b/src/rockstor/storageadmin/models/user.py
@@ -47,5 +47,13 @@ def groupname(self, *args, **kwargs):
             return grp.getgrgid(self.gid).gr_name
         return None
 
+    @property
+    def managed_user(self, *args, **kwargs):
+        return getattr(self, 'editable', True)
+
+    @managed_user.setter
+    def managed_user(self, val, *args, **kwargs):
+        self.editable = val
+
     class Meta:
         app_label = 'storageadmin'
diff --git a/src/rockstor/storageadmin/serializers.py b/src/rockstor/storageadmin/serializers.py
@@ -75,6 +75,7 @@ class Meta:
 
 class SUserSerializer(serializers.ModelSerializer):
     groupname = serializers.CharField()
+    managed_user = serializers.BooleanField(default=True)
 
     class Meta:
         model = User

diff --git a/src/rockstor/storageadmin/static/storageadmin/js/templates/users/users.jst b/src/rockstor/storageadmin/static/storageadmin/js/templates/users/users.jst
@@ -85,8 +85,11 @@
             <td><%= user.get('gid') %></td>
 	    <td><%= user.get('shell') %></td>
             <td>
+	      <% if (user.get('managed_user')) { %>
+	      <a href="#" class="edit-user" data-username="<%= user.get('username') %>" rel="tooltip" title="Edit user"><i class="glyphicon glyphicon-pencil"></i></a>
               <a href="#" class="delete-user" data-username="<%= user.get('username') %>" rel="tooltip" title="Delete user"><i class="glyphicon glyphicon-trash"></i></a>
             </td>
+	    <% } %>
           </tr>
 	  <% } %>
         <% }); %>

diff --git a/src/rockstor/storageadmin/views/ug_helpers.py b/src/rockstor/storageadmin/views/ug_helpers.py
@@ -59,8 +59,10 @@ def combined_users():
             uo.save()
             users.append(uo)
         except User.DoesNotExist:
-            users.append(User(username=u, uid=sys_users[u][0],
-                              gid=sys_users[u][1], admin=False))
+            temp_uo = User(username=u, uid=sys_users[u][0],
+                           gid=sys_users[u][1], admin=False)
+            temp_uo.managed_user = False
+            users.append(temp_uo)
     for u in User.objects.all():
         if (u.username not in uname_list):
             users.append(u)