diff --git a/src/main/ui/static/boot/managerMainAppv2.js b/src/main/ui/static/boot/managerMainAppv2.js index fc224facd..fd4c3b9b6 100644 --- a/src/main/ui/static/boot/managerMainAppv2.js +++ b/src/main/ui/static/boot/managerMainAppv2.js @@ -9,22 +9,22 @@ define(['angular', 'angularSanitize', 'angularAnimate', 'angularMessages', 'uiRo var getRoleMenulist = function () { var roleMenu = []; - if ((window.currentUser.role.toString(2) | 1) >0){ + if ((window.currentUser.role.toString(2) & 1) >0){ roleMenu.push("administrator"); } - if ((window.currentUser.role.toString(2) | 10) >0){ + if ((window.currentUser.role.toString(2) & 10) >0){ roleMenu.push("compliance"); } - if ((window.currentUser.role.toString(2) | 100) >0){ + if ((window.currentUser.role.toString(2) & 100) >0){ roleMenu.push("bduser"); } - if ((window.currentUser.role.toString(2) | 1000) >0){ + if ((window.currentUser.role.toString(2) & 1000) >0){ roleMenu.push("accountant"); } - if ((window.currentUser.role.toString(2) | 1000000) >0){ + if ((window.currentUser.role.toString(2) & 1000000) >0){ roleMenu.push("director"); } - if ((window.currentUser.role.toString(2) | 10000000) >0){ + if ((window.currentUser.role.toString(2) & 10000000) >0){ roleMenu.push("sitemanager"); } if ((window.currentUser.role.toString(2) & 100000000) >0){ @@ -64,8 +64,14 @@ define(['angular', 'angularSanitize', 'angularAnimate', 'angularMessages', 'uiRo app.controller('managerIndexCtrl', ['$scope', '$rootScope', '$http', '$log', '$timeout', '$interval', '$uibModal', '$filter', 'myLoginLogView', 'commonDialog', function ($scope, $rootScope, $http, $log, $timeout, $interval, $uibModal, $filter, myLoginLogView, commonDialog) { if (sessionStorage.getItem('roleNum') =='N'){ - $scope.headerDisplay = false; - $scope.copyright = false; + if (window.location.hash == "" || window.location.hash == "#/home") { + $scope.headerDisplay = false; + $scope.copyright = false; + }else { + $scope.headerDisplay = true; + $scope.copyright = true; + } + }else { $scope.headerDisplay = true; $scope.copyright = true;