apijson-table: fix apijson-put @ROLE not work problem; demo: make user table editable for admin

zhangchunlin · zhangchunlin · commit 425d3f89feea · 2019-10-12T16:48:11.000+08:00
diff --git a/demo/apps/apijson_demo/settings.ini b/demo/apps/apijson_demo/settings.ini
@@ -31,6 +31,17 @@ comment = {
 }
 
 [APIJSON_REQUESTS]
+user = {
+    "POST" :{
+        "ADD":{"@role": "ADMIN"},
+        "DISALLOW" : ["id"],
+        "NECESSARY" : ["username","nickname"],
+    },
+    "PUT" :{
+        "ADD":{"@role": "OWNER"},
+        "NECESSARY" : ["id"],
+    },
+}
 moment = {
     "POST" :{
         "ADD":{"@role": "OWNER"},
diff --git a/demo/apps/tables/settings.ini b/demo/apps/tables/settings.ini
@@ -1,4 +1,7 @@
 [APIJSON_TABLES]
+user = {
+    "editable" : "auto",
+}
 moment = {
     "editable" : "auto",
     "table_fields" : [
diff --git a/uliweb_apijson/apijson/templates/vue/inc_apijson_table.html b/uliweb_apijson/apijson/templates/vue/inc_apijson_table.html
@@ -53,6 +53,7 @@
         var thisp = this
         return {
             l_request_tag: null,
+            role: "{{=role}}",
 
             loading: false,
             modal_view: false,
@@ -176,10 +177,13 @@
                 "@page":thisp.current_page-1,
                 "@query":2
             }
-            arr_params[thisp.model_name] = {
-                "@order":thisp.sort_key+thisp.sort_order,
-                "@role":"{{=role}}"
+            var model_params = {
+                "@order":thisp.sort_key+thisp.sort_order
             }
+            if (thisp.role!="") {
+                model_params["@role"] = thisp.role
+            }
+            arr_params[thisp.model_name] = model_params
             var params = {
                 "[]":arr_params,
                 "total@":"/[]/total"
@@ -293,10 +297,13 @@
             //only save modified fields
             for (var k in thisp.viewedit_items) {
                 var d = thisp.viewedit_items[k]
-                if (d.key=="id"|| d.value!=row[d.key]) {
-                    record_params[d.key] = d.value
+                if (d.title=="id"|| d.value!=row[d.title]) {
+                    record_params[d.title] = d.value
                 }
             }
+            if (thisp.role!="") {
+                record_params["@role"] = thisp.role
+            }
             params[thisp.l_request_tag] = record_params
             params = thisp.ajax_hook("apijson_put","update",params)
             $.ajax({
