From 4cf0a657b1e55340caf9ed0e384e7acf7f5790ca Mon Sep 17 00:00:00 2001 From: wyu <kknd09321@nate.com> Date: 월, 27 12월 2021 23:01:18 +0900 Subject: [PATCH] 부서명 배열값 합치기 수정 --- src/main/webapp/views/common/sidebar.html | 31 ++++++++++++++++++++++--------- 1 files changed, 22 insertions(+), 9 deletions(-) diff --git a/src/main/webapp/views/common/sidebar.html b/src/main/webapp/views/common/sidebar.html index 5705c8a..dc7725e 100644 --- a/src/main/webapp/views/common/sidebar.html +++ b/src/main/webapp/views/common/sidebar.html @@ -182,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.user.levelName != null" > + <span class="issue-main-label offset-detail-5 badge badge-primary">{{$root.user.levelName}}</span> + <span class="issue-main-label offset-detail-1 badge badge-department">{{$root.departments}}</span> + </div> <div class="logged-user-i"> <div class="avatar-w"> <img alt="" ng-src="{{$root.user.profile}}"> @@ -192,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"> @@ -252,15 +257,22 @@ <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> </a> </li> - + <li ng-if="$root.workIssueTypes.length == 0"> + <a tabindex="-1"> + <div class="icon-w"> + <div class="os-icon os-icon-delete"></div> + </div> + <span translate="common.notIssueType">�씠�뒋 �쑀�삎�씠 �뾾�뒿�땲�떎.</span> + </a> + </li> <!-- <li class=""> <a ui-sref="tasks.agileBoard" tabindex="-1"> @@ -325,17 +337,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 +355,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