change default kind for filter to 3.

bukun · Dec 1, 2022 · 7ec4459 · 7ec4459
1 parent ebcebae
commit 7ec4459
Show file tree

Hide file tree

Showing 15 changed files with 26 additions and 18 deletions.
diff --git a/.gitignore b/.gitignore
@@ -76,11 +76,11 @@ database/whoosh
 database/whoosh*
 
 static/upload/
-static/f2elib/
+static/f2elib
 static/tass/.sass-cache/
 static/tass/sass/partial
 templates/pycate/autogen/
-templates/autogen/
+templates/autogen
 
 api_doc
 api_html

diff --git a/config.py b/config.py
@@ -32,26 +32,35 @@
     ,
 }
 
-router_post = {'1': 'post',
-               }
+router_post = {
+    '1': 'post',
+    '3': 'info',
+}
 
 post_type = {
     '1': '''<span style="color:green;" class="glyphicon glyphicon-list-alt">[{0}]</span>
         '''.format('Document'),
+    '3': '''<span style="color:blue;" class="glyphicon glyphicon-list-alt">[{0}]</span>
+        '''.format('Data'),
 }
 check_type = {
     '1': 'Document',
+    '3': 'Filter',
 }
 post_cfg = {
-    '1': {
+    '': {
         'router': 'post',
         'html': '''<span style="color:green;" class="glyphicon glyphicon-list-alt">[{0}]</span>'''.format('Document'),
         'checker': '1',
     },
-
+    '3': {
+        'router': 'info',
+        'html': '''<span style="color:blue;" class="glyphicon glyphicon-list-alt">[{0}]</span>'''.format('Data'),
+        'checker': '10',  # '10', '100', '1000', '10000'
+    }
 
 }
-kind_arr = ['1','9','m','s']
+kind_arr = ['1', '3', 'm', 's']
 
 from pathlib import Path
 

diff --git a/database/meta/info_tags.xlsx b/database/meta/info_tags.xlsx
diff --git a/static/f2elib b/static/f2elib
diff --git a/templates/theme/bage.html b/templates/theme/bage.html
@@ -125,10 +125,8 @@
                     <a href="" class="dropdown-toggle" data-toggle="dropdown">{{ _('Data') }}
                         <b class="caret"></b></a>
                     <ul class="dropdown-menu">
-                        <li><a href="/meta_info_filter/2100">{{ _('Basic geographic') }}</a></li>
-                        <li><a href="/meta_info_filter/2200">{{ _('Nature resources') }}</a></li>
-
-
+                        <li><a href="/filter/2100">{{ _('Basic geographic') }}</a></li>
+                        <li><a href="/filter/2200">{{ _('Nature resources') }}</a></li>
                     </ul>
                 </li>
 

diff --git a/templates/tmpl_9/tmplinfo.html → templates/tmpl_3/tmplinfo.html b/templates/tmpl_9/tmplinfo.html → templates/tmpl_3/tmplinfo.html
diff --git a/templates/tmpl_9/tpl_add.html → templates/tmpl_3/tpl_add.html b/templates/tmpl_9/tpl_add.html → templates/tmpl_3/tpl_add.html
diff --git a/templates/tmpl_9/tpl_edit.html → templates/tmpl_3/tpl_edit.html b/templates/tmpl_9/tpl_edit.html → templates/tmpl_3/tpl_edit.html
diff --git a/templates/tmpl_9/tpl_list.html → templates/tmpl_3/tpl_list.html b/templates/tmpl_9/tpl_list.html → templates/tmpl_3/tpl_list.html
diff --git a/templates/tmpl_9/tpl_listinfo.html → templates/tmpl_3/tpl_listinfo.html b/templates/tmpl_9/tpl_listinfo.html → templates/tmpl_3/tpl_listinfo.html
diff --git a/templates/tmpl_9/tpl_view.html → templates/tmpl_3/tpl_view.html b/templates/tmpl_9/tpl_view.html → templates/tmpl_3/tpl_view.html
@@ -168,15 +168,15 @@
                 {{ _('Most attention') }}
             </div>
             <ul class="list-group" id="mostall">
-                {% module post_most_view(5, with_date = False, with_catalog= False,kind='9') %}
+                {% module post_most_view(5, with_date = False, with_catalog= False,kind=postinfo.kind) %}
             </ul>
         </div>
         <div class="panel panel-black">
             <div class="panel-heading">
                 {{ _('Recent articles') }}
             </div>
             <ul class="list-group">
-                {% module post_recent(5, with_date = False, with_catalog= False,kind='9') %}
+                {% module post_recent(5, with_date = False, with_catalog= False,kind=postinfo.kind) %}
             </ul>
         </div>
 

diff --git a/torcms/core/router.py b/torcms/core/router.py
@@ -57,7 +57,7 @@
 
     # For filter listing.
     ("/filter/(.*)", FilterHandler, {}),
-    ("/info/(.*)", PostHandler, dict(kind='9', filter_view=True)),
+    ("/info/(.*)", PostHandler, dict(kind='3', filter_view=True)),
     ("/label/(.*)", LabelHandler, {}),
     ("/user/(.*)", UserHandler, {}),
     ("/user_j/(.*)", UserPartialHandler, {}),

diff --git a/torcms/handlers/filter_handler.py b/torcms/handlers/filter_handler.py
@@ -144,6 +144,10 @@ def echo_html(self, url_str):
 
         num = (len(url_arr) - 2) // 2
 
+        print('=' * 40)
+        print(sig)
+        print('=' * 40)
+
         catinfo = MCategory.get_by_uid(sig)
 
         if catinfo.pid == '0000':

diff --git a/torcms/modules/base_modules.py b/torcms/modules/base_modules.py
@@ -212,7 +212,7 @@ class PostCategoryOf(tornado.web.UIModule):
     def render(self, uid_with_str, **kwargs):
         curinfo = MCategory.get_by_uid(uid_with_str)
         sub_cats = MCategory.query_sub_cat(uid_with_str)
-        kind = kwargs.get('kind', '9')
+        kind = kwargs.get('kind', '2')
         slug = kwargs.get('slug', False)
         cat_dic = []
         for cat in sub_cats:

diff --git a/torcms_app/core/router.py b/torcms_app/core/router.py
@@ -1,6 +1,4 @@
 # -*- coding:utf-8 -*-
-from torcms_metadata.handlers.meta_handler import MetadataHandler
-from torcms_metadata.handlers.meta_filter_handler import MetaFilterHandler
 
 _urls = [