mongoose-manager - npm Package Compare versions

Comparing version 0.1.1 to 0.1.2

lib/admin.js

@@ -42,3 +42,3 @@ var express = require('express'),
     }
-    return this.getFields(modelName, 4);
+    return this.getFields(modelName, this.options.numberOfFieldsInListView);
 };
@@ -73,2 +73,6 @@
     app.use(express.session());
+    app.use(function(req, res, next){
+        res.locals.errors = {};
+        next();
+    });
     app.use(require('../views/helpers').init(this));
@@ -75,0 +79,0 @@ app.use(app.router);

lib/defaults.js

 exports.defaults = {
-    pageSize: 100
+    pageSize: 100,
+    numberOfFieldsInListView: 5
 };

lib/routes/documents.js

@@ -10,15 +10,23 @@ var async = require('async'),
     function loadDocuments(req, res, next){
-        var pageSize = admin.options.pageSize,
-            model = admin.getModel(req.params.model),
-            page = parseInt(req.query.page, 10) || 1,
-            skip = (page - 1) * pageSize,
-            q = req.query.q,
-            fields = admin.getListFields(req.params.model);
+        var pageSize = res.locals.pageSize = admin.options.pageSize,
+            model = res.locals.model = admin.getModel(req.params.model),
+            page = res.locals.page = parseInt(req.query.page, 10) || 1,
+            skip = res.locals.skip = (page - 1) * pageSize,
+            q = res.locals.q = req.query.q,
+            where = res.locals.where = req.query.where,
+            fields = res.locals.fields = admin.getListFields(req.params.model);
 
+        try {
+            var parsed = JSON.parse(where || '{}');
+        } catch(e) {
+            res.locals.errors.where = 'Could not parse where clause. It must be valid JSON.';
+            return res.render('list');
+        }
+
         async.parallel([
             function(cb){
-                model.count(cb);
+                model.count(parsed, cb);
             },
             function(cb){
-                model.find().limit(pageSize).skip(skip).exec(function(err, documents){
+                model.find(parsed).limit(pageSize).skip(skip).exec(function(err, documents){
                     if (err) return cb(err);
@@ -40,10 +48,4 @@
             res.render('list', {
-                model: model,
                 documents : results[1],
-                fields : fields,
                 count : results[0],
-                page : page,
-                pageSize : pageSize,
-                skip : skip,
-                q: q,
                 actions: admin.getActions(req.params.model)
@@ -50,0 +52,0 @@ });

package.json

 {
   "name": "mongoose-manager",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "scripts": {
@@ -5,0 +5,0 @@ "example": "supervisor --force-watch -i public,views example/app.js"

public/js/admin.js

@@ -11,14 +11,25 @@ $(function(){
     }
+
     $("select.autocomplete").select2();
+
     $(document).on('click', '[href^="#remove-item"]', function(){
+        var $ol = $(this).parents('ol');
         $(this).parents('li').remove();
+        updateCount($ol);
         return false;
     });
+
     $(document).on('click', '[href^="#add-item"]', function(){
         var $ol = $(this).siblings('ol'),
-            templateId = $ol.data('template'),
+            templateSelector = $ol.data('template'),
             i = $ol.find('.form-group').length,
-            html = $('#' + templateId).text().replace('{{i}}', i);
+            html = $(templateSelector).text().replace('{{i}}', i);
         $ol.append(html);
+        updateCount($ol);
+        return false;
     });
+
+    function updateCount($list){
+        $list.parents('.array-field').siblings('label').find('.count').text($list.find('li').length);
+    }
 });

views/helpers.js

@@ -68,2 +68,6 @@ var moment = require('moment'),
 
+        res.locals.noColon = function(word, replacement){
+            return word.replace(/\./g, replacement || '_');
+        };
+
         res.locals = _.extend(res.locals, helpers);
@@ -70,0 +74,0 @@

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

32092

increased by9.94%

Lines of code

499

increased by3.31%

No dependency changes