--- options.py.orig 2010-10-12 17:24:09.196883635 +0400
+++ options.py 2010-10-12 18:03:16.891884403 +0400
@@ -23,6 +23,7 @@
from django.utils.translation import ugettext as _
from django.utils.translation import ungettext, ugettext_lazy
from django.utils.encoding import force_unicode
+from django.conf import settings
HORIZONTAL, VERTICAL = 1, 2
# returns the
class for a given radio_admin field
@@ -265,8 +266,6 @@
urls = property(urls)
def _media(self):
- from django.conf import settings
-
js = ['js/core.js', 'js/admin/RelatedObjectLookups.js',
'js/jquery.min.js', 'js/jquery.init.js']
if self.actions is not None:
@@ -605,6 +604,11 @@
def render_change_form(self, request, context, add=False, change=False, form_url='', obj=None):
opts = self.model._meta
app_label = opts.app_label
+ app_name = app_label.title()
+ try:
+ app_name = settings.APP_NAMES[app_label]
+ except:
+ pass
ordered_objects = opts.get_ordered_objects()
context.update({
'add': add,
@@ -617,6 +621,7 @@
'ordered_objects': ordered_objects,
'form_url': mark_safe(form_url),
'opts': opts,
+ 'app_name': app_name,
'content_type_id': ContentType.objects.get_for_model(self.model).id,
'save_as': self.save_as,
'save_on_top': self.save_on_top,
@@ -836,6 +841,12 @@
inline_admin_formsets.append(inline_admin_formset)
media = media + inline_admin_formset.media
+ app_name = opts.app_label.title()
+ try:
+ app_name = settings.APP_NAMES[app_label]
+ except:
+ pass
+
context = {
'title': _('Add %s') % force_unicode(opts.verbose_name),
'adminform': adminForm,
@@ -846,6 +857,7 @@
'errors': helpers.AdminErrorList(form, formsets),
'root_path': self.admin_site.root_path,
'app_label': opts.app_label,
+ 'app_name': app_name,
}
context.update(extra_context or {})
return self.render_change_form(request, context, form_url=form_url, add=True)
@@ -927,6 +939,12 @@
inline_admin_formsets.append(inline_admin_formset)
media = media + inline_admin_formset.media
+ app_name = opts.app_label.title()
+ try:
+ app_name = settings.APP_NAMES[app_label]
+ except:
+ pass
+
context = {
'title': _('Change %s') % force_unicode(opts.verbose_name),
'adminform': adminForm,
@@ -938,6 +956,7 @@
'errors': helpers.AdminErrorList(form, formsets),
'root_path': self.admin_site.root_path,
'app_label': opts.app_label,
+ 'app_name': app_name,
}
context.update(extra_context or {})
return self.render_change_form(request, context, change=True, obj=obj)
@@ -948,6 +967,13 @@
from django.contrib.admin.views.main import ERROR_FLAG
opts = self.model._meta
app_label = opts.app_label
+
+ app_name = opts.app_label.title()
+ try:
+ app_name = settings.APP_NAMES[app_label]
+ except:
+ pass
+
if not self.has_change_permission(request, None):
raise PermissionDenied
@@ -1077,6 +1103,7 @@
'has_add_permission': self.has_add_permission(request),
'root_path': self.admin_site.root_path,
'app_label': app_label,
+ 'app_name': app_name,
'action_form': action_form,
'actions_on_top': self.actions_on_top,
'actions_on_bottom': self.actions_on_bottom,
@@ -1095,6 +1122,11 @@
"The 'delete' admin view for this model."
opts = self.model._meta
app_label = opts.app_label
+ app_name = opts.app_label.title()
+ try:
+ app_name = settings.APP_NAMES[app_label]
+ except:
+ pass
obj = self.get_object(request, unquote(object_id))
@@ -1130,6 +1162,7 @@
"opts": opts,
"root_path": self.admin_site.root_path,
"app_label": app_label,
+ "app_name": app_name,
}
context.update(extra_context or {})
context_instance = template.RequestContext(request, current_app=self.admin_site.name)
@@ -1145,6 +1178,11 @@
model = self.model
opts = model._meta
app_label = opts.app_label
+ app_name = opts.app_label.title()
+ try:
+ app_name = settings.APP_NAMES[app_label]
+ except:
+ pass
action_list = LogEntry.objects.filter(
object_id = object_id,
content_type__id__exact = ContentType.objects.get_for_model(model).id
@@ -1158,6 +1196,7 @@
'object': obj,
'root_path': self.admin_site.root_path,
'app_label': app_label,
+ 'app_name': app_name,
}
context.update(extra_context or {})
context_instance = template.RequestContext(request, current_app=self.admin_site.name)
@@ -1224,7 +1263,6 @@
self.verbose_name_plural = self.model._meta.verbose_name_plural
def _media(self):
- from django.conf import settings
js = ['js/jquery.min.js', 'js/jquery.init.js', 'js/inlines.min.js']
if self.prepopulated_fields:
js.append('js/urlify.js')