Merge branch 'zhangchunlin:master' into master

Author: TommyLemon

demo/apps/apijson_demo/dbinit.py

@@ -75,6 +75,11 @@
         "date" : "2018-11-6",
         "content" : "test moment from c",
     },
+    {
+        "username" : "admin",
+        "date" : "2018-11-7",
+        "content" : "test moment from admin",
+    },
 ]
 
 comment_list = [
@@ -99,6 +104,13 @@
         "date" : "2018-12-9",
         "content" : "comment hoho",
     },
+    {
+        "username" : "admin",
+        "to_username" : "usera",
+        "moment_id" : 4,
+        "date" : "2018-12-10",
+        "content" : "comment kaka",
+    },
 ]
 
 for d in user_list:

demo/apps/settings.ini

@@ -17,6 +17,7 @@ INSTALLED_APPS = [
     'uliweb_comui',
     'uliweb_comapps.auth.login',
     'uliweb_comapps.auth.user_admin',
+    'uliweb_comapps.auth.rbac_admin',
     'uliweb_apijson.apijson',
     'apijson_demo',
     'tables',

demo/apps/tables/config.ini

@@ -0,0 +1,4 @@
+[DEPENDS]
+REQUIRED_APPS = [
+    'uliweb_apijson.tables',
+]

demo/apps/tables/settings.ini

@@ -1,7 +1,11 @@
 [APIJSON_TABLES]
-user = {
-    "editable" : "auto",
-}
+user = {"model_name":"user", "tableui_name":"users"}
+role = {"model_name":"role", "tableui_name":"roles", "role":"ADMIN"}
+permission = {"model_name":"permission", "tableui_name":"permissions", "role":"ADMIN"}
+moment = {"role":"OWNER"}
+comment = {"role":"OWNER"}
+
+[APIJSON_TABLE_UI]
 moment = {
     "editable" : "auto",
     "table_fields" : [
@@ -20,7 +24,6 @@ moment = {
         {"title":"Content","key":"content","type":"textarea"},
     ],
 }
-
 comment = {
     "editable" : "auto",
     "table_fields" : [

demo/apps/tables/templates/Tables/list.html

@@ -1,4 +1,4 @@
-__version__ = '0.2.2'
+__version__ = '0.3.0'
 __url__ = 'https://github.com/zhangchunlin/uliweb-apijson'
 __author__ = 'Chunlin Zhang'
 __email__ = '[email protected]'

demo/apps/tables/views.py

@@ -2,57 +2,76 @@
 
 from uliweb import settings, models, request, functions, UliwebError
 from uliweb.orm import ModelNotFound
+from json import dumps as json_dumps
 import logging
 
 log = logging.getLogger('apijson')
 
-def get_apijson_tables(role="UNKNOWN"):
-    from uliweb import settings
 
-    s = settings.APIJSON_TABLES
-    if s:
-        apijson_tables = dict(s.iteritems())
-    else:
-        return {}
-    for n in apijson_tables:
-        c = apijson_tables[n]
-        editable = c.get("editable",False)
-        _model_name = c.get("@model_name") or n
-        if editable=="auto":
+class ApijsonTable(object):
+    def __init__(self, model_name, request_tag=None, role=None, tableui_name=None, table_name=None):
+        self.model_name = model_name
+        self.request_tag = request_tag or self.model_name
+        self.role = role
+        self.tableui_name = tableui_name or self.model_name
+        self.table_name = table_name
+        self._get_tableui()
+        self._apply_auto()
+
+    def _get_tableui(self):
+        self.tableui = settings.APIJSON_TABLE_UI.get(self.tableui_name, {})
+        if not self.tableui:
+            log.warn("cannot find setting for {} in settings.APIJSON_TABLE_UI".format(self.tableui_name))
+
+    def _apply_auto(self):
+        editable = self.tableui.get("editable", False)
+        if editable == "auto":
             editable = False
-            POST = settings.APIJSON_MODELS.get(_model_name,{}).get("POST")
+            POST = settings.APIJSON_MODELS.get(self.model_name, {}).get("POST")
             if POST:
                 roles = POST["roles"]
                 if roles:
-                    editable = role in roles
-            c["editable"] = editable
-    return apijson_tables
-
-def get_apijson_table(role="UNKNOWN",name=None):
-    from uliweb import settings
-
-    if not name:
-        return {}
-    s = settings.APIJSON_TABLES
-    if s:
-        apijson_tables = dict(s.iteritems())
-    else:
-        return {}
-    
-    c = apijson_tables.get(name)
-    if not c:
-        return {}
-    editable = c.get("editable",False)
-    _model_name = c.get("@model_name") or n
-    if editable=="auto":
-        editable = False
-        POST = settings.APIJSON_MODELS.get(_model_name,{}).get("POST")
-        if POST:
-            roles = POST["roles"]
-            if roles:
-                editable = role in roles
-        c["editable"] = editable
-    return c
+                    editable = self.role in roles
+            self.tableui["editable"] = editable
+
+    def to_dict(self):
+        return dict(model_name=self.model_name,
+                    request_tag=self.request_tag,
+                    role=self.role,
+                    tableui_name=self.tableui_name,
+                    table_name=self.table_name,
+                    tableui=self.tableui)
+
+
+def get_apijson_tables():
+    def iter_table():
+        s = settings.APIJSON_TABLES
+        apijson_tables = dict(s.iteritems()) if s else {}
+        if apijson_tables:
+            for k in apijson_tables:
+                v = apijson_tables[k]
+                model_name = v.get("model_name") or k
+                tableui_name = v.get("tableui_name") or model_name
+                if not model_name:
+                    model_name = tableui_name
+                if model_name and tableui_name:
+                    request_tag = v.get("request_tag")
+                    role = v.get("role")
+                    yield(ApijsonTable(model_name=model_name, request_tag=request_tag, role=role, tableui_name=tableui_name, table_name=k))
+        else:
+            apison_table_ui = dict(
+                settings.APIJSON_TABLE_UI.iteritems())
+            for tableui_name in apison_table_ui:
+                tableui = apison_table_ui[tableui_name]
+                model_name = tableui.get("@model_name") or tableui_name
+                request_tag = model_name
+                role = None
+                yield(ApijsonTable(model_name=model_name, request_tag=request_tag, role=role, tableui_name=tableui_name))
+    return list(iter_table())
+
+
+def get_apijson_table(*args, **kwargs):
+    return ApijsonTable(*args, **kwargs)
 
 class ApiJsonModelQuery(object):
     def __init__(self,name,params,parent,key):