call queryset `all` method return new queryset

democms/adm/caches/category.py

@@ -23,7 +23,7 @@ class CacheCategory(object):
         version_last = cacheversion[CacheVersion.VerName.Category].version
         if version_last > self._data_version or self._category is None:
             self.update_data()
-        self._data_version = version_last
+            self._data_version = version_last
         return {"category": self._category, "category_html": self._category_html, "category_order": self._category_order}
 
     def update_data(self):
@@ -54,6 +54,7 @@ class CacheCategory(object):
                 "data": Category.objects.filter(usage=usage[0]).order_by('order_select')
             }
         self._category_order['all'] = Category.objects.order_by('order_select')
+        list(self._category_order['all'])
         pass
 
     def build_html(self, qa: QuerySet):

democms/adm/caches/config.py

@@ -42,7 +42,7 @@ class CacheEnvVariable(object):
         version_last=cacheversion[CacheVersion.VerName.EnvVar].version
         if version_last>self._variables_version or self._variables is None:
             self.update_data()
-        self._variables_version=version_last
+            self._variables_version=version_last
         return self._variables
     def update_data(self):
         """获取最新数据

democms/adm/caches/menus.py

@@ -17,7 +17,7 @@ class CacheAdmMenu(object):
         version_last=cacheversion[CacheVersion.VerName.AdmMenu].version
         if version_last>self._menus_version or self._menus is None:
             self.update_data()
-        self._variables_version=version_last
+            self._menus_version=version_last
         return {'menus':self._menus,'sub_menus':self._sub_menus}
     def update_data(self):
         """
@@ -28,6 +28,8 @@ class CacheAdmMenu(object):
         if not qa.exists():
             self.init_data()
         self._menus={obj.path:obj for obj in qa}
+        for menu in self._menus.values():
+            menu.submenu_list=list(menu.submenus.all())
         self._sub_menus={obj.path:obj for obj in qb}
         pass
     def init_data(self):

democms/adm/templates/adm/extends/base.html

@@ -30,7 +30,7 @@
                 <a class="nav-link dropdown-toggle" href="#" role="button" data-bs-toggle="dropdown" aria-expanded="false">{{menu.name}}</a>
                 <ul class="dropdown-menu">
                   
-                  {% for submenu in menu.submenus.all %}
+                  {% for submenu in menu.submenu_list %}
                     <li>
                       <a class="dropdown-item {% if menu.path == menu_path and submenu.path == submenu_path %}active{% endif %}" href="{{path_prefix}}{{menu.path}}/{{submenu.path}}/">{{submenu.name}}</a>
                     </li>
@@ -77,7 +77,7 @@
       <div class="row">
        {% include '../include/aside.html' %}
        <main class="col bg-secondary-subtle pt-0 px-2">
-        <nav aria-label="breadcrumb" class="ps-1 mt-2 d-lg-none">
+        
             {% include '../include/breadcrumb.html' %}
           <div class="card mt-2">
             {% block main %}

democms/adm/templates/adm/include/aside.html

@@ -7,7 +7,7 @@
     </dt>
     <dd>
         <ul>
-            {% for submenu in menu_present.submenus.all %}
+            {% for submenu in menu_present.submenu_list %}
                 <li>
                     <a href="{{path_prefix}}{{menu_present.path}}/{{submenu.path}}/" class="{% if submenu_path == submenu.path %}link-info{% else %}link-secondary{% endif %}">{{submenu.name}}</a></li>
             {% endfor %}

democms/adm/templates/adm/include/breadcrumb.html

 {% if menu_path %}
+<nav aria-label="breadcrumb" class="ps-1 mt-2 d-lg-none">
 <ol class="breadcrumb mb-2">
     <li class="breadcrumb-item">
       <a href="{% url 'adm:index' %}">首页</a>

democms/adm/tests/testcategory.py

@@ -7,9 +7,45 @@ import django
 django.setup()
 from  common.models import Category
 from ..forms.category import CategoryEditForm
+from ..caches import cache_category
 class TestCategory(unittest.TestCase):
     """docstring for TestCategory."""
-    
+    def test_bbb(self):
+        print("aaaaa")
+        print("===============+++++++++++============================")
+
+        aa=Category.objects.all()
+        # aa=list(Category.objects.all())
+        print("===============+++++++++++============================")
+
+        for value in aa:
+            print(value)
+        print("===============+++++++++++============================")
+        bb=aa.all()
+        for value in bb:
+            print(value)
+        print("===============+++++++++++============================")
+        pass
+    def test_aaaa(self):
+        aa=cache_category.categories['category_order']['all']
+        print("===============+++++++++++============================")
+        # for value in aa:
+        #     print(value)
+        # print("===============+++++++++++============================")
+        # for value in aa:
+        #     print(value)
+        # print("===============+++++++++++============================")
+        # self.aaaa()
+        pass
+    def aaaa(self):
+        aa=cache_category.categories['category_order']['all']
+        print("===============+++++++++++============================")
+        for value in aa:
+            print(value)
+        print("===============+++++++++++============================")
+        for value in aa:
+            print(value)
+        print("===============+++++++++++============================")
     def test_modelform(self):
         data={"name":"aaa"}
         form = CategoryEditForm(initial=data)

democms/adm/tests/testmenu.py

@@ -13,7 +13,14 @@ from common.models import Category
 
 class TestAdmMenu(unittest.TestCase):
     """docstring for TestAdmMenu."""
-    
+    def test_aaa(self):
+        menus = cache_admmenu.menus
+        print("="*100)
+        aa=menus['menus']['category']
+        print(aa.name)
+        print("="*100)
+        bb=menus['menus']['category']
+        print(bb.name)
     def test_clear_menu(self):
         """
         Purpose: 

democms/app/settings.py

@@ -111,7 +111,7 @@ DEFAULT_ADMMENU=[
             'path':'edit',
          }, 
         {
-            'name':'数据模型',
+            'name':'文档模型',
             'sort':1,
             'path':'template',
          },