X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=planetstack%2Fcore%2Fadmin.py;h=f775652503e9a78ce6ead926b02f9f386b13e050;hb=dfa869c3f26ad311777b9c6983dc8a6dd06adac3;hp=d78435d591c2d5f05db09b67c056c6f78e7a0566;hpb=d71a5dab1c155a039187548cce570f0712a8f162;p=plstackapi.git

diff --git a/planetstack/core/admin.py b/planetstack/core/admin.py
index d78435d..f775652 100644
--- a/planetstack/core/admin.py
+++ b/planetstack/core/admin.py
@@ -1259,7 +1259,7 @@ class UserAdmin(PermissionCheckingAdminMixin, UserAdmin):
     add_fieldsets = (
         (None, {
             'classes': ('wide',),
-            'fields': ('site', 'email', 'firstname', 'lastname', 'is_admin','is_admin', 'is_readonly', 'phone', 'public_key','password1', 'password2')},
+            'fields': ('site', 'email', 'firstname', 'lastname', 'is_admin', 'is_readonly', 'phone', 'public_key','password1', 'password2')},
         ),
     )
     readonly_fields = ('backend_status_text', )
@@ -1296,12 +1296,21 @@ class UserAdmin(PermissionCheckingAdminMixin, UserAdmin):
         return User.select_by_user(request.user)
 
     def get_form(self, request, obj=None, **kwargs):
-        if not request.user.is_admin:
-            self.fieldsets = (
-                ('Login Details', {'fields': ['backend_status_text', 'email', 'site','password','public_key'], 'classes':['suit-tab suit-tab-general']}),
-                ('Contact Information', {'fields': ('firstname','lastname','phone', 'timezone'), 'classes':['suit-tab suit-tab-contact']}),
-            )
-            self.readonly_fields = ('backend_status_text', 'site') 
+        # copy login details list
+        login_details_fields = list(self.fieldListLoginDetails)
+        if not request.user.is_admin :
+            # only admins can see 'is_admin' and 'is_readonly' fields 
+            if 'is_admin' in login_details_fields:
+                login_details_fields.remove('is_admin')
+            if 'is_readonly' in login_details_fields:
+                login_details_fields.remove('is_readonly') 
+            if not request.user.siteprivileges.filter(role__role = 'pi'):
+                # only admins and pis can change a user's site  
+                self.readonly_fields = ('backend_status_text', 'site') 
+        self.fieldsets = (
+            ('Login Details', {'fields': login_details_fields, 'classes':['suit-tab suit-tab-general']}),
+            ('Contact Information', {'fields': self.fieldListContactInfo, 'classes':['suit-tab suit-tab-contact']}),
+        )
         return super(UserAdmin, self).get_form(request, obj, **kwargs)     
 
 class ControllerDashboardViewInline(PlStackTabularInline):