44

app/controllers/admin/forumIdentifyUser.js

@@ -10,6 +10,7 @@ var forumUserService=require('../../service/forumUserService');
 var forumThreadService=require('../../service/forumThreadService');
 var httpService=require('../../service/httpService');
 var forumLimitActionRefService=require('../../service/forumLimitActionRefService');
+var forumLimitActionConfigService=require('../../service/forumLimitActionConfigService');
 
 var async=require('async');
 
@@ -59,9 +60,6 @@ var checkLimitAction = function(req, res) {
 	                    array.push(obj);
 	                }
 	                req.session.mobileForumUser.limit_actions = array;
-	                console.log('------------');
-	                console.log(req.session.mobileForumUser);
-	                console.log('------------');
 	                res.json('success');
 				}else{
 					req.session.mobileForumUser.limit_actions = null;
@@ -142,6 +140,11 @@ router.post('/user/checkLimitAction', function(req, res, next) {
 	var entity=req.body;
 	var mid = entity.mid;
 	if(mid){
+		forumLimitActionConfigService.getAllLimitActionConfig(function(err,configs){
+			if(err){
+				console.error(err);
+				res.json(returnCode.BUSY);
+			}else{
 				var array = [];
 				forumLimitActionRefService.getLimitActionRefByMid(mid,function(err,forumLimitActionRef){
 					if (err) {
@@ -161,24 +164,28 @@ router.post('/user/checkLimitAction', function(req, res, next) {
 			                    }
 			                    array.push(obj);
 			                }
-
 			                var returnObject = {
 			                	errcode:'success',
+			                	configs:configs,
 			                	data:array
 			                }
 			                res.json(returnObject);
 						}else{
 							var returnObject = {
 			                	errcode:'success',
+			                	configs:configs,
 			                	data:[]
 			                }
 							res.json(returnObject);
 						}
 					}
 				});
+			}
+		});
 	}else{
 		var returnObject = {
         	errcode:'success',
+        	configs:configs,
         	data:[]
         }
 		res.json(returnObject);