잉여개발기 (SPDV) 3 gadi atpakaļ
vecāks
revīzija
f82c1df4ed
3 mainītis faili ar 11 papildinājumiem un 10 dzēšanām
  1. 9 8
      route/tool/func.py
  2. 1 1
      route/tool/func_render_namumark.py
  3. 1 1
      version.json

+ 9 - 8
route/tool/func.py

@@ -1273,15 +1273,16 @@ def render_set(doc_name = '', doc_data = '', data_type = 'view', data_in = '', d
             if data_type == 'backlink':
                 return ''
 
-            for include_data in get_class_render[2]['include']:
-                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)
-                    include_data_render[0] = '<div id="' + include_data[0] + '">' + include_data_render[0] + '</div>'
+            if 'include' in get_class_render[2]:
+                for include_data in get_class_render[2]['include']:
+                    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)
+                        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[0] = re.sub(include_regex, include_data_render[0], get_class_render[0])
+                        get_class_render[1] += include_data_render[1]
 
             if data_type == 'api_view':
                 return [

+ 1 - 1
route/tool/func_render_namumark.py

@@ -656,7 +656,7 @@ class class_do_render_namumark:
                         link_sub = ''
                         link_sub_storage = link_main_org
 
-                    data_name = self.get_tool_data_storage('<a class="opennamu_link_out" href="' + link_main + link_data_sharp + '">' + link_sub_storage, '</a>', link_data_full)
+                    data_name = self.get_tool_data_storage('<a class="opennamu_link_out" href="' + link_main + '">' + link_sub_storage, '</a>', link_data_full)
 
                     self.render_data = re.sub(link_regex, '<' + data_name + '>' + link_sub + '</' + data_name + '>', self.render_data, 1)
                 # in link

+ 1 - 1
version.json

@@ -1,6 +1,6 @@
 {
     "beta" : {
-        "r_ver" : "v3.4.5 (stable2) (beta3) (dev55)",
+        "r_ver" : "v3.4.5 (stable2) (beta3) (dev56)",
         "c_ver" : "3500354",
         "s_ver" : "3500110"
     }