From 3da71368d451c455872a6ca114c0540e65308aef Mon Sep 17 00:00:00 2001 From: 이민희 <mhlee@maprex.co.kr> Date: 화, 28 12월 2021 15:32:43 +0900 Subject: [PATCH] 공지사항,Faq,가이드,Qna 통합 수정 - 일반회원은 faq,가이드 활성화 된 게시글만 보이기 - 엑셀다운,삭제 기능 추가(기존에 없었음) - 삭제,수정 시 권한 체크 --- src/main/webapp/views/common/sidebar.html | 31 +++++++++++++++++-------------- 1 files changed, 17 insertions(+), 14 deletions(-) diff --git a/src/main/webapp/views/common/sidebar.html b/src/main/webapp/views/common/sidebar.html index 3bccf52..2272044 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,10 +197,7 @@ {{$root.user.name}} </div> </div> - <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="logged-user-toggler-arrow_change"> <div class="os-icon os-icon-chevron-down"></div> </div> <div class="logged-user-menu color-style-bright"> @@ -237,12 +239,6 @@ </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"> @@ -269,7 +265,14 @@ <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"> @@ -370,21 +373,21 @@ </div> <span translate="notice.notice">怨듭��궗�빆</span></a> </li> - <li class="" ng-if="$root.checkMngPermission('USER_PERMISSION_MNG_FAQ')"> + <li class=""> <a ui-sref="faqs.list" tabindex="-1"> <div class="icon-w"> <div class="os-icon os-icon-ui-92"></div> </div> <span translate="FAQ.manageFAQ">FAQ 愿�由�</span></a> </li> - <li class="" ng-if="$root.checkMngPermission('USER_PERMISSION_MNG_QNA')"> + <li class=""> <a ui-sref="qna.list" tabindex="-1"> <div class="icon-w"> <div class="os-icon os-icon-phone-21"></div> </div> <span translate="QNA.manageQNA">QnA 愿�由�</span></a> </li> - <li class="" ng-if="$root.checkMngPermission('USER_PERMISSION_MNG_GUIDE')"> + <li class=""> <a ui-sref="guide.list" tabindex="-1"> <div class="icon-w"> <div class="os-icon os-icon-phone-21"></div> -- Gitblit v1.8.0