enhancement: merge abe users into core

abecms · Nov 23, 2016 · 092f917 · 092f917
1 parent a0e7dcc
commit 092f917
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 9 deletions.
diff --git a/src/server/controllers/editor.js b/src/server/controllers/editor.js
@@ -33,7 +33,9 @@ function add(obj, json, text, util) {
   }
 
   obj.key = getDataIdWithNoSlash(obj.key)
-  obj.status = json.abe_meta.status
+  if (json != null && json.abe_meta != null) {
+    obj.status = json.abe_meta.status
+  }
 
   util.add(obj)
 

diff --git a/src/server/routes/get-list-url.js b/src/server/routes/get-list-url.js
@@ -30,10 +30,7 @@ var route = function(router, req, res, next) {
   var template = Handlebars.compile(html, {noEscape: true})
   var tmp = template({
     urls: urls,
-    express: {
-      req: req,
-      res: res
-    },
+    user: res.user,
     config: JSON.stringify(config),
     roles: roles
   })

diff --git a/src/server/routes/users/get/list.js b/src/server/routes/users/get/list.js
@@ -27,10 +27,7 @@ var route = function route(req, res, next) {
   var roles = config.users.roles
   var tmp = template({
     users: User.getAll(),
-    express: {
-      req: req,
-      res: res
-    },
+    user: res.user,
     config: JSON.stringify(config),
     roles: roles
   })