瀏覽代碼

Rename models key to items

Denis K 8 年之前
父節點
當前提交
d9b19122c8
共有 3 個文件被更改,包括 9 次插入9 次删除
  1. 1 1
      jet/management/commands/jet_side_menu_items_example.py
  2. 2 2
      jet/templates/admin/base.html
  3. 6 6
      jet/utils.py

+ 1 - 1
jet/management/commands/jet_side_menu_items_example.py

@@ -39,7 +39,7 @@ class Command(NoArgsCommand):
         self.stdout.write('JET_SIDE_MENU_ITEMS = [')
 
         for app in app_list:
-            self.stdout.write('    {\'app_label\': \'%s\', \'models\': [' % (
+            self.stdout.write('    {\'app_label\': \'%s\', \'items\': [' % (
                 app['app_label']
             ))
 

+ 2 - 2
jet/templates/admin/base.html

@@ -202,7 +202,7 @@
                                             {{ app.label }}
                                         </a>
                                     </div>
-                                    {% for model in app.models %}
+                                    {% for model in app.items %}
                                         {% if model.has_perms %}
                                             <div>
                                                 <a{% if model.url %} href="{{ model.url }}"{% endif %} class="sidebar-link"{% if model.url_blank %} target="_blank"{% endif %}>
@@ -346,7 +346,7 @@
                                             </li>
                                         {% endif %}
 
-                                        {% for model in app.models %}
+                                        {% for model in app.items %}
                                             {% if model.has_perms %}
                                                 <li class="sidebar-popup-list-item{% if model.name %} model-{{ model.name }}{% endif %}{{ model.current|yesno:" current," }}">
                                                     <a{% if model.url %} href="{{ model.url }}"{% endif %} class="sidebar-popup-list-item-link"{% if model.url_blank %} target="_blank"{% endif %}>

+ 6 - 6
jet/utils.py

@@ -357,8 +357,8 @@ def get_menu_items(context):
             if 'label' in data:
                 item['label'] = data['label']
 
-            if 'models' in data:
-                item['models'] = list(map(lambda x: get_menu_item_app_model(app_label, x), data['models']))
+            if 'items' in data:
+                item['items'] = list(map(lambda x: get_menu_item_app_model(app_label, x), data['items']))
 
             if 'url' in data:
                 item['url'] = get_menu_item_url(data['url'], original_app_list)
@@ -390,7 +390,7 @@ def get_menu_items(context):
 
                 models_dict[app_label][model['object_name']] = model
 
-            app['models'] = []
+            app['items'] = []
 
         app_list = []
 
@@ -406,11 +406,11 @@ def get_menu_items(context):
 
                 for model_label in models:
                     if model_label == '__all__':
-                        app['models'] = models_dict[app_label].values()
+                        app['items'] = models_dict[app_label].values()
                         break
                     elif model_label in models_dict[app_label]:
                         model = models_dict[app_label][model_label]
-                        app['models'].append(model)
+                        app['items'].append(model)
 
                 app_list.append(app)
     else:
@@ -420,7 +420,7 @@ def get_menu_items(context):
 
     for app in app_list:
         if not current_found:
-            for model in app['models']:
+            for model in app['items']:
                 if not current_found and model.get('url') and context['request'].path.startswith(model['url']):
                     model['current'] = True
                     current_found = True