From: Scott Baker <smbaker@gmail.com>
Date: Mon, 26 Jan 2015 06:16:24 +0000 (-0800)
Subject: Merge branch 'master' of ssh://git.planet-lab.org/git/plstackapi
X-Git-Url: http://git.onelab.eu/?p=plstackapi.git;a=commitdiff_plain;h=ef9db61058e6c5891721e997614c6c76905c230a;hp=ab385c86e10475c711c350f1ddf1cca0c2accd65

Merge branch 'master' of ssh://git.planet-lab.org/git/plstackapi
---

diff --git a/planetstack/core/admin.py b/planetstack/core/admin.py
index 8ec00a9..39520ae 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_readonly', 'phone', 'public_key','password1', 'password2')},
+            'fields': ('site', 'email', 'firstname', 'lastname', 'is_admin','is_admin', 'is_readonly', 'phone', 'public_key','password1', 'password2')},
         ),
     )
     readonly_fields = ('backend_status_text', )
@@ -1295,6 +1295,15 @@ class UserAdmin(PermissionCheckingAdminMixin, UserAdmin):
     def queryset(self, request):
         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') 
+        return super(UserAdmin, self).get_form(request, obj, **kwargs)     
+
 class ControllerDashboardViewInline(PlStackTabularInline):
     model = ControllerDashboardView
     extra = 0