elderwand 0.1.60 → 0.1.62

package/BaseController/BaseController.js

@@ -9,7 +9,7 @@
  var path = require('path');
 //var utils = rekuire('/lib/utils');
 var extend = require('util')._extend;
-
+var ObjectId = require('mongoose').Types.ObjectId
 var viewsDir = 'app/views/'
 module.exports.getChildControllers = function(){
 	return childControllers;
@@ -26,30 +26,34 @@ module.exports.inherit = function (child) {
 	 child.coveredMethods = [];
 	 child.coveredMethods.push("load"); 
 	 child.load = function (req, res, next, id) {
-	 	child.model.load(id, function (err, model) {
-	 		if (err){
-	 			res.errors.push(err)
-	 			res.statusData = "Error";
-	 			return next(err);
-	 		}
-	 		if (!model){
-	 			res.statusData = "Error"
-	 			return next(new Error('not found'));
-	 		}
-	 		if (!model.canSeeByUser(req.user)) {
-	 			//req.flash('info', 'Bu işlemi yapmak için yetkiniz yok');
-	 			if(req.user){
-	 				res.statusData = "Error"
-	 				return res.redirect('/users/' + req.user.id);
-	 			}else{
-	 				res.statusData = "Error"
-	 				return res.redirect('/login');
-				}
-	 			return;
-	 		}
-	 		req[child.singularName] = model;
-	 		next();
-	 	});
+	 	if(ObjectId.isValid(id)){
+		 	child.model.load(id, function (err, model) {
+		 		if (err){
+		 			res.errors.push(err)
+		 			res.statusData = "Error";
+		 			return next(err);
+		 		}
+		 		if (!model){
+		 			res.statusData = "Error"
+		 			return next(new Error('not found'));
+		 		}
+		 		if (!model.canSeeByUser(req.user)) {
+		 			//req.flash('info', 'Bu işlemi yapmak için yetkiniz yok');
+		 			if(req.user){
+		 				res.statusData = "Error"
+		 				return res.redirect('/users/' + req.user.id);
+		 			}else{
+		 				res.statusData = "Error"
+		 				return res.redirect('/login');
+					}
+		 			return;
+		 		}
+		 		req[child.singularName] = model;
+		 		next();
+		 	});
+		 }else{
+		 	next()
+		 }
 	 };
 
 

package/Environment/environment.js

@@ -197,6 +197,22 @@ module.exports = function(){
         }
         return obj;
     });
+    addPropertyToClass(Array.prototype,"group", function(array, blend, keyFunc){
+        var obj = {};
+        for(var i = 0; i < this.length; i++){
+            var item = this[i];
+            var key = keyFunc(this[i], i);
+            if(item && key && !obj[key]){
+                obj[key] = []
+            }
+
+            if(item && key){
+                obj[key].push(item);
+            }
+            
+        }
+        return obj;
+    });
     addPropertyToClass(Array.prototype,"notIn", function(array, comp){
         var arr = [];
         for(var i = 0; i < this.length; i++){

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "elderwand",
-  "version": "0.1.60",
+  "version": "0.1.62",
   "description": "Mamtas Technology Internal Framework",
   "main": "./node_modules/.bin/nodemon index.js",
   "scripts": {