fix linnovate#605 allow for single menu object instead of array

danielhxd · Jul 9, 2014 · f1efb7f · f1efb7f
1 parent fdf39a8
commit f1efb7f
Showing 1 changed file with 7 additions and 8 deletions.
diff --git a/packages/system/server/routes/menus.js b/packages/system/server/routes/menus.js
@@ -6,21 +6,20 @@ module.exports = function(System, app, auth, database) {
 
     app.route('/admin/menu/:name')
         .get(function(req, res) {
-            var roles = (req.user ? req.user.roles : ['anonymous']);
-            var menu = req.params.name ? req.params.name : 'main';
-            var defaultMenu = (req.query.defaultMenu ? req.query.defaultMenu : []);
+            var roles = req.user ? req.user.roles : ['anonymous'];
+            var menu = req.params.name || 'main';
+            var defaultMenu = req.query.defaultMenu || [];
 
-            defaultMenu.forEach(function(item, index) {
-                defaultMenu[index] = JSON.parse(item);
-            });
+            if (!Array.isArray(defaultMenu)) defaultMenu = [defaultMenu];
 
             var items = mean.menus.get({
                 roles: roles,
                 menu: menu,
-                defaultMenu: defaultMenu
+                defaultMenu: defaultMenu.map(function(item) {
+                    return JSON.parse(item);
+                })
             });
 
             res.json(items);
         });
-
 };