From: Scott Baker Date: Fri, 23 May 2014 19:05:11 +0000 (-0700) Subject: make user contact fields RO for RO user, fix unable to add deployment to user in... X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=3ca51f6a7c1a8de890f96543fb474742cf5c746c;p=plstackapi.git make user contact fields RO for RO user, fix unable to add deployment to user in user admin --- diff --git a/planetstack/core/admin.py b/planetstack/core/admin.py index 2d0e714..767c65e 100644 --- a/planetstack/core/admin.py +++ b/planetstack/core/admin.py @@ -317,13 +317,13 @@ class DeploymentPrivilegeROInline(ReadOnlyTabularInline): model = DeploymentPrivilege extra = 0 suit_classes = 'suit-tab suit-tab-deploymentprivileges' - fields = ['user','role'] + fields = ['user','role','deployment'] class DeploymentPrivilegeInline(PlStackTabularInline): model = DeploymentPrivilege extra = 0 suit_classes = 'suit-tab suit-tab-deploymentprivileges' - fields = ['user','role'] + fields = ['user','role','deployment'] def queryset(self, request): return DeploymentPrivilege.select_by_user(request.user) @@ -949,7 +949,7 @@ class UserAdmin(UserAdmin): ordering = ('email',) filter_horizontal = () - user_readonly_fields = fieldListLoginDetails + user_readonly_fields = fieldListLoginDetails + fieldListContactInfo user_readonly_inlines = [SlicePrivilegeROInline,SitePrivilegeROInline,DeploymentPrivilegeROInline,UserDashboardViewROInline] suit_form_tabs =(('general','Login Details'),