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

diff --combined planetstack/core/admin.py
index 8ec00a9,cef140b..39520ae
--- 1/planetstack/core/admin.py
--- 2/planetstack/core/admin.py
+++ b/planetstack/core/admin.py
@@@ -1107,9 -1107,9 +1107,9 @@@ class TagAdmin(PlanetStackBaseAdmin)
  class SliverAdmin(PlanetStackBaseAdmin):
      form = SliverForm
      fieldsets = [
 -        ('Sliver Details', {'fields': ['backend_status_text', 'slice', 'deployment', 'node', 'ip', 'instance_id', 'instance_name', 'flavor', 'image', ], 'classes': ['suit-tab suit-tab-general'], })
 +        ('Sliver Details', {'fields': ['backend_status_text', 'slice', 'deployment', 'node', 'ip', 'instance_id', 'instance_name', 'flavor', 'image', 'ssh_command'], 'classes': ['suit-tab suit-tab-general'], })
      ]
 -    readonly_fields = ('backend_status_text', )
 +    readonly_fields = ('backend_status_text', 'ssh_command', )
      list_display = ['backend_status_icon', 'ip', 'instance_id', 'instance_name', 'slice', 'flavor', 'image', 'node', 'deployment']
      list_display_links = ('backend_status_icon', 'ip',)
  
@@@ -1119,13 -1119,6 +1119,13 @@@
  
      user_readonly_fields = ['slice', 'deployment', 'node', 'ip', 'instance_name', 'flavor', 'image']
  
 +    def ssh_command(self, obj):
 +        ssh_command = obj.get_ssh_command()
 +        if ssh_command:
 +            return ssh_command
 +        else:
 +            return "(not available)"
 +
      def formfield_for_foreignkey(self, db_field, request, **kwargs):
          if db_field.name == 'slice':
              kwargs['queryset'] = Slice.select_by_user(request.user)
@@@ -1141,9 -1134,11 +1141,9 @@@
      def get_formsets(self, request, obj=None):
          # make some fields read only if we are updating an existing record
          if obj == None:
 -            #self.readonly_fields = ('ip', 'instance_name')
 -            self.readonly_fields = ('backend_status_text',)
 +            self.readonly_fields = ('backend_status_text', 'ssh_command', )
          else:
 -            self.readonly_fields = ('backend_status_text',)
 -            #self.readonly_fields = ('ip', 'instance_name', 'slice', 'image', 'key')
 +            self.readonly_fields = ('backend_status_text', 'ssh_command',)
  
          for inline in self.get_inline_instances(request, obj):
              # hide MyInline in the add view
@@@ -1259,7 -1254,7 +1259,7 @@@ class UserAdmin(PermissionCheckingAdmin
      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 -1290,15 +1295,15 @@@
      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