fixed boolean issue

vikasaditya · Apr 23, 2012 · b76e7a8 · b76e7a8
1 parent 7d78691
commit b76e7a8
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/plugins/passport/passport.js b/plugins/passport/passport.js
@@ -58,9 +58,9 @@ PassportPlugin.prototype.onAuth = function (req, res) {
 }
 PassportPlugin.prototype.filters = function () {
     var passfield = this.options.passwordField || 'password';
-    var authenticate = passport.authenticate('local', { failureRedirect:this.pluginUrl+'/check' });
+    var authenticate = passport.authenticate('local', { failureRedirect:this.pluginUrl + '/check' });
     var app = this.app;
-    app.post(this.pluginUrl,  this.encryptCredentials.bind(this), authenticate, this.onAuth.bind(this));
+    app.post(this.pluginUrl, this.encryptCredentials.bind(this), authenticate,   this.onAuth.bind(this));
 
     app.get(this.pluginUrl + '/check', this.ensureAuthenticated.bind(this), this.onAuth.bind(this));
 
@@ -72,7 +72,10 @@ PassportPlugin.prototype.filters = function () {
     app.all(this.baseUrl + '*', function (req, res, next) {
         if (req.authrequired) {
             if (req.body[passfield])
-               return authenticate(req, res, next);
+                this.encryptCredentials(req, res, function (err) {
+                    if (err) return next(err);
+                    return authenticate(req, res, next);
+                })
         }
         next();
 

diff --git a/plugins/static/public/js/libs/bobamo/edit.js b/plugins/static/public/js/libs/bobamo/edit.js
@@ -74,7 +74,7 @@ define([
             var save = this.form.getValue();
             //handle nested objects.
             _(save).each(function (v, k) {
-                if (_.isEmpty(v))
+                if (_.isString(v) && _.isEmpty(v))
                     v = null;
 
                 if (k && k.indexOf('.') > -1) {

diff --git a/plugins/static/public/js/libs/table/jquery.sorter.css b/plugins/static/public/js/libs/table/jquery.sorter.css
@@ -35,6 +35,7 @@
 
 .sorter .arrow.up {
     border-bottom: 4px solid black;
+    margin: 0 0 1px 0;
 }
 
 .sorter .arrow.activate {