From ad4e1278cdcdbe6a760e45a4d63c175864ae23a2 Mon Sep 17 00:00:00 2001
From: wyu <kknd09321@nate.com>
Date: 목, 02 12월 2021 19:33:39 +0900
Subject: [PATCH] 이슈유형에 따라 프로젝트 id 값 셋팅
---
src/main/webapp/scripts/config.js | 6 ++++++
src/main/webapp/views/issue/issueAdd.html | 2 +-
src/main/webapp/scripts/app/common/common.controller.js | 3 +++
src/main/webapp/views/issue/issueModify.html | 2 +-
src/main/webapp/assets/styles/main.css | 15 +++++++++++++++
src/main/webapp/scripts/app/issue/issueAdd.controller.js | 6 +++++-
src/main/webapp/views/common/header.html | 3 ++-
7 files changed, 33 insertions(+), 4 deletions(-)
diff --git a/src/main/webapp/assets/styles/main.css b/src/main/webapp/assets/styles/main.css
index 56fdb77..ae6d45f 100644
--- a/src/main/webapp/assets/styles/main.css
+++ b/src/main/webapp/assets/styles/main.css
@@ -30393,4 +30393,19 @@
.Template-area {
text-align: center;
}
+
+.TemplateEX {
+ float : left;
+}
+
+.Email-Templates {
+ height: 150px;
+ width: 300px;
+ display: none;
+ margin: 0 auto;
+}
+
+.Email-Template-detail {
+
+}
/* 媛꾪듃李⑦듃 end */
diff --git a/src/main/webapp/scripts/app/common/common.controller.js b/src/main/webapp/scripts/app/common/common.controller.js
index 173be03..741b63a 100644
--- a/src/main/webapp/scripts/app/common/common.controller.js
+++ b/src/main/webapp/scripts/app/common/common.controller.js
@@ -27,6 +27,7 @@
$scope.vm = {
message: "",
+ workProjectId : -1
};
@@ -55,6 +56,8 @@
break;
}
}
+ // sidebar �겢由��떆 �봽濡쒖젥�듃 �븘�씠�뵒 �꽕�젙
+ $rootScope.changeLastProject($rootScope.issueTypeMenu.projectVo.id);
if ($rootScope.issueTypeMenu != null) {
moveMenu("issues.list");
diff --git a/src/main/webapp/scripts/app/issue/issueAdd.controller.js b/src/main/webapp/scripts/app/issue/issueAdd.controller.js
index 459edce..cf89fa4 100644
--- a/src/main/webapp/scripts/app/issue/issueAdd.controller.js
+++ b/src/main/webapp/scripts/app/issue/issueAdd.controller.js
@@ -798,7 +798,11 @@
$scope.fn.projects.push($rootScope.workProject);
$scope.fn.getProjectList($scope.vm.projectName, $scope.vm.form.projects, $scope.vm.autoCompletePage.project.page, getStartProjectListCallback);
}
-
+ // �쁽�옱 �씠�뒋���엯 �쑀�삎 �꽕�젙
+ var id = $rootScope.getCurrentIssueTypeId();
+ if (id != null) {
+ $scope.vm.form.issueTypeId = id.toString();
+ }
$log.debug("promises 寃곌낵 ", results);
});
}
diff --git a/src/main/webapp/scripts/config.js b/src/main/webapp/scripts/config.js
index 74ad46c..be492fe 100644
--- a/src/main/webapp/scripts/config.js
+++ b/src/main/webapp/scripts/config.js
@@ -317,6 +317,12 @@
return false;
};
+ // �궗�씠�뱶諛� �씠�뒋�쑀�삎 �꽑�깮�떆 �봽濡쒖젥�듃 �븘�씠�뵒 �뀑�똿
+ $rootScope.$on("changeIssueListMenu", function (event, args){
+ var issueTypeVo = args;
+ $rootScope.changeLastProject(issueTypeVo.projectVo.id);
+ });
+
$rootScope.changeLastProject = function (projectId, reload = true) {
if ($rootScope.workProject == null || $rootScope.workProject.id !== projectId ) {
if (User != null) {
diff --git a/src/main/webapp/views/common/header.html b/src/main/webapp/views/common/header.html
index d84538b..9383080 100644
--- a/src/main/webapp/views/common/header.html
+++ b/src/main/webapp/views/common/header.html
@@ -26,7 +26,8 @@
</select>
</div>
<div class="top-right col-lg-4">
- <button class="btn btn-xlg btn-primary btn-rounded mr-10" ng-click="fn.addIssue()" tabindex="-1">
+ <!-- �쟾泥� �봽濡쒖젥�듃 �씪�븣 �씠�뒋 留뚮뱾湲� 踰꾪듉 �닲源� -->
+ <button class="btn btn-xlg btn-primary btn-rounded mr-10" ng-if="$root.workProject.id > -1" ng-click="fn.addIssue()" tabindex="-1">
<i class="os-icon os-icon-plus"></i> <span translate="issue.createIssue">�씠�뒋 留뚮뱾湲�</span>
</button>
diff --git a/src/main/webapp/views/issue/issueAdd.html b/src/main/webapp/views/issue/issueAdd.html
index e42f21f..f5dc710 100644
--- a/src/main/webapp/views/issue/issueAdd.html
+++ b/src/main/webapp/views/issue/issueAdd.html
@@ -39,7 +39,7 @@
source="fn.getProjectList(vm.projectName, vm.form.projects, vm.autoCompletePage.project.page, fn.getProjectListCallBack)"
page="vm.autoCompletePage.project.page"
total-page="vm.autoCompletePage.project.totalPage"
- input-disabled="false"
+ input-disabled="vm.form.projects != null ? vm.form.projects.length > 0 : false"
translation-texts="{ empty : 'common.emptyProject' }"
extra-settings="{ displayProp : 'name' , idProp : 'id', imageable : false, imagePathProp : '',
type : '', maxlength : 200, autoResize : false, stopRemoveBodyEvent : true }"></js-autocomplete-single>
diff --git a/src/main/webapp/views/issue/issueModify.html b/src/main/webapp/views/issue/issueModify.html
index 20938b6..75496d1 100644
--- a/src/main/webapp/views/issue/issueModify.html
+++ b/src/main/webapp/views/issue/issueModify.html
@@ -39,7 +39,7 @@
source="fn.getProjectList(vm.projectName, vm.form.projects, vm.autoCompletePage.project.page, fn.getProjectListCallBack)"
page="vm.autoCompletePage.project.page"
total-page="vm.autoCompletePage.project.totalPage"
- input-disabled="false"
+ input-disabled="vm.form.projects != null ? vm.form.projects.length > 0 : false"
translation-texts="{ empty : 'common.emptyProject' }"
extra-settings="{ displayProp : 'name' , idProp : 'id', imageable : false, imagePathProp : '',
type : '', maxlength : 200, autoResize : false, stopRemoveBodyEvent : true }"></js-autocomplete-single>
--
Gitblit v1.8.0