Forráskód Böngészése

신규 렌더러 반영 전 임시 조치 및 일부 수정

https://github.com/openNAMU/openNAMU/issues/2580
잉여개발기 5 hónapja
szülő
commit
e67e5e159e
4 módosított fájl, 14 hozzáadás és 7 törlés
  1. 8 2
      route/tool/func.py
  2. 1 1
      route/tool/func_render_namumark.py
  3. 2 1
      route/view_w.py
  4. 3 3
      version.json

+ 8 - 2
route/tool/func.py

@@ -98,11 +98,11 @@ if sys.version_info < (3, 6):
 
 # Func
 # Func-main
-async def render_template(name, data, sub, menu):
+async def render_template(name, data, sub, menu, other = []):
     other_set = {}
     other_set["name"] = name
     other_set["data"] = data
-    other_set["sub"] = sub
+    other_set["sub"] = [sub] + other
     other_set["menu"] = menu
 
     return await python_to_golang("template", other_set)
@@ -1404,6 +1404,12 @@ async def render_set(conn, doc_name = '', doc_data = '', data_type = 'view', mar
     if data_type in ['api_from', 'api_view', 'api_thread', 'api_include']:
         return_type = False
 
+    if await acl_check(doc_name, 'render') == 1:
+        if not return_type:
+            return ["", ""]
+        else:
+            return ''
+
     if data_type == '':
         data_type = 'view'
     elif data_type == 'api_view':

+ 1 - 1
route/tool/func_render_namumark.py

@@ -1426,7 +1426,7 @@ class class_do_render_namumark:
                         include_data = ''
                         if self.parent:
                             include_data_tmp = await self.parent(self.conn,
-                                doc_name = self.doc_name,
+                                doc_name = include_name,
                                 doc_data = db_data[0][0], 
                                 data_type = 'api_include',
                                 parameter = include_change_list

+ 2 - 1
route/view_w.py

@@ -370,5 +370,6 @@ async def view_w(name = 'Test', do_type = '', doc_rev = ''):
             name_view,
             div,
             sub,
-            menu
+            menu,
+            [r_date, watch_list, description, view_count],
         ), response_data

+ 3 - 3
version.json

@@ -1,6 +1,6 @@
 {
-    "r_ver" : "v3.6.0-Beta-v38",
-    "c_ver" : "20250513",
+    "r_ver" : "v3.6.0-Beta-v39",
+    "c_ver" : "20250514",
     "s_ver" : "20240426",
-    "bin_link" : "https://github.com/openNAMU/GopenNAMU/releases/download/v2025-12-07-Beta-v6/"
+    "bin_link" : "https://github.com/openNAMU/GopenNAMU/releases/download/v2025-12-07-Beta-v7/"
 }