Przeglądaj źródła

https://github.com/openNAMU/openNAMU/issues/1711

잉여개발기 (SPDV) 3 lat temu
rodzic
commit
68e6896f8c
3 zmienionych plików z 12 dodań i 12 usunięć
  1. 10 10
      route/tool/func.py
  2. 1 1
      route/tool/func_render_namumark.py
  3. 1 1
      version.json

+ 10 - 10
route/tool/func.py

@@ -1361,16 +1361,16 @@ def render_set(doc_name = '', doc_data = '', data_type = 'view', data_in = '', d
                     include_data = get_class_render[2]['include'][for_a]
                     if acl_check(include_data[1], 'render') == 0:
                         include_regex = re.compile('<div id="' + include_data[0] + '"><\/div>')
-                        
-                        include_data_render = class_do_render(conn, render_lang_data).do_render(include_data[1], include_data[2], data_type, include_data[0] + data_in)
-                        if len(include_data) > 3:
-                            include_data_render[0] = '<div id="' + include_data[0] + '" ' + include_data[3] + '>' + include_data_render[0] + '</div>'
-                        else:
-                            include_data_render[0] = '<div id="' + include_data[0] + '">' + include_data_render[0] + '</div>'
-
-                        get_class_render[0] = re.sub(include_regex, include_data_render[0], get_class_render[0])
-                        get_class_render[1] += include_data_render[1]
-                        get_class_render[2]['include'] += include_data_render[2]['include']
+                        if re.search(include_regex, get_class_render[0]):
+                            include_data_render = class_do_render(conn, render_lang_data).do_render(include_data[1], include_data[2], data_type, include_data[0] + data_in)
+                            if len(include_data) > 3:
+                                include_data_render[0] = '<div id="' + include_data[0] + '" ' + include_data[3] + '>' + include_data_render[0] + '</div>'
+                            else:
+                                include_data_render[0] = '<div id="' + include_data[0] + '">' + include_data_render[0] + '</div>'
+
+                            get_class_render[0] = re.sub(include_regex, include_data_render[0], get_class_render[0])
+                            get_class_render[1] += include_data_render[1]
+                            get_class_render[2]['include'] += include_data_render[2]['include']
 
                     for_a += 1
 

+ 1 - 1
route/tool/func_render_namumark.py

@@ -1925,6 +1925,6 @@ class class_do_render_namumark:
             self.render_data_js, # js
             {
                 'backlink' : self.data_backlink, # backlink
-                'include' : self.data_include # include data
+                'include' : list(reversed(self.data_include)) # include data
             } # other
         ]

+ 1 - 1
version.json

@@ -1,6 +1,6 @@
 {
     "beta" : {
-        "r_ver" : "v3.4.6-RC3-dev146",
+        "r_ver" : "v3.4.6-RC3-dev147",
         "c_ver" : "3500360",
         "s_ver" : "3500111"
     }