From bdb1efdc604fce543e21152b4263a9362f64389f Mon Sep 17 00:00:00 2001
From: minhee <alsdldlfrl@gmail.com>
Date: 목, 10 3월 2022 15:35:19 +0900
Subject: [PATCH] - api 이슈 추가 시 입력한 ip에 속해있는 업체정보를 가진 이슈의 하위로 입력되도록 수정 - issue_company 테이블에 ip 컬럼 추가 및 이슈 추가/수정 시 ip 대역대 항목 추가
---
src/main/webapp/views/common/sidebar.html | 66 +++++++++++++++++++++++++-------
1 files changed, 51 insertions(+), 15 deletions(-)
diff --git a/src/main/webapp/views/common/sidebar.html b/src/main/webapp/views/common/sidebar.html
index 221ef55..f864079 100644
--- a/src/main/webapp/views/common/sidebar.html
+++ b/src/main/webapp/views/common/sidebar.html
@@ -184,9 +184,9 @@
</div>
<div class="logged-user-w avatar-inline">
- <div class="row mb-1" ng-if="$root.myLevel != null" >
- <span class="issue-main-label offset-detail-5 badge badge-primary">{{$root.myLevel}}</span>
- <span class="issue-main-label offset-detail-1 badge badge-department">{{$root.myDepartments}}</span>
+ <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">
@@ -253,8 +253,33 @@
<span translate="common.dashboard">���떆蹂대뱶</span>
</a>
</li>
+
<li class="sub-header">
- <span>ISSUE LIST</span>
+ <span>Project</span>
+ </li>
+ <li>
+ <a ui-sref="projects.list" tabindex="-1">
+ <div class="icon-w">
+ <div class="os-icon os-icon-package"></div>
+ </div>
+ <span translate="common.project">�봽濡쒖젥�듃</span></a>
+ </li>
+
+ <li class="sub-header">
+ <span>ISSUE LIST [{{$root.workProject.name}}]</span>
+ </li>
+
+ <li>
+ <a class="cursor" tabindex="-1" ng-click="fn.changeIssueListMenu(null, false)">
+ <div class="icon-w">
+ <div class="os-icon os-icon-layout"></div>
+ </div>
+ <span translate="common.allIssueList">�쟾泥댁씠�뒋</span>
+ </a>
+ </li>
+
+ <li class="sub-header">
+ <span>ISSUE TYPE LIST</span>
</li>
<li ng-repeat="issueType in $root.workIssueTypes" >
@@ -291,16 +316,6 @@
<span translate="calendar.calendarTitle">罹섎┛�뜑</span></a>
</li>
-->
- <li class="sub-header">
- <span>Project</span>
- </li>
- <li>
- <a ui-sref="projects.list" tabindex="-1">
- <div class="icon-w">
- <div class="os-icon os-icon-package"></div>
- </div>
- <span translate="common.project">�봽濡쒖젥�듃</span></a>
- </li>
<li class="sub-header" ng-if="$root.checkMngPermissionSettings()">
<span>custom workflow</span>
@@ -363,7 +378,7 @@
<span translate="common.customHostingField">�샇�뒪�똿 愿�由�</span></a>
</li>
- <li class="sub-header" ng-if="$root.checkMngPermissionManager()">
+ <li class="sub-header">
<span>Management</span>
</li>
<li class="" ng-if="$root.checkMngPermission('USER_PERMISSION_MNG_NOTICE')">
@@ -380,6 +395,13 @@
</div>
<span translate="FAQ.manageFAQ">FAQ 愿�由�</span></a>
</li>
+ <li class="" ng-if="!$root.checkMngPermission('USER_PERMISSION_MNG_FAQ')">
+ <a ui-sref="faqs.list" tabindex="-1">
+ <div class="icon-w">
+ <div class="os-icon os-icon-ui-92"></div>
+ </div>
+ <span translate="FAQ.FAQ">FAQ</span></a>
+ </li>
<li class="" ng-if="$root.checkMngPermission('USER_PERMISSION_MNG_QNA')">
<a ui-sref="qna.list" tabindex="-1">
<div class="icon-w">
@@ -387,6 +409,13 @@
</div>
<span translate="QNA.manageQNA">QnA 愿�由�</span></a>
</li>
+ <li class="" ng-if="!$root.checkMngPermission('USER_PERMISSION_MNG_QNA')">
+ <a ui-sref="qna.list" tabindex="-1">
+ <div class="icon-w">
+ <div class="os-icon os-icon-phone-21"></div>
+ </div>
+ <span translate="QNA.QNA">QnA</span></a>
+ </li>
<li class="" ng-if="$root.checkMngPermission('USER_PERMISSION_MNG_GUIDE')">
<a ui-sref="guide.list" tabindex="-1">
<div class="icon-w">
@@ -394,6 +423,13 @@
</div>
<span translate="guide.manageGuide">媛��씠�뱶 愿�由�</span></a>
</li>
+ <li class="" ng-if="!$root.checkMngPermission('USER_PERMISSION_MNG_GUIDE')">
+ <a ui-sref="guide.list" tabindex="-1">
+ <div class="icon-w">
+ <div class="os-icon os-icon-phone-21"></div>
+ </div>
+ <span translate="guide.guide">媛��씠�뱶</span></a>
+ </li>
<li class="sub-header" ng-if="$root.checkMngPermission('USER_PERMISSION_MNG_API')">
<span>API</span>
--
Gitblit v1.8.0