elderwand 0.1.41 → 0.1.46

package/BaseController/BaseController.js

@@ -151,12 +151,11 @@ module.exports.inherit = function (child) {
 			pluralName: child.pluralName,
 			//menu: utils.getUserMenu(req.user),
 		};
-		data[child.singularName] = new child.model({});
-		if (data[child.singularName]){// && data[child.singularName].canEditByUser(req.user)) {
+		var virtual = new child.model({});
+		if (virtual){// && virtual.canEditByUser(req.user)) {
 			child.loadRelatedData(data, req, res, function (relatedData) {
 				data.inject(relatedData);
 				res.statusData = "Success"
-				data.item = data[child.singularName]
 
 
 				if(fs.existsSync(viewsDir + child.pluralName)){
@@ -311,7 +310,7 @@ module.exports.inherit = function (child) {
 			if (model && model.canEditByUser(req.user)) {
 				child.handleFiles(req, res, function(err){
 					model.save(function (error, model) {
-						EWLog(error, err)
+						//EWLog(error, err)
 						if (!err && !error) {
 							req.flash('success', child.title + ' Başarıyla Güncellendi');
 							res.model = model
@@ -384,7 +383,7 @@ module.exports.inherit = function (child) {
 			//menu: utils.getUserMenu(req.user),
 		};
 		data[child.singularName] = req[child.singularName];
-		if (data[child.singularName]){// && data[child.singularName].canSeeByUser(req.user)) {
+		if (data[child.singularName] && data[child.singularName].canSeeByUser(req.user)) {
 			child.loadRelatedData(data, req, res, function (relatedData) {
 				data.inject(relatedData)
 				res.statusData = "Success"
@@ -419,8 +418,8 @@ module.exports.inherit = function (child) {
 		//	return;
 		//};
 		var model = req[child.singularName];
-		if (model){// && model.canEditByUser(req.user)) {
-			model.remove(function (err) {
+		if (model && model.canEditByUser(req.user)) {
+			model.removeOne(function (err) {
 				req.flash('info', 'Başarıyla Silindi');
 				res.statusData = "Success"
 				res.redirect('/' + child.pluralName);
@@ -465,7 +464,7 @@ module.exports.inherit = function (child) {
 		}else{
 			criteria = child.model.list(options, callback);
 		}
-		child.model.remove(criteria, function(err){
+		child.model.deleteMany(criteria, function(err){
 			req.flash('info', 'Başarıyla Silindi');
 			res.statusData = "Success"
 			res.redirect('/' + child.pluralName);
@@ -569,7 +568,7 @@ module.exports.inherit = function (child) {
 						mv(req.files[key].newPath, req.files[key].dataPath, next)
 					}
 				}, function(err){
-					EWLog(needToSave)
+					//EWLog(needToSave)
 					if(needToSave){
 						req[child.singularName].save(next) 
 					}else{

package/Environment/environment.js

@@ -377,7 +377,8 @@ module.exports = function(){
 
     addPropertyToClass(Object.prototype,"inject", function(relatedData, keys){
         if(relatedData && keys){
-            for (var key in keys) {
+            for (var i in keys) {
+                var key = keys[i]
                 this[key] = relatedData[key];
             }
         }else if (relatedData) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "elderwand",
-  "version": "0.1.41",
+  "version": "0.1.46",
   "description": "KLE Technologies Internal Framework",
   "main": "./node_modules/.bin/nodemon index.js",
   "scripts": {