From 6c9202de3a38ea7c4d32d229e890a5bb8fff9509 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 금, 17 12월 2021 18:23:29 +0900
Subject: [PATCH] Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa
---
src/main/webapp/views/common/sidebar.html | 47 +++++++++++++++++++++++------------------------
1 files changed, 23 insertions(+), 24 deletions(-)
diff --git a/src/main/webapp/views/common/sidebar.html b/src/main/webapp/views/common/sidebar.html
index 468c410..73a3c59 100644
--- a/src/main/webapp/views/common/sidebar.html
+++ b/src/main/webapp/views/common/sidebar.html
@@ -69,8 +69,6 @@
</ul>
</div>
</div>
-
-
</div>
<!--------------------
@@ -84,13 +82,6 @@
</div>
<span translate="common.dashboard">���떆蹂대뱶</span>
</a>
- </li>
- <li class="pointer">
- <a ng-click="fn.moveMenu('issues.list')" tabindex="-1">
- <div class="icon-w">
- <div class="os-icon os-icon-layers"></div>
- </div>
- <span translate="issue.managementIssue">�씠�뒋 愿�由�</span></a>
</li>
<!--
<li class="">
@@ -191,7 +182,12 @@
<div class="logo-element"></div>
</a>
</div>
+
<div class="logged-user-w avatar-inline">
+ <div class="row mb-1" ng-if="$root.myLevel != null" >
+ <span class="issue-main-label offset-detail-5 badge badge-primary">{{$root.myLevel}}</span>
+ <span class="issue-main-label offset-detail-1 badge badge-success">{{$root.myDepartments}}</span>
+ </div>
<div class="logged-user-i">
<div class="avatar-w">
<img alt="" ng-src="{{$root.user.profile}}">
@@ -201,7 +197,7 @@
{{$root.user.name}}
</div>
</div>
- <div class="logged-user-toggler-arrow">
+ <div class="logged-user-toggler-arrow_change">
<div class="os-icon os-icon-chevron-down"></div>
</div>
<div class="logged-user-menu color-style-bright">
@@ -258,16 +254,18 @@
</a>
</li>
<li class="sub-header">
- <span>Tasks</span>
+ <span>ISSUE LIST</span>
</li>
- <li class="pointer">
- <a ng-click="fn.moveMenu('issues.list')" tabindex="-1">
+
+ <li ng-repeat="issueType in $root.workIssueTypes" >
+ <a class="cursor" tabindex="-1" ng-click="fn.changeIssueListMenu(issueType.id)">
<div class="icon-w">
- <div class="os-icon os-icon-layers"></div>
+ <div class="os-icon os-icon-layout"></div>
</div>
- <span translate="issue.managementIssue">�씠�뒋 愿�由�</span>
+ <span>{{issueType.name}}</span>
</a>
</li>
+
<!--
<li class="">
<a ui-sref="tasks.agileBoard" tabindex="-1">
@@ -332,17 +330,17 @@
<span translate="managementType.managementIssueType">�씪媛� �쑀�삎 愿�由�</span></a>
</li>
- <li class="sub-header" ng-if="$root.checkMngPermissionSettings()">
- <span>Etc</span>
+ <li class="sub-header" ng-if="$root.checkMngPermission('USER_PERMISSION_MNG_PARTNER')">
+ <span>PARTNER LIST</span>
</li>
- <li class="" ng-if="$root.checkMngPermission('USER_PERMISSION_MNG_ISSUE_STATUS')">
+ <li class="" ng-if="$root.checkMngPermission('USER_PERMISSION_MNG_PARTNER')">
<a ui-sref="companyField.list" tabindex="-1">
<div class="icon-w">
<div class="os-icon os-icon-agenda-1"></div>
</div>
<span translate="common.customCompanyField">�뾽泥� 愿�由�</span></a>
</li>
- <li class="" ng-if="$root.checkMngPermission('USER_PERMISSION_MNG_ISSUE_STATUS')">
+ <li class="" ng-if="$root.checkMngPermission('USER_PERMISSION_MNG_PARTNER')">
<a ui-sref="ispField.list" tabindex="-1">
<div class="icon-w">
@@ -350,13 +348,14 @@
</div>
<span translate="common.customIspField">ISP 愿�由�</span></a>
</li>
- <li class="" ng-if="$root.checkMngPermission('USER_PERMISSION_MNG_ISSUE_STATUS')">
+ <li class="" ng-if="$root.checkMngPermission('USER_PERMISSION_MNG_PARTNER')">
<a ui-sref="hostingField.list" tabindex="-1">
<div class="icon-w">
<div class="os-icon os-icon-agenda-1"></div>
</div>
<span translate="common.customHostingField">�샇�뒪�똿 愿�由�</span></a>
</li>
+
<li class="sub-header" ng-if="$root.checkMngPermissionManager()">
<span>Management</span>
</li>
@@ -389,11 +388,11 @@
<span translate="guide.manageGuide">媛��씠�뱶 愿�由�</span></a>
</li>
- <li class="sub-header">
+ <li class="sub-header" ng-if="$root.checkMngPermission('USER_PERMISSION_MNG_API')">
<span>API</span>
</li>
- <li>
+ <li ng-if="$root.checkMngPermission('USER_PERMISSION_MNG_API')">
<a ui-sref="api.auth" tabindex="-1">
<div class="icon-w">
<div class="os-icon os-icon-package"></div>
@@ -401,14 +400,14 @@
<span translate="api.auth">API �씤利�</span></a>
</li>
- <li>
+ <li ng-if="$root.checkMngPermission('USER_PERMISSION_MNG_API')">
<a ui-sref="api.setting" tabindex="-1">
<div class="icon-w">
<div class="os-icon os-icon-package"></div>
</div>
<span translate="api.setting">API �꽕�젙</span></a>
</li>
- <li>
+ <li ng-if="$root.checkMngPermission('USER_PERMISSION_MNG_API')">
<a ui-sref="api.monitor" tabindex="-1">
<div class="icon-w">
<div class="os-icon os-icon-package"></div>
--
Gitblit v1.8.0