From 336b1350ee97aa82fc0760f84488efa13e0fe920 Mon Sep 17 00:00:00 2001
From: wyu <kknd09321@nate.com>
Date: 금, 10 12월 2021 19:22:06 +0900
Subject: [PATCH] 이슈 상세 담당부서 수정시 오류 변경
---
src/main/webapp/scripts/components/utils/autoComplete.controller.js | 12 ++----------
src/main/webapp/views/issue/issueModifyDepartment.html | 2 +-
src/main/webapp/views/issue/issueAdd.html | 2 +-
src/main/webapp/scripts/app/issue/issueModifyDepartment.controller.js | 10 +++++-----
src/main/webapp/views/issue/issueAddRelation.html | 2 +-
src/main/webapp/views/issue/issueModify.html | 2 +-
src/main/webapp/views/issue/issueSendMailPartners.html | 2 +-
src/main/webapp/scripts/app/issue/issueDetail.controller.js | 11 ++++++-----
src/main/webapp/scripts/app/issue/issueSendMailPartners.controller.js | 1 +
9 files changed, 19 insertions(+), 25 deletions(-)
diff --git a/src/main/webapp/scripts/app/issue/issueDetail.controller.js b/src/main/webapp/scripts/app/issue/issueDetail.controller.js
index f965ab7..9d8b142 100644
--- a/src/main/webapp/scripts/app/issue/issueDetail.controller.js
+++ b/src/main/webapp/scripts/app/issue/issueDetail.controller.js
@@ -53,7 +53,7 @@
$scope.fn.issueBack = issueBack;
// �씠�뒋 紐⑸줉 而⑦듃濡ㅻ윭 vm, fn �긽�냽 以�
- $scope.vm.viewer = {};
+ $scope.vm.viewer = {}; // �쁽�옱 �씠�뒋
$scope.vm.images = []; // 泥⑤��맂 �뙆�씪 以� �씠誘몄� �뙆�씪
$scope.vm.activeTab = "ALL"; // �솢�룞 �궡�뿭 �꺆
// �씠�뒋 �긽�깭 蹂�寃� �몴�떆 �뿬遺�
@@ -754,10 +754,11 @@
resolve : {
parameter : function () {
return {
- departmentVos : [$scope.vm.form.issues[0].departmentVos],
- id : [$scope.vm.form.issues[0].id],
- projectId : [$scope.vm.form.issues[0].projectVo.id],
- project : [$scope.vm.form.issues[0].projectVo]
+ departmentVos : $scope.vm.form.issues[0].departmentVos,
+ id : $scope.vm.form.issues[0].id,
+ projectId : $scope.vm.form.issues[0].projectVo.id,
+ project : $scope.vm.form.issues[0].projectVo,
+ issueTypeId : $scope.vm.form.issues[0].issueTypeVo.id
};
}
}
diff --git a/src/main/webapp/scripts/app/issue/issueModifyDepartment.controller.js b/src/main/webapp/scripts/app/issue/issueModifyDepartment.controller.js
index 9185985..f5651a4 100644
--- a/src/main/webapp/scripts/app/issue/issueModifyDepartment.controller.js
+++ b/src/main/webapp/scripts/app/issue/issueModifyDepartment.controller.js
@@ -27,7 +27,7 @@
form : {
departments : [], // �떞�떦遺��꽌
projects : [],
- issueTypeId : ""
+ issueTypeId : parameter.issueTypeId
},
departmentName : "", // 遺��꽌 寃��깋
autoCompletePage : {
@@ -64,8 +64,8 @@
$rootScope.spinner = true;
var content = {
- id : parameter.id[0],
- projectId : parameter.projectId[0],
+ id : parameter.id,
+ projectId : parameter.projectId,
departmentIds : (function () {
var departmentIds = [];
@@ -117,9 +117,9 @@
function load() {
$scope.vm.form.projects = [];
- $scope.vm.form.projects.push(parameter.project[0]);
+ $scope.vm.form.projects.push(parameter.project);
- var departmentVos = parameter.departmentVos[0];
+ var departmentVos = parameter.departmentVos;
if (departmentVos.length > 0 && departmentVos[0] != undefined) {
$scope.vm.form.departments = departmentVos;
diff --git a/src/main/webapp/scripts/app/issue/issueSendMailPartners.controller.js b/src/main/webapp/scripts/app/issue/issueSendMailPartners.controller.js
index d46f599..e45a790 100644
--- a/src/main/webapp/scripts/app/issue/issueSendMailPartners.controller.js
+++ b/src/main/webapp/scripts/app/issue/issueSendMailPartners.controller.js
@@ -24,6 +24,7 @@
ispVos : parameter.ispVos,
hostingVos : parameter.hostingVos,
partners : parameter.partnersAll.slice(),
+ html : "issueSendMailPartners.html",
form : {
id : parameter.issueId, // �씠�뒋 踰덊샇
template : "ISSUE_SEND_2",
diff --git a/src/main/webapp/scripts/components/utils/autoComplete.controller.js b/src/main/webapp/scripts/components/utils/autoComplete.controller.js
index cc4d354..dae28cc 100644
--- a/src/main/webapp/scripts/components/utils/autoComplete.controller.js
+++ b/src/main/webapp/scripts/components/utils/autoComplete.controller.js
@@ -312,18 +312,10 @@
return deferred.promise;
}
- function getIssueDepartmentList(query, excludeList, page, callBack) {
+ function getIssueDepartmentList(issueTypeId, query, excludeList, page, callBack) {
var conditions = {
//issueTypeId : $scope.vm.form.issueTypeId,
- issueTypeId : (function () {
- var issueTypeId = "";
- if ($rootScope.currentDetailIssueId != null) {
- issueTypeId = $rootScope.currentDetailIssueId;
- } else {
- issueTypeId = $scope.vm.form.issueTypeId;
- }
- return issueTypeId;
- })(),
+ issueTypeId : issueTypeId,
departmentName : query,
userId : $rootScope.user.id,
projectId : (function () {
diff --git a/src/main/webapp/views/issue/issueAdd.html b/src/main/webapp/views/issue/issueAdd.html
index 3e24f7a..00c2b80 100644
--- a/src/main/webapp/views/issue/issueAdd.html
+++ b/src/main/webapp/views/issue/issueAdd.html
@@ -127,7 +127,7 @@
<js-autocomplete-multi data-input-name="departments"
selected-model="vm.form.departments"
search="vm.departmentName"
- source="fn.getIssueDepartmentList(vm.departmentName, vm.form.departments)"
+ source="fn.getIssueDepartmentList(vm.form.issueTypeId, vm.departmentName, vm.form.departments)"
input-disabled="false"
translation-texts="{ count : 'common.userNum', empty : 'common.emptyProjectDepartment'}"
extra-settings="{ displayProp : 'byName' , idProp : 'id', imageable : false, maxlength : 100, autoResize : true}"></js-autocomplete-multi>
diff --git a/src/main/webapp/views/issue/issueAddRelation.html b/src/main/webapp/views/issue/issueAddRelation.html
index 5d56570..1c58f18 100644
--- a/src/main/webapp/views/issue/issueAddRelation.html
+++ b/src/main/webapp/views/issue/issueAddRelation.html
@@ -139,7 +139,7 @@
<js-autocomplete-multi data-input-name="departments"
selected-model="vm.form.departments"
search="vm.departmentName"
- source="fn.getIssueDepartmentList(vm.departmentName, vm.form.departments)"
+ source="fn.getIssueDepartmentList(vm.form.issueTypeId, vm.departmentName, vm.form.departments)"
input-disabled="false"
translation-texts="{ count : 'common.userNum', empty : 'common.emptyProjectDepartment'}"
extra-settings="{ displayProp : 'byName' , idProp : 'id', imageable : false, maxlength : 100, autoResize : true}"></js-autocomplete-multi>
diff --git a/src/main/webapp/views/issue/issueModify.html b/src/main/webapp/views/issue/issueModify.html
index 5ff5c92..d9d3a1e 100644
--- a/src/main/webapp/views/issue/issueModify.html
+++ b/src/main/webapp/views/issue/issueModify.html
@@ -127,7 +127,7 @@
<js-autocomplete-multi data-input-name="departments"
selected-model="vm.form.departments"
search="vm.departmentName"
- source="fn.getIssueDepartmentList(vm.departmentName, vm.form.departments)"
+ source="fn.getIssueDepartmentList(vm.form.issueTypeId, vm.departmentName, vm.form.departments)"
input-disabled="false"
translation-texts="{ count : 'common.userNum', empty : 'common.emptyProjectDepartment'}"
extra-settings="{ displayProp : 'byName' , idProp : 'id', imageable : false, maxlength : 100, autoResize : true}"></js-autocomplete-multi>
diff --git a/src/main/webapp/views/issue/issueModifyDepartment.html b/src/main/webapp/views/issue/issueModifyDepartment.html
index 2d49a30..204ecaf 100644
--- a/src/main/webapp/views/issue/issueModifyDepartment.html
+++ b/src/main/webapp/views/issue/issueModifyDepartment.html
@@ -16,7 +16,7 @@
<js-autocomplete-multi data-input-name="departments"
selected-model="vm.form.departments"
search="vm.departmentName"
- source="fn.getIssueDepartmentList(vm.departmentName, vm.form.departments)"
+ source="fn.getIssueDepartmentList(vm.form.issueTypeId, vm.departmentName, vm.form.departments)"
input-disabled="false"
translation-texts="{ count : 'common.userNum', empty : 'common.emptyUser' }"
extra-settings="{ displayProp : 'byName' , idProp : 'id', imageable : false, maxlength : 100, autoResize : true }"></js-autocomplete-multi>
diff --git a/src/main/webapp/views/issue/issueSendMailPartners.html b/src/main/webapp/views/issue/issueSendMailPartners.html
index ff6ed0f..dd799c0 100644
--- a/src/main/webapp/views/issue/issueSendMailPartners.html
+++ b/src/main/webapp/views/issue/issueSendMailPartners.html
@@ -54,7 +54,7 @@
class="summernote"
lang="ko-KR"
config="vm.options"
- ng-model="vm.form.description"
+ ng-model="vm.html"
target=".note-editable"></summernote>
</div>
</form>
--
Gitblit v1.8.0