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 | 25 ++++++++++++++-----------
1 files changed, 14 insertions(+), 11 deletions(-)
diff --git a/src/main/webapp/views/common/sidebar.html b/src/main/webapp/views/common/sidebar.html
index 3bccf52..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,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">
--
Gitblit v1.8.0