Ticket #5447: add_delete_change_permission.diff

django/newforms/fields.py

@@ -643 +643 @@
         RegexField.__init__(self, ipv4_re,
                             error_message=ugettext(u'Enter a valid IPv4 address.'),
                             *args, **kwargs)
+

django/newforms/widgets.py

@@ -528 +528 @@
 
     def decompress(self, value):
         if value:
-            return [value.date(), value.time()]
+            t=value.time()
+            return [value.date(), '%s:%s:%s'%(t.hour,t.minute,t.second)] # format so we make sure we don't get microseconds
         return [None, None]
-    
- No newline at end of file
+

django/contrib/admin/options.py

@@ -264 +264 @@
         return forms.Media(js=['%s%s' % (settings.ADMIN_MEDIA_PREFIX, url) for url in js])
     media = property(_media)
     
-    def has_add_permission(self, request):
+    def has_add_permission(self, request=None):
         "Returns True if the given request has permission to add an object."
+
+        if not request: return True # we are asking to the ModelAdmin if add is supported (model-wide)
+                                    # user permission check is made with request!=None
+        
         opts = self.opts
         return request.user.has_perm(opts.app_label + '.' + opts.get_add_permission())
 
-    def has_change_permission(self, request, obj):
+    def has_change_permission(self, request=None, obj=None):
         """
         Returns True if the given request has permission to change the given
         Django model instance.
@@ -277 +281 @@
         If `obj` is None, this should return True if the given request has
         permission to change *any* object of the given type.
         """
+        if not request and not obj: return True # we are asking to the ModelAdmin if change is supported (model-wide).
+                                                # user permission check is made with request != None and obj !=None
+
         opts = self.opts
         return request.user.has_perm(opts.app_label + '.' + opts.get_change_permission())
 
-    def has_delete_permission(self, request, obj):
+    def has_delete_permission(self, request=None, obj=None):
         """
         Returns True if the given request has permission to change the given
         Django model instance.
@@ -288 +295 @@
         If `obj` is None, this should return True if the given request has
         permission to delete *any* object of the given type.
         """
+        if not request and not obj: return True # we are asking to the ModelAdmin if delete is supported (model-wide).
+                                                # user permission check is made with request !=None and obj !=None
+
         opts = self.opts
         return request.user.has_perm(opts.app_label + '.' + opts.get_delete_permission())
 
@@ -597 +607 @@
             'is_popup': cl.is_popup,
             'cl': cl,
         })
-        c.update({'has_add_permission': c['perms'][app_label][opts.get_add_permission()]}),
+        c.update({'has_add_permission': self.admin_site._registry[self.model].has_add_permission() and c['perms'][app_label][opts.get_add_permission()]}),
         return render_to_response(['admin/%s/%s/change_list.html' % (app_label, opts.object_name.lower()),
                                 'admin/%s/change_list.html' % app_label,
                                 'admin/change_list.html'], context_instance=c)

django/contrib/admin/views/main.py

@@ -119 +119 @@
     extra_context = {
         'add': add,
         'change': change,
-        'has_delete_permission': context['perms'][app_label][opts.get_delete_permission()],
-        'has_change_permission': context['perms'][app_label][opts.get_change_permission()],
+        'has_add_permission': model_admin.has_add_permission() and context['perms'][app_label][opts.get_add_permission()],
+        'has_delete_permission': model_admin.has_delete_permission() and context['perms'][app_label][opts.get_delete_permission()],
+        'has_change_permission': model_admin.has_change_permission() and context['perms'][app_label][opts.get_change_permission()],
         'has_file_field': True, # FIXME - this should check if form or formsets have a FileField,
         'has_absolute_url': hasattr(model, 'get_absolute_url'),
         'ordered_objects': ordered_objects,

django/contrib/admin/widgets.py

@@ -130 +130 @@
         if rel_to in self.admin_site._registry: # If the related object has an admin interface:
             # TODO: "id_" is hard-coded here. This should instead use the correct
             # API to determine the ID dynamically.
-            output.append(u'<a href="%sadd/" class="add-another" id="add_id_%s" onclick="return showAddAnotherPopup(this);"> ' % \
-                (related_url, name))
-            output.append(u'<img src="%simg/admin/icon_addlink.gif" width="10" height="10" alt="Add Another"/></a>' % settings.ADMIN_MEDIA_PREFIX)
+            if self.admin_site._registry[rel_to].has_add_permission():
+                output.append(u'<a href="%sadd/" class="add-another" id="add_id_%s" onclick="return showAddAnotherPopup(this);"> ' % \
+                                  (related_url, name))
+                output.append(u'<img src="%simg/admin/icon_addlink.gif" width="10" height="10" alt="Add Another"/></a>' % settings.ADMIN_MEDIA_PREFIX)
         return u''.join(output)
 
     def __deepcopy__(self, memo):

django/contrib/admin/sites.py

@@ -262 +262 @@
 
             if has_module_perms:
                 perms = {
-                    'add': user.has_perm("%s.%s" % (app_label, model._meta.get_add_permission())),
-                    'change': user.has_perm("%s.%s" % (app_label, model._meta.get_change_permission())),
-                    'delete': user.has_perm("%s.%s" % (app_label, model._meta.get_delete_permission())),
+                    'add': model_admin.has_add_permission() and user.has_perm("%s.%s" % (app_label, model._meta.get_add_permission())),
+                    'change': model_admin.has_change_permission() and user.has_perm("%s.%s" % (app_label, model._meta.get_change_permission())),
+                    'delete': model_admin.has_delete_permission() and user.has_perm("%s.%s" % (app_label, model._meta.get_delete_permission())),
                 }
-
+                
                 # Check whether user has any perm for this module.
                 # If so, add the module to the model_list.
                 if True in perms.values():