From f76592e90c1a2810b65b5a93fadf2c19c13b6bc4 Mon Sep 17 00:00:00 2001 From: 이민희 <mhlee@maprex.co.kr> Date: 금, 17 12월 2021 18:23:21 +0900 Subject: [PATCH] 상위이슈의 상세페이지에서 하위이슈에 대한 활동내역 보여주기 완료 --- src/main/webapp/views/common/sidebar.html | 26 ++++++++++++++++++-------- 1 files changed, 18 insertions(+), 8 deletions(-) diff --git a/src/main/webapp/views/common/sidebar.html b/src/main/webapp/views/common/sidebar.html index 5705c8a..3bccf52 100644 --- a/src/main/webapp/views/common/sidebar.html +++ b/src/main/webapp/views/common/sidebar.html @@ -192,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"> @@ -234,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"> @@ -252,9 +261,9 @@ <span>ISSUE LIST</span> </li> - <li ng-repeat="issueType in $root.workIssueTypes"> + <li ng-repeat="issueType in $root.workIssueTypes" > <a class="cursor" tabindex="-1" ng-click="fn.changeIssueListMenu(issueType.id)"> - <div class="icon-w "> + <div class="icon-w"> <div class="os-icon os-icon-layout"></div> </div> <span>{{issueType.name}}</span> @@ -325,17 +334,17 @@ <span translate="managementType.managementIssueType">�씪媛� �쑀�삎 愿�由�</span></a> </li> - <li class="sub-header" ng-if="$root.checkMngPermissionSettings()"> - <span>紐⑸줉愿�由�</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"> @@ -343,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> -- Gitblit v1.8.0