periodicjs.core.controller - npm Package Compare versions

Comparing version 1.90.119 to 1.90.200

lib/controller.js

@@ -432,109 +432,132 @@ /*
 
-	model.findByIdAndUpdate(id, updateOperation, function (err, saveddoc) {
-		if (err) {
-			if(callback){
-				callback(err,null);
+	if(options.forceupdate){
+		model.update({_id:id},updateOperation,function(err,numAffected){
+			if (err) {
+				if(callback){
+					callback(err,null);
+				}
+				else{
+					this.handleDocumentQueryErrorResponse({
+						err: err,
+						errorflash: err.message,
+						res: res,
+						req: req
+					});				
+				}
 			}
-			else{
-				this.handleDocumentQueryErrorResponse({
-					err: err,
-					errorflash: err.message,
-					res: res,
-					req: req
-				});				
-			}
-		}
-		else {
-			if(callback){
-				callback(null,saveddoc);
-			}
-			else if (req.query.format === 'json' || req.params.ext === 'json') {
-				req.flash('success', 'Saved');
-				responseData.result = 'success';
-				responseData.data = {};
-				responseData.data.flash_messages = req.flash();
-				if (options.population) {
-					model.findOne({
-						_id: saveddoc._id
-					}).populate(options.population).exec(function (err, popdoc) {
-						if (err) {
-							responseData.data.docpopulationerror = err;
-							responseData.data.status = 'couldnt populate';
-							responseData.data.doc = saveddoc;
-							res.send(responseData);
-						}
-						else {
-							responseData.data.doc = popdoc;
-							res.send(responseData);
-						}
-					});
+			else {
+				if(callback){
+					callback(null,numAffected);
 				}
-				else {
-					responseData.data.doc = saveddoc;
+				else if (req.query.format === 'json' || req.params.ext === 'json') {
+					req.flash('success', 'Saved');
+					responseData.result = 'success';
+					responseData.data = {numAffected:numAffected};
+					responseData.data.flash_messages = req.flash();
 					res.send(responseData);
 				}
+				else {
+					req.flash('success', 'Saved');
+					res.redirect(successredirect);
+				}
 			}
-			else if (appendid) {
-				req.flash('success', 'Saved');
-				res.redirect(successredirect + saveddoc._id);
+		});
+	}
+	else{
+			model.findByIdAndUpdate(id, updateOperation, function (err, saveddoc) {
+			console.log('tried to save',updateOperation);
+			if (err) {
+				if(callback){
+					callback(err,null);
+				}
+				else{
+					this.handleDocumentQueryErrorResponse({
+						err: err,
+						errorflash: err.message,
+						res: res,
+						req: req
+					});				
+				}
 			}
 			else {
-				req.flash('success', 'Saved');
-				res.redirect(successredirect);
-			}
-			//save revision
-			if (options.saverevision && originalrevision) {
-				var changesetdata = updatedoc,
-					changesetdiff;
-				delete changesetdata.docid;
-				delete changesetdata._csrf;
-				delete changesetdata.save_button;
-				delete changesetdata.changes;
-				delete originalrevision.changes;
-				delete changesetdata._wysihtml5_mode;
-				delete changesetdata.doctypename;
-			  delete changesetdata.doctypenamelink;
-			  delete changesetdata.time;
-			  delete changesetdata.searchdocumentsbutton;
-			  delete changesetdata.date;
-			  delete changesetdata.mediafiles;
-
-				changesetdiff = returnObjectDifference(originalrevision, changesetdata);
-				if(Object.keys(changesetdiff).length>0){
-					model.findByIdAndUpdate(
-						id, {
-							$push: {
-								'changes': {
-									changeset: changesetdiff,
-									editor:req.user._id,
-									editor_username:req.user.username
-								}
-							}
-						},// // {safe: true, upsert: true},
-						function (err) {
+				if(callback){
+					callback(null,saveddoc);
+				}
+				else if (req.query.format === 'json' || req.params.ext === 'json') {
+					req.flash('success', 'Saved');
+					responseData.result = 'success';
+					responseData.data = {};
+					responseData.data.flash_messages = req.flash();
+					if (options.population) {
+						model.findOne({
+							_id: saveddoc._id
+						}).populate(options.population).exec(function (err, popdoc) {
 							if (err) {
-								logger.error(err);
+								responseData.data.docpopulationerror = err;
+								responseData.data.status = 'couldnt populate';
+								responseData.data.doc = saveddoc;
+								res.send(responseData);
 							}
-						}
-					);
+							else {
+								responseData.data.doc = popdoc;
+								res.send(responseData);
+							}
+						});
+					}
+					else {
+						responseData.data.doc = saveddoc;
+						res.send(responseData);
+					}
 				}
-				else{
-					logger.silly('no changes to save');
+				else if (appendid) {
+					req.flash('success', 'Saved');
+					res.redirect(successredirect + saveddoc._id);
 				}
+				else {
+					req.flash('success', 'Saved');
+					res.redirect(successredirect);
+				}
+				//save revision
+				if (options.saverevision && originalrevision) {
+					var changesetdata = updatedoc,
+						changesetdiff;
+					delete changesetdata.docid;
+					delete changesetdata._csrf;
+					delete changesetdata.save_button;
+					delete changesetdata.changes;
+					delete originalrevision.changes;
+					delete changesetdata._wysihtml5_mode;
+					delete changesetdata.doctypename;
+				  delete changesetdata.doctypenamelink;
+				  delete changesetdata.time;
+				  delete changesetdata.searchdocumentsbutton;
+				  delete changesetdata.date;
+				  delete changesetdata.mediafiles;
 
-				// model.populate(
-				// 	changesetdata,
-				// 	options.population,
-				// 	function(err,populatedchangeset){
-				// 		if(err){
-				// 			logger.error(err);
-				// 		}
-				// 		else{	
-							
-							
-				// 		}
-				// });
+					changesetdiff = returnObjectDifference(originalrevision, changesetdata);
+					if(Object.keys(changesetdiff).length>0){
+						model.findByIdAndUpdate(
+							id, {
+								$push: {
+									'changes': {
+										changeset: changesetdiff,
+										editor:req.user._id,
+										editor_username:req.user.username
+									}
+								}
+							},// // {safe: true, upsert: true},
+							function (err) {
+								if (err) {
+									logger.error(err);
+								}
+							}
+						);
+					}
+					else{
+						logger.silly('no changes to save');
+					}
+				}
 			}
-		}
-	}.bind(this));
+		}.bind(this));
+	}
 };
@@ -541,0 +564,0 @@

package.json

 {
   "name": "periodicjs.core.controller",
   "description": "Customizable CMS platform",
-  "version": "1.90.119",
+  "version": "1.90.200",
   "main": "index.js",
@@ -37,3 +37,2 @@ "engines": {
     "grunt-simple-mocha": ">=0.4.0",
-    "jsdoc": "3.3.0-alpha5",
     "mocha": "1.9.0"
@@ -63,6 +62,6 @@ },
   "homepage": "https://github.com/typesettin/periodicjs.core.controllerhelper",
-  "_id": "periodicjs.core.controllerhelper@1.1.1",
-  "_shasum": "3331e335d977d76fc1784aeca7ef70f715e03b55",
-  "_from": "periodicjs.core.controllerhelper@1.1.1",
-  "_npmVersion": "1.5.0-alpha-1",
+  "_id": "periodicjs.core.controller@1.90.119",
+  "_shasum": "90f35d1e33c27afd8263988541973314f226d94c",
+  "_from": "periodicjs.core.controller@1.90.119",
+  "_npmVersion": "1.5.0-alpha-4",
   "_npmUser": {
@@ -79,8 +78,7 @@ "name": "yawetse",
   "dist": {
-    "shasum": "3331e335d977d76fc1784aeca7ef70f715e03b55",
-    "tarball": "http://registry.npmjs.org/periodicjs.core.controllerhelper/-/periodicjs.core.controllerhelper-1.1.1.tgz"
+    "shasum": "90f35d1e33c27afd8263988541973314f226d94c",
+    "tarball": "http://registry.npmjs.org/periodicjs.core.controller/-/periodicjs.core.controller-1.90.119.tgz"
   },
   "directories": {},
-  "_resolved": "https://registry.npmjs.org/periodicjs.core.controllerhelper/-/periodicjs.core.controllerhelper-1.1.1.tgz",
-  "readme": "ERROR: No README data found!"
+  "_resolved": "https://registry.npmjs.org/periodicjs.core.controller/-/periodicjs.core.controller-1.90.119.tgz"
 }

No alert changes

Improved metrics

Total package byte prevSize

119823

increased by0.5%

Lines of code

1186

increased by2.24%

No dependency changes