From 663ea2f2eca3b7da3bdaffb13eaac44433adb62f Mon Sep 17 00:00:00 2001
From: wyu <kknd09321@nate.com>
Date: 목, 16 12월 2021 13:13:54 +0900
Subject: [PATCH] 기록탭 html 태그 보이는 내용 수정 / 사이드바 사용자 프로필 등급, 부서명 표시 수정
---
src/main/webapp/views/common/sidebar.html | 51 +++++++++++++++++++++++++++------------------------
1 files changed, 27 insertions(+), 24 deletions(-)
diff --git a/src/main/webapp/views/common/sidebar.html b/src/main/webapp/views/common/sidebar.html
index 468c410..3bccf52 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="">
@@ -201,7 +192,10 @@
{{$root.user.name}}
</div>
</div>
- <div class="logged-user-toggler-arrow">
+ <div ng-if="$root.myDepartments == null" class="logged-user-toggler-arrow">
+ <div class="os-icon os-icon-chevron-down"></div>
+ </div>
+ <div ng-if="$root.myDepartments != null" class="logged-user-toggler-arrow_change">
<div class="os-icon os-icon-chevron-down"></div>
</div>
<div class="logged-user-menu color-style-bright">
@@ -243,6 +237,12 @@
</ul>
</div>
</div>
+ <div ng-if="$root.myLevel != null" class="issue-main-label offset-detail-5 mt-1">
+ <span>{{$root.myLevel}}</span>
+ </div>
+ <div ng-if="$root.myDepartments != null" class="issue-main-label offset-detail-5 mt-1">
+ <span>{{$root.myDepartments}}</span>
+ </div>
</div>
<ul class="main-menu">
@@ -258,16 +258,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 +334,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 +352,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 +392,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 +404,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