Merge branch 'django1.7' of github.com:sshwsfc/django-xadmin into django1.7

Author: sshwsfc

demo_app/app/adminx.py

@@ -43,7 +43,7 @@ class MaintainInline(object):
 
 
 class IDCAdmin(object):
-    list_display = ('name', 'description', 'create_time','host__name')
+    list_display = ('name', 'description', 'create_time')
     list_display_links = ('name',)
     wizard_form_list = [
         ('First\'s Form', ('name', 'description')),

demo_app/app/tests.py

@@ -0,0 +1,3 @@
+from django.test import TestCase
+
+# Create your tests here.

demo_app/data.db

@@ -2,13 +2,11 @@
 
 # Uncomment the next two lines to enable the admin:
 import xadmin
-xadmin.autodiscover()
 
 # from xadmin.plugins import xversion
 # xversion.register_models()
 
 from django.contrib import admin
-admin.autodiscover()
 
 urlpatterns = patterns('',
     url(r'^admin/', include(admin.site.urls)),

demo_app/demo/urls.py

@@ -1,2 +1,2 @@
-django>=1.5
+django>=1.7
 django-crispy-forms>=1.4.0

requirements.txt

@@ -65,3 +65,5 @@ def autodiscover():
             # attempting to import it, otherwise we want it to bubble up.
             if module_has_submodule(mod, 'adminx'):
                 raise
+
+default_app_config = 'xadmin.apps.XAdminConfig'

xadmin/__init__.py

@@ -0,0 +1,13 @@
+from django.apps import AppConfig
+from django.core import checks
+from django.utils.translation import ugettext_lazy as _
+
+
+class XAdminConfig(AppConfig):
+    """Simple AppConfig which does not do automatic discovery."""
+
+    name = 'xadmin'
+    verbose_name = _("Administration")
+
+    def ready(self):
+        self.module.autodiscover()

xadmin/apps.py

@@ -333,7 +333,7 @@ def __init__(self, field, request, params, model, model_admin, field_path):
             self.lookup_title = other_model._meta.verbose_name
         self.title = self.lookup_title
         self.search_url = model_admin.get_admin_url('%s_%s_changelist' % (
-            other_model._meta.app_label, other_model._meta.module_name))
+            other_model._meta.app_label, other_model._meta.model_name))
         self.label = self.label_for_value(other_model, rel_name, self.lookup_exact_val) if self.lookup_exact_val else ""
         self.choices = '?'
         if field.rel.limit_choices_to:

xadmin/filters.py

@@ -742,8 +742,8 @@ msgstr "Klicken Sie hier, um alle Objekte über alle Seiten hinweg auszuwählen.
 
 #: templates/xadmin/blocks/model_list.results_bottom.actions.html:19
 #, python-format
-msgid "Select all %(total_count)s %(module_name)s"
-msgstr "Alles auswählen %(total_count)s %(module_name)s"
+msgid "Select all %(total_count)s %(model_name)s"
+msgstr "Alles auswählen %(total_count)s %(model_name)s"
 
 #: templates/xadmin/blocks/model_list.results_bottom.actions.html:20
 msgid "Clear selection"

xadmin/locale/de_DE/LC_MESSAGES/django.mo

@@ -738,7 +738,7 @@ msgstr ""
 
 #: templates/xadmin/blocks/model_list.results_bottom.actions.html:19
 #, python-format
-msgid "Select all %(total_count)s %(module_name)s"
+msgid "Select all %(total_count)s %(model_name)s"
 msgstr ""
 
 #: templates/xadmin/blocks/model_list.results_bottom.actions.html:20

xadmin/locale/de_DE/LC_MESSAGES/django.po

@@ -754,8 +754,8 @@ msgstr "Haz clic aquí para seleccionar los objetos a través de todas las pági
 
 #: templates/xadmin/blocks/model_list.results_bottom.actions.html:19
 #, python-format
-msgid "Select all %(total_count)s %(module_name)s"
-msgstr "Seleccionar todo %(total_count)s %(module_name)s"
+msgid "Select all %(total_count)s %(model_name)s"
+msgstr "Seleccionar todo %(total_count)s %(model_name)s"
 
 #: templates/xadmin/blocks/model_list.results_bottom.actions.html:20
 msgid "Clear selection"

xadmin/locale/en/LC_MESSAGES/django.po

@@ -740,8 +740,8 @@ msgstr "Klikatu hemen orrialde guztiko objetuak aukeratzeko"
 
 #: templates/xadmin/blocks/model_list.results_bottom.actions.html:19
 #, python-format
-msgid "Select all %(total_count)s %(module_name)s"
-msgstr "Aukeratu %(total_count)s %(module_name)sak"
+msgid "Select all %(total_count)s %(model_name)s"
+msgstr "Aukeratu %(total_count)s %(model_name)sak"
 
 #: templates/xadmin/blocks/model_list.results_bottom.actions.html:20
 msgid "Clear selection"

xadmin/locale/es_MX/LC_MESSAGES/django.mo

@@ -730,7 +730,7 @@ msgstr ""
 
 #: templates/xadmin/blocks/model_list.results_bottom.actions.html:19
 #, python-format
-msgid "Select all %(total_count)s %(module_name)s"
+msgid "Select all %(total_count)s %(model_name)s"
 msgstr ""
 
 #: templates/xadmin/blocks/model_list.results_bottom.actions.html:20

xadmin/locale/es_MX/LC_MESSAGES/django.po

@@ -730,7 +730,7 @@ msgstr ""
 
 #: templates/xadmin/blocks/model_list.results_bottom.actions.html:19
 #, python-format
-msgid "Select all %(total_count)s %(module_name)s"
+msgid "Select all %(total_count)s %(model_name)s"
 msgstr ""
 
 #: templates/xadmin/blocks/model_list.results_bottom.actions.html:20

xadmin/locale/eu/LC_MESSAGES/django.mo

@@ -742,7 +742,7 @@ msgstr ""
 
 #: templates/xadmin/blocks/model_list.results_bottom.actions.html:19
 #, python-format
-msgid "Select all %(total_count)s %(module_name)s"
+msgid "Select all %(total_count)s %(model_name)s"
 msgstr ""
 
 #: templates/xadmin/blocks/model_list.results_bottom.actions.html:20

xadmin/locale/eu/LC_MESSAGES/django.po

@@ -736,7 +736,7 @@ msgstr ""
 
 #: templates/xadmin/blocks/model_list.results_bottom.actions.html:19
 #, python-format
-msgid "Select all %(total_count)s %(module_name)s"
+msgid "Select all %(total_count)s %(model_name)s"
 msgstr ""
 
 #: templates/xadmin/blocks/model_list.results_bottom.actions.html:20

xadmin/locale/id_ID/LC_MESSAGES/django.po

@@ -792,8 +792,8 @@ msgstr "Kliknij tutaj, aby wybrać wszystkie obiekty na wszystkich stronach"
 
 #: templates/xadmin/blocks/model_list.results_bottom.actions.html:19
 #, python-format
-msgid "Select all %(total_count)s %(module_name)s"
-msgstr "Wybierz wszystkie %(total_count)s %(module_name)s"
+msgid "Select all %(total_count)s %(model_name)s"
+msgstr "Wybierz wszystkie %(total_count)s %(model_name)s"
 
 #: templates/xadmin/blocks/model_list.results_bottom.actions.html:20
 msgid "Clear selection"

xadmin/locale/ja/LC_MESSAGES/django.po

@@ -743,8 +743,8 @@ msgstr "Clique aqui para selecionar os objetos através de todas as páginas"
 
 #: templates/xadmin/blocks/model_list.results_bottom.actions.html:19
 #, python-format
-msgid "Select all %(total_count)s %(module_name)s"
-msgstr "Selecionar todos %(total_count)s %(module_name)s"
+msgid "Select all %(total_count)s %(model_name)s"
+msgstr "Selecionar todos %(total_count)s %(model_name)s"
 
 #: templates/xadmin/blocks/model_list.results_bottom.actions.html:20
 msgid "Clear selection"

xadmin/locale/lt/LC_MESSAGES/django.po

@@ -744,7 +744,7 @@ msgstr ""
 
 #: templates/xadmin/blocks/model_list.results_bottom.actions.html:19
 #, python-format
-msgid "Select all %(total_count)s %(module_name)s"
+msgid "Select all %(total_count)s %(model_name)s"
 msgstr ""
 
 #: templates/xadmin/blocks/model_list.results_bottom.actions.html:20

xadmin/locale/nl_NL/LC_MESSAGES/django.po

@@ -735,8 +735,8 @@ msgstr "点击此处选择所有页面中包含的对象。"
 
 #: templates/xadmin/blocks/model_list.results_bottom.actions.html:19
 #, python-format
-msgid "Select all %(total_count)s %(module_name)s"
-msgstr "选中所有的 %(total_count)s 个 %(module_name)s"
+msgid "Select all %(total_count)s %(model_name)s"
+msgstr "选中所有的 %(total_count)s 个 %(model_name)s"
 
 #: templates/xadmin/blocks/model_list.results_bottom.actions.html:20
 msgid "Clear selection"

xadmin/locale/pl/LC_MESSAGES/django.mo

@@ -75,7 +75,7 @@ def default(self, o):
         elif isinstance(o, decimal.Decimal):
             return str(o)
         elif isinstance(o, ModelBase):
-            return '%s.%s' % (o._meta.app_label, o._meta.module_name)
+            return '%s.%s' % (o._meta.app_label, o._meta.model_name)
         else:
             try:
                 return super(JSONEncoder, self).default(o)

xadmin/locale/pl/LC_MESSAGES/django.po

@@ -2,7 +2,7 @@
 PLUGINS = ('actions', 'filters', 'bookmark', 'export', 'layout', 'refresh', 'sortable', 'details',
     'editable', 'relate', 'chart', 'ajax', 'relfield', 'inline', 'topnav', 'portal', 'quickform',
     'wizard', 'images', 'auth', 'multiselect', 'themes', 'aggregation', 'mobile', 'passwords',
-    'sitemenu', 'language', 'comments','quickfilter')
+    'sitemenu', 'language', 'quickfilter')
 
 
 def register_builtin_plugins(site):

xadmin/locale/pt_BR/LC_MESSAGES/django.mo

@@ -44,7 +44,7 @@ def get_context(self, context):
             filter(lambda i: bool(i[1] and (i[0] in (COL_LIST_VAR, ORDER_VAR, SEARCH_VAR) or i[0].startswith(FILTER_PREFIX)
                                             or i[0].startswith(RELATE_PREFIX))), self.request.GET.items()))])
 
-        model_info = (self.opts.app_label, self.opts.module_name)
+        model_info = (self.opts.app_label, self.opts.model_name)
         has_selected = False
         menu_title = _(u"Bookmark")
         list_base_url = reverse('xadmin:%s_%s_changelist' %
@@ -75,7 +75,7 @@ def check_item(i):
                 has_selected = True
 
         content_type = ContentType.objects.get_for_model(self.model)
-        bk_model_info = (Bookmark._meta.app_label, Bookmark._meta.module_name)
+        bk_model_info = (Bookmark._meta.app_label, Bookmark._meta.model_name)
         bookmarks_queryset = Bookmark.objects.filter(
             content_type=content_type,
             url_name='xadmin:%s_%s_changelist' % model_info
@@ -125,9 +125,9 @@ def block_nav_menu(self, context, nodes):
 class BookmarkView(ModelAdminView):
 
     @csrf_protect_m
-    @transaction.commit_on_success
+    @transaction.atomic
     def post(self, request):
-        model_info = (self.opts.app_label, self.opts.module_name)
+        model_info = (self.opts.app_label, self.opts.model_name)
         url_name = 'xadmin:%s_%s_changelist' % model_info
         bookmark = Bookmark(
             content_type=ContentType.objects.get_for_model(self.model),

xadmin/locale/pt_BR/LC_MESSAGES/django.po

@@ -39,12 +39,12 @@ def result_item(self, item, obj, field_name, row):
                 try:
                     item_res_uri = reverse(
                         '%s:%s_%s_detail' % (self.admin_site.app_name,
-                                             opts.app_label, opts.module_name),
+                                             opts.app_label, opts.model_name),
                         args=(getattr(rel_obj, opts.pk.attname),))
                     if item_res_uri:
                         if has_change_perm:
                             edit_url = reverse(
-                                '%s:%s_%s_change' % (self.admin_site.app_name, opts.app_label, opts.module_name),
+                                '%s:%s_%s_change' % (self.admin_site.app_name, opts.app_label, opts.model_name),
                                 args=(getattr(rel_obj, opts.pk.attname),))
                         else:
                             edit_url = ''

xadmin/locale/ru_RU/LC_MESSAGES/django.po

@@ -129,7 +129,7 @@ def get(self, request, object_id):
 
     @filter_hook
     @csrf_protect_m
-    @transaction.commit_on_success
+    @transaction.atomic
     def post(self, request, object_id):
         model_fields = [f.name for f in self.opts.fields]
         fields = [f for f in request.POST.keys() if f in model_fields]

xadmin/locale/zh_CN/LC_MESSAGES/django.mo

@@ -441,7 +441,7 @@ def _get_detail_formset_instance(self, inline):
             replace_field_to_value(formset.helper.layout, inline)
             model = inline.model
             opts = model._meta
-            fake_admin_class = type(str('%s%sFakeAdmin' % (opts.app_label, opts.module_name)), (object, ), {'model': model})
+            fake_admin_class = type(str('%s%sFakeAdmin' % (opts.app_label, opts.model_name)), (object, ), {'model': model})
             for form in formset.forms:
                 instance = form.instance
                 if instance.pk:

xadmin/locale/zh_CN/LC_MESSAGES/django.po

@@ -23,7 +23,7 @@ def get_layout_objects(layout, clz, objects):
 class ModelFormPlugin(BasePortalPlugin):
 
     def _portal_key(self):
-        return '%s_%s_editform_portal' % (self.opts.app_label, self.opts.module_name)
+        return '%s_%s_editform_portal' % (self.opts.app_label, self.opts.model_name)
 
     def get_form_helper(self, helper):
         cs = []
@@ -64,7 +64,7 @@ def block_form_top(self, context, node):
 class ModelDetailPlugin(ModelFormPlugin):
 
     def _portal_key(self):
-        return '%s_%s_detail_portal' % (self.opts.app_label, self.opts.module_name)
+        return '%s_%s_detail_portal' % (self.opts.app_label, self.opts.model_name)
 
     def block_after_fieldsets(self, context, node):
         # put portal key and submit url to page

xadmin/models.py

@@ -43,7 +43,7 @@ def related_link(self, instance):
         links = []
         for r, view_perm, add_perm in self.get_related_list():
             label = r.opts.app_label
-            model_name = r.opts.module_name
+            model_name = r.opts.model_name
             f = r.field
             rel_name = f.rel.get_related_field().name
 

xadmin/plugins/__init__.py

@@ -25,7 +25,7 @@ def render(self, name, value, attrs=None):
         else:
             attrs['class'] = attrs['class'] + ' select-search'
         attrs['data-search-url'] = self.admin_view.get_admin_url(
-            '%s_%s_changelist' % (to_opts.app_label, to_opts.module_name))
+            '%s_%s_changelist' % (to_opts.app_label, to_opts.model_name))
         attrs['data-placeholder'] = _('Search %s') % to_opts.verbose_name
         attrs['data-choices'] = '?'
         if self.rel.limit_choices_to:

xadmin/plugins/bookmark.py

@@ -31,7 +31,7 @@ def block_top_navbar(self, context, nodes):
             app_label = model._meta.app_label
 
             if self.has_model_perm(model, "view"):
-                info = (app_label, model._meta.module_name)
+                info = (app_label, model._meta.model_name)
                 if getattr(self.admin_site._registry[model], 'search_fields', None):
                     try:
                         search_models.append({
@@ -57,7 +57,7 @@ def block_top_navmenu(self, context, nodes):
             app_label = model._meta.app_label
 
             if self.has_model_perm(model, "add"):
-                info = (app_label, model._meta.module_name)
+                info = (app_label, model._meta.model_name)
                 try:
                     add_models.append({
                         'title': _('Add %s') % capfirst(model._meta.verbose_name),

xadmin/plugins/details.py

@@ -221,7 +221,7 @@ def get_context(self):
         context.update({
             "opts": opts,
             "app_label": opts.app_label,
-            "module_name": capfirst(opts.verbose_name),
+            "model_name": capfirst(opts.verbose_name),
             "title": _("Recover deleted %(name)s") % {"name": force_unicode(opts.verbose_name_plural)},
             "deleted": deleted,
             "changelist_url": self.model_admin_url("changelist"),
@@ -262,7 +262,7 @@ def get_context(self):
         context.update({
             'title': _('Change history: %s') % force_unicode(self.obj),
             'action_list': action_list,
-            'module_name': capfirst(force_unicode(opts.verbose_name_plural)),
+            'model_name': capfirst(force_unicode(opts.verbose_name_plural)),
             'object': self.obj,
             'app_label': opts.app_label,
             "changelist_url": self.model_admin_url("changelist"),
@@ -580,7 +580,7 @@ def total_form_count_hack(count):
         if self.request.method == 'GET' and formset.helper and formset.helper.layout:
             helper = formset.helper
             helper.filter(basestring).wrap(InlineDiffField)
-            fake_admin_class = type(str('%s%sFakeAdmin' % (self.opts.app_label, self.opts.module_name)), (object, ), {'model': self.model})
+            fake_admin_class = type(str('%s%sFakeAdmin' % (self.opts.app_label, self.opts.model_name)), (object, ), {'model': self.model})
             for form in formset.forms:
                 instance = form.instance
                 if instance.pk:

xadmin/plugins/editable.py

@@ -107,7 +107,7 @@ def register(self, model_or_iterable, admin_class=object, **options):
                     # which causes issues later on.
                     options['__module__'] = __name__
 
-                admin_class = type(str("%s%sAdmin" % (model._meta.app_label, model._meta.module_name)), (admin_class,), options or {})
+                admin_class = type(str("%s%sAdmin" % (model._meta.app_label, model._meta.model_name)), (admin_class,), options or {})
                 admin_class.model = model
                 admin_class.order = self.model_admins_order
                 self.model_admins_order += 1
@@ -309,12 +309,12 @@ def wrapper(*args, **kwargs):
             view_urls = [url(
                 path, wrap(
                     self.create_model_admin_view(clz, model, admin_class)),
-                name=name % (model._meta.app_label, model._meta.module_name))
+                name=name % (model._meta.app_label, model._meta.model_name))
                 for path, clz, name in self._registry_modelviews]
             urlpatterns += patterns('',
                                     url(
                                     r'^%s/%s/' % (
-                                        model._meta.app_label, model._meta.module_name),
+                                        model._meta.app_label, model._meta.model_name),
                                     include(patterns('', *view_urls)))
                                     )
 

xadmin/plugins/inline.py

@@ -25,7 +25,7 @@
 {% endblock %}
 
 {% block content %}
-<form action="{{ form_url }}" class="exform" method="post" id="{{ opts.module_name }}_form">{% csrf_token %}{% block form_top %}{% endblock %}
+<form action="{{ form_url }}" class="exform" method="post" id="{{ opts.model_name }}_form">{% csrf_token %}{% block form_top %}{% endblock %}
   {% if errors %}
     <div class="alert alert-danger">
     {% blocktrans count counter=errors|length %}Please correct the error below.{% plural %}Please correct the errors below.{% endblocktrans %}

xadmin/plugins/portal.py

@@ -16,7 +16,7 @@
   </div>
   {% if actions_selection_counter %}
       {% if cl.result_count != cl.result_list|length %}
-      <a class="question btn btn-default" href="javascript:;" style="display: none;" title="{% trans "Click here to select the objects across all pages" %}">{% blocktrans with cl.result_count as total_count %}Select all {{ total_count }} {{ module_name }}{% endblocktrans %}</a>
+      <a class="question btn btn-default" href="javascript:;" style="display: none;" title="{% trans "Click here to select the objects across all pages" %}">{% blocktrans with cl.result_count as total_count %}Select all {{ total_count }} {{ model_name }}{% endblocktrans %}</a>
       <a class="clear btn btn-default" href="javascript:;" style="display: none;">{% trans "Clear selection" %}</a>
       {% endif %}
       <script type="text/javascript">var _actions_icnt="{{ cl.result_list|length|default:"0" }}";</script>

xadmin/plugins/relate.py

@@ -17,7 +17,7 @@
 {% endblock %}
 
 {% block content %}
-<form class="exform" {% if has_file_field %}enctype="multipart/form-data" {% endif %}action="" method="post" id="{{ opts.module_name }}_form">{% csrf_token %}
+<form class="exform" {% if has_file_field %}enctype="multipart/form-data" {% endif %}action="" method="post" id="{{ opts.model_name }}_form">{% csrf_token %}
   {% if errors %}
       <div class="alert alert-danger alert-dismissable">
         <button type="button" class="close" data-dismiss="alert">&times;</button>