From 28a5d26c4fca283814d3fe35f0146ee59d113b9e Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Mon, 22 Oct 2018 18:10:09 +0800
Subject: [PATCH] fix  v2-manager.html permission

---
 src/main/ui/main_menu.html             | 46 ++++++++++++++------------
 src/main/ui/static/menu/managerMenu.js |  2 ++
 2 files changed, 26 insertions(+), 22 deletions(-)

diff --git a/src/main/ui/main_menu.html b/src/main/ui/main_menu.html
index b506f3e73..d5c210a04 100644
--- a/src/main/ui/main_menu.html
+++ b/src/main/ui/main_menu.html
@@ -6,16 +6,17 @@
 </style>
 <div class="content-wrapper autoheight" style="margin-left: 0px">
     <div class="content" style="background-color: #FFF">
+<!--
         <div class="list-group">
-            <!--<div class="row" ng-if="('partnerapply'|withModule) && (currentUser.org_id==null||currentUser.org_id==1)">-->
-                <!--<div class="col-sm-2 col-lg-2 col-xs-6">-->
-                    <!--<div class="description-block">-->
-                        <!--<label>待处理事项</label>-->
-                    <!--</div>-->
-                <!--</div>-->
-            <!--</div>-->
+            <div class="row" ng-if="('partnerapply'|withModule) && (currentUser.org_id==null||currentUser.org_id==1)">
+                <div class="col-sm-2 col-lg-2 col-xs-6">
+                    <div class="description-block">
+                        <label>待处理事项</label>
+                    </div>
+                </div>
+            </div>
             <div class="row">
-                <!--<div class="col-sm-2 col-lg-2 col-xs-6">
+                <div class="col-sm-2 col-lg-2 col-xs-6">
                     <a ui-sref="sysconfig" ui-sref-opts="{reload:true}">
                         <div class="description-block">
                             <img src="/static/images/main_menu/to_be_treated_1.png"/>
@@ -24,10 +25,11 @@
                             </div>
                         </div>
                     </a>
-                </div>-->
+                </div>
             </div>
         </div>
-        <div class="list-group">
+-->
+        <div class="list-group" ng-if="role!='administrator' && role!='developer' && roll!='sitemanager'">
             <div class="row">
                 <div class="col-sm-2 col-lg-2 col-xs-6" id="partners">
                     <div class="description-block">
@@ -98,7 +100,7 @@
                 </div>
             </div>
         </div>
-        <div class="list-group">
+        <div class="list-group" ng-if="role!='administrator' && role!='developer' && roll!='sitemanager'">
             <div class="row" >
                 <div class="col-sm-2 col-lg-2 col-xs-6" id="transaction">
                     <div class="description-block">
@@ -159,7 +161,7 @@
                 </div>
             </div>
         </div>
-        <div class="list-group">
+        <div class="list-group" ng-if="role=='riskmanager'">
             <div class="row" ng-if="('clientrate'|withModule)||('monitor'|withModule) || ('customerRankingAnalysisApp'|withModule)">
                 <div class="col-sm-2 col-lg-2 col-xs-6" id="risk">
                     <div class="description-block">
@@ -230,7 +232,7 @@
                 </div>
             </div>
         </div>
-      <div class="list-group">
+        <div class="list-group" ng-if="role=='compliance'">
           <div class="row">
               <div class="col-sm-2 col-lg-2 col-xs-6">
                   <div class="description-block">
@@ -304,7 +306,7 @@
         </div>
 
 
-        <div class="list-group">
+        <div class="list-group" ng-if="role=='salesmanager'">
             <div class="row" ng-if="('citypartner'|withModule)||('org'|withModule)||(('org_sale'|withModule)&&(currentUser.org_id==null||currentUser.org_id==1 ||('1000000000000'|withRole)))||('orgcommission'|withModule)" >
                 <div class="col-sm-2 col-lg-2 col-xs-6" id="citypartners">
                     <div class="description-block">
@@ -367,7 +369,7 @@
 -->
             </div>
         </div>
-        <div class="list-group">
+        <div class="list-group" ng-if="role=='bduser' || role=='salesmanager' || role=='director'">
             <div class="row" ng-if="('1000'|withRole)|| ('bdsale'|withModule) || ('bdprize'|withModule)">
                 <div class="col-sm-2 col-lg-2 col-xs-6" id="bd">
                     <div class="description-block">
@@ -427,7 +429,7 @@
                     </a></div>
             </div>
         </div>
-        <div class="list-group">
+        <div class="list-group" ng-if="role=='sitemanager'">
             <div class="row" ng-if="('1011110'|withRole) || currentUser.org_id==null">
                 <div class="col-sm-2 col-lg-2 col-xs-6">
                     <div class="description-block" id="art">
@@ -550,7 +552,7 @@
                 </div>-->
             </div>
         </div>
-        <div class="list-group">
+        <div class="list-group" ng-if="role=='sitemanager'">
             <div class="row" ng-if="('0100001'|withRole)">
                 <div class="col-sm-2 col-lg-2 col-xs-6">
                     <div class="description-block" id="cms">
@@ -591,7 +593,7 @@
                 </div>
             </div>
         </div>
-        <div class="list-group">
+        <div class="list-group" ng-if="role=='accountant' || role=='director'">
             <div class="row" ng-if="('settleReport'|withModule)||('platformRevenue'|withModule) ||('austrac'|withModule) ||('1000'|withRole)">
                 <div class="col-sm-2 col-lg-2 col-xs-6" id="staff">
                     <div class="description-block">
@@ -660,7 +662,7 @@
                     </a></div>
             </div>
         </div>
-        <div class="list-group">
+        <div class="list-group" ng-if="role=='accountant' || role=='director'">
             <div class="row" >
                 <div class="col-sm-2 col-lg-2 col-xs-6" id="clearing">
                     <div class="description-block">
@@ -735,7 +737,7 @@
                     </a></div>
             </div>
         </div>
-        <div class="list-group">
+        <div class="list-group" ng-if="role=='administrator'">
             <div class="row" ng-if="('org'|withModule)||('manager_accounts'|withModule)||('sysconfig'|withModule)">
                 <div class="col-sm-2 col-lg-2 col-xs-6" id="org">
                     <div class="description-block">
@@ -792,7 +794,7 @@
                     </a></div>
             </div>
         </div>
-        <div class="list-group">
+        <div class="list-group" ng-if="role=='administrator'">
             <div class="row" ng-if="(('10'|withRole)&&('merchantIdManage'|withModule)) || (('device'|withModule)) ||('sysconfig'|withModule)">
                 <div class="col-sm-2 col-lg-2 col-xs-6" id="setting">
                     <div class="description-block">
@@ -831,7 +833,7 @@
                     </a></div>
             </div>
         </div>
-        <div class="list-group">
+        <div class="list-group" ng-if="role=='developer'">
             <div class="row" ng-if="('log'|withModule) || ('dev'|withModule)">
                 <div class="col-sm-2 col-lg-2 col-xs-6" id="develop">
                     <div class="description-block">
diff --git a/src/main/ui/static/menu/managerMenu.js b/src/main/ui/static/menu/managerMenu.js
index a9149498e..06e83dedd 100644
--- a/src/main/ui/static/menu/managerMenu.js
+++ b/src/main/ui/static/menu/managerMenu.js
@@ -10,6 +10,8 @@ define(['angular', 'uiRouter', 'uiBootstrap'], function (angular) {
     }]);
     app.controller('listMenuCtrl', ['$scope', '$http', '$filter','$uibModal','$location', '$anchorScroll','$stateParams', function ($scope, $http,$filter, $uibModal,$location, $anchorScroll,$stateParams) {
 
+
+        $scope.role = $stateParams["role"];
         var gotohash = function (role) {
             switch (role) {
                 case "Compliance" :