Django

Code

Changeset 7923

Show
Ignore:
Timestamp:
07/14/08 23:37:43 (4 months ago)
Author:
jkocherhans
Message:

newforms-admin: Removed some places where model was being passed around for no reason.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • django/branches/newforms-admin/django/contrib/admin/options.py

    r7919 r7923  
    353353            yield inline.get_formset(request, obj) 
    354354 
    355     def save_add(self, request, model, form, formsets, post_url_continue): 
     355    def save_add(self, request, form, formsets, post_url_continue): 
    356356        """ 
    357357        Saves the object in the "add" stage and returns an HttpResponseRedirect. 
    …… 
    360360        """ 
    361361        from django.contrib.admin.models import LogEntry, ADDITION 
    362         opts = model._meta 
     362        opts = self.model._meta 
    363363        new_object = form.save(commit=True) 
    364364 
    …… 
    371371 
    372372        pk_value = new_object._get_pk_val() 
    373         LogEntry.objects.log_action(request.user.id, ContentType.objects.get_for_model(model).id, pk_value, force_unicode(new_object), ADDITION) 
     373        LogEntry.objects.log_action(request.user.id, ContentType.objects.get_for_model(self.model).id, pk_value, force_unicode(new_object), ADDITION) 
    374374        msg = _('The %(name)s "%(obj)s" was added successfully.') % {'name': opts.verbose_name, 'obj': new_object} 
    375375        # Here, we distinguish between different save types by checking for 
    …… 
    400400    save_add = transaction.commit_on_success(save_add) 
    401401 
    402     def save_change(self, request, model, form, formsets=None): 
     402    def save_change(self, request, form, formsets=None): 
    403403        """ 
    404404        Saves the object in the "change" stage and returns an HttpResponseRedirect. 
    …… 
    409409        """ 
    410410        from django.contrib.admin.models import LogEntry, CHANGE 
    411         opts = model._meta 
     411        opts = self.model._meta 
    412412        new_object = form.save(commit=True) 
    413413        pk_value = new_object._get_pk_val() 
    …… 
    440440        if not change_message: 
    441441            change_message = _('No fields changed.') 
    442         LogEntry.objects.log_action(request.user.id, ContentType.objects.get_for_model(model).id, pk_value, force_unicode(new_object), CHANGE, change_message) 
     442        LogEntry.objects.log_action(request.user.id, ContentType.objects.get_for_model(self.model).id, pk_value, force_unicode(new_object), CHANGE, change_message) 
    443443 
    444444        msg = _('The %(name)s "%(obj)s" was changed successfully.') % {'name': opts.verbose_name, 'obj': new_object} 
    …… 
    460460    save_change = transaction.commit_on_success(save_change) 
    461461 
    462     def render_change_form(self, request, model, context, add=False, change=False, form_url='', obj=None): 
    463         opts = model._meta 
     462    def render_change_form(self, request, context, add=False, change=False, form_url='', obj=None): 
     463        opts = self.model._meta 
    464464        app_label = opts.app_label 
    465465        ordered_objects = opts.get_ordered_objects() 
    …… 
    471471            'has_delete_permission': self.has_delete_permission(request, obj), 
    472472            'has_file_field': True, # FIXME - this should check if form or formsets have a FileField, 
    473             'has_absolute_url': hasattr(model, 'get_absolute_url'), 
     473            'has_absolute_url': hasattr(self.model, 'get_absolute_url'), 
    474474            'ordered_objects': ordered_objects, 
    475475            'form_url': mark_safe(form_url), 
    476476            'opts': opts, 
    477             'content_type_id': ContentType.objects.get_for_model(model).id, 
     477            'content_type_id': ContentType.objects.get_for_model(self.model).id, 
    478478            'save_as': self.save_as, 
    479479            'save_on_top': self.save_on_top, 
    …… 
    512512                inline_formsets.append(inline_formset) 
    513513            if all_valid(inline_formsets) and form.is_valid(): 
    514                 return self.save_add(request, model, form, inline_formsets, '../%s/') 
     514                return self.save_add(request, form, inline_formsets, '../%s/') 
    515515        else: 
    516516            form = ModelForm(initial=dict(request.GET.items())) 
    …… 
    541541        } 
    542542        context.update(extra_context or {}) 
    543         return self.render_change_form(request, model, context, add=True) 
     543        return self.render_change_form(request, context, add=True) 
    544544 
    545545    def change_view(self, request, object_id, extra_context=None): 
    …… 
    575575 
    576576            if all_valid(inline_formsets) and form.is_valid(): 
    577                 return self.save_change(request, model, form, inline_formsets) 
     577                return self.save_change(request, form, inline_formsets) 
    578578        else: 
    579579            form = ModelForm(instance=obj) 
    …… 
    619619        } 
    620620        context.update(extra_context or {}) 
    621         return self.render_change_form(request, model, context, change=True, obj=obj) 
     621        return self.render_change_form(request, context, change=True, obj=obj) 
    622622 
    623623    def changelist_view(self, request, extra_context=None):