From 48d1c18cfa4f7d9caab3fb057f78e208f2390b82 Mon Sep 17 00:00:00 2001
From: OldHawk <taobataoma@gmail.com>
Date: Fri, 26 Jan 2018 10:26:23 +0800
Subject: [PATCH] feat(forums): show forum attr of vipOnly/operOnly/readOnly

---
 .../client/views/admin/configure.client.view.html |  5 ++++-
 .../controllers/forums.server.controller.js       | 15 ++++++++++++++-
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/modules/forums/client/views/admin/configure.client.view.html b/modules/forums/client/views/admin/configure.client.view.html
index fece402a..362c6c61 100644
--- a/modules/forums/client/views/admin/configure.client.view.html
+++ b/modules/forums/client/views/admin/configure.client.view.html
@@ -17,7 +17,10 @@
                     <tbody>
                         <tr ng-repeat="f in vm.forums | filter: { category: cat.value }">
                             <td>
-                                <h4>{{f.name}} <span class="badge badge_mt" ng-show="f.readOnly">R</span>
+                                <h4>{{f.name}}
+                                    <span class="badge badge_mt" ng-show="f.readOnly">R</span>
+                                    <span class="badge badge_mt" ng-show="f.vipOnly">V</span>
+                                    <span class="badge badge_mt" ng-show="f.operOnly">O</span>
                                     <small>[<a href="#" ng-click="vm.popupEditForum($event, f);">{{'FORUMS.LINK_EDIT' | translate}}</a>]</small>
                                     <small ng-if="!f.operOnly">[<a href="#"
                                                uib-popover-template="vm.addModeratorPopover.templateUrl"
diff --git a/modules/forums/server/controllers/forums.server.controller.js b/modules/forums/server/controllers/forums.server.controller.js
index 1afefc83..40d7bf0c 100644
--- a/modules/forums/server/controllers/forums.server.controller.js
+++ b/modules/forums/server/controllers/forums.server.controller.js
@@ -32,8 +32,20 @@ var mtDebug = require(path.resolve('./config/lib/debug'));
  * @param res
  */
 exports.list = function (req, res) {
+  var condition = {};
+
+  if (!req.user.isOper) {
+    condition.operOnly = false;
+  }
+  if (!req.user.isOper && !req.user.isVip) {
+    condition.vipOnly = false;
+  }
+
+  console.log('------------------------condition------------------------');
+  console.log(condition);
+
   var findForumsList = function (callback) {
-    Forum.find()
+    Forum.find(condition)
       .sort('category order -createdat')
       .populate({
         path: 'lastTopic',
@@ -54,6 +66,7 @@ exports.list = function (req, res) {
 
   var forumsTopicsCount = function (callback) {
     Topic.aggregate({
+      // $match: condition,
       $project: {
         'forum': '$forum',
         'year': {