From 9bccd99ac672bba8427aa3e28204d6dcf9fa3460 Mon Sep 17 00:00:00 2001
From: wyu <kknd09321@nate.com>
Date: 수, 17 11월 2021 18:08:14 +0900
Subject: [PATCH] 이슈 수정 진행[프론트]
---
src/main/webapp/scripts/app/workspace/workspaceUserConfig.controller.js | 2
src/main/webapp/views/workspace/workspaceUserDepartmentModify.html | 2
src/main/webapp/scripts/app/issue/issueAdd.controller.js | 87 ++++++++++++++++++++++++++++++++++++++-----
src/main/webapp/scripts/app/issue/issueModify.controller.js | 2
src/main/webapp/views/common/sidebar.html | 4 +-
5 files changed, 82 insertions(+), 15 deletions(-)
diff --git a/src/main/webapp/scripts/app/issue/issueAdd.controller.js b/src/main/webapp/scripts/app/issue/issueAdd.controller.js
index 6dd109d..14a3616 100644
--- a/src/main/webapp/scripts/app/issue/issueAdd.controller.js
+++ b/src/main/webapp/scripts/app/issue/issueAdd.controller.js
@@ -373,10 +373,10 @@
title : $rootScope.preventXss($scope.vm.form.title), // �젣紐�
description : $rootScope.preventXss($scope.vm.form.description), // �궡�슜
//
- companyManager : $rootScope.preventXss($scope.vm.companyManager), // �궡�슜
- companyTel : $rootScope.preventXss($scope.vm.companyTel), // �궡�슜
- companyEmail : $rootScope.preventXss($scope.vm.companyEmail), // �궡�슜
- companyMemo : $rootScope.preventXss($scope.vm.companyMemo), // �궡�슜
+ // companyManager : $rootScope.preventXss($scope.vm.companyManager), // �궡�슜
+ // companyTel : $rootScope.preventXss($scope.vm.companyTel), // �궡�슜
+ // companyEmail : $rootScope.preventXss($scope.vm.companyEmail), // �궡�슜
+ // companyMemo : $rootScope.preventXss($scope.vm.companyMemo), // �궡�슜
ispCode : $rootScope.preventXss($scope.vm.ispCode), // �궡�슜
ispManager : $rootScope.preventXss($scope.vm.ispManager), // �궡�슜
ispTel : $rootScope.preventXss($scope.vm.ispTel), // �궡�슜
@@ -402,30 +402,25 @@
severityId : $scope.vm.form.severityId, // 以묒슂�룄 �븘�씠�뵒
companyId : (function () { // �봽濡쒖젥�듃 �븘�씠�뵒
var companyId = "";
-
if ($scope.vm.form.companyFields.length > 0) {
companyId = $scope.vm.form.companyFields[0].id;
}
-
return companyId;
})(),
ispId : (function () {
var ispId = "";
-
if ($scope.vm.form.ispFields.length > 0) {
ispId = $scope.vm.form.ispFields[0].id;
}
-
return ispId;
})(),
+
hostingId : (function () {
var hostingId = "";
-
if ($scope.vm.form.hostingFields.length > 0) {
hostingId = $scope.vm.form.hostingFields[0].id;
}
-
return hostingId;
})(),
@@ -462,6 +457,78 @@
startCompleteDateRange : $scope.vm.form.startCompleteDateRange,
detectingDateRange : $scope.vm.form.detectingDateRange,
+ companyFields : (function () {
+ var companyFields = [];
+
+ angular.forEach($scope.vm.form.companyFields, function (companyField) {
+ var useValues = [];
+
+ if (angular.isArray(companyField.useValues)) {
+ angular.forEach(companyField.useValues, function (useValue) {
+ useValues.push(useValue.value);
+ });
+ }
+ else {
+ useValues.push(companyField.useValues);
+ }
+
+ // useValues 瑜� 諛곗뿴濡� 蹂��솚�븳�떎.
+ var temp = angular.copy(companyField);
+ temp.useValues = useValues;
+ companyFields.push(temp);
+ });
+
+ return companyFields;
+ })(),
+
+ ispFields : (function () {
+ var ispFields = [];
+
+ angular.forEach($scope.vm.form.ispFields, function (ispField) {
+ var useValues = [];
+
+ if (angular.isArray(ispField.useValues)) {
+ angular.forEach(ispField.useValues, function (useValue) {
+ useValues.push(useValue.value);
+ });
+ }
+ else {
+ useValues.push(ispField.useValues);
+ }
+
+ // useValues 瑜� 諛곗뿴濡� 蹂��솚�븳�떎.
+ var temp = angular.copy(ispField);
+ temp.useValues = useValues;
+ ispFields.push(temp);
+ });
+
+ return ispFields;
+ })(),
+
+ hostingFields : (function () {
+ var hostingFields = [];
+
+ angular.forEach($scope.vm.form.hostingFields, function (hostingField) {
+ var useValues = [];
+
+ if (angular.isArray(hostingField.useValues)) {
+ angular.forEach(hostingField.useValues, function (useValue) {
+ useValues.push(useValue.value);
+ });
+ }
+ else {
+ useValues.push(hostingField.useValues);
+ }
+
+ // useValues 瑜� 諛곗뿴濡� 蹂��솚�븳�떎.
+ var temp = angular.copy(hostingField);
+ temp.useValues = useValues;
+ hostingFields.push(temp);
+ });
+
+ return hostingFields;
+ })(),
+
issueCustomFields : (function () { // �씠�뒋�뿉�꽌 �궗�슜�릺�뒗 �궗�슜�옄 �젙�쓽 �븘�뱶
var issueCustomFields = [];
diff --git a/src/main/webapp/scripts/app/issue/issueModify.controller.js b/src/main/webapp/scripts/app/issue/issueModify.controller.js
index 9660d85..405291f 100644
--- a/src/main/webapp/scripts/app/issue/issueModify.controller.js
+++ b/src/main/webapp/scripts/app/issue/issueModify.controller.js
@@ -677,7 +677,7 @@
$scope.vm.form.severityId = String(result.data.data.severityVo.id);
$scope.vm.form.issueStatusId = String(result.data.data.issueStatusVo.id);
- /*$scope.vm.form.users = result.data.data.userVos;*/
+ $scope.vm.form.users = result.data.data.userVos;
$scope.vm.form.departments = result.data.data.departmentVos;
$scope.vm.form.files = result.data.data.attachedFileVos;
//
diff --git a/src/main/webapp/scripts/app/workspace/workspaceUserConfig.controller.js b/src/main/webapp/scripts/app/workspace/workspaceUserConfig.controller.js
index e80257d..16e8fd0 100644
--- a/src/main/webapp/scripts/app/workspace/workspaceUserConfig.controller.js
+++ b/src/main/webapp/scripts/app/workspace/workspaceUserConfig.controller.js
@@ -274,7 +274,7 @@
function modifyUserDepartments(id, userId) {
$uibModal.open({
templateUrl : 'views/workspace/workspaceUserDepartmentModify.html',
- size : "xlg",
+ size : "md",
controller : 'workspaceUserDepartmentModifyController',
backdrop : 'static',
windowClass : 'workflow-window',
diff --git a/src/main/webapp/views/common/sidebar.html b/src/main/webapp/views/common/sidebar.html
index 5705c8a..1d94148 100644
--- a/src/main/webapp/views/common/sidebar.html
+++ b/src/main/webapp/views/common/sidebar.html
@@ -254,7 +254,7 @@
<li ng-repeat="issueType in $root.workIssueTypes">
<a class="cursor" tabindex="-1" ng-click="fn.changeIssueListMenu(issueType.id)">
- <div class="icon-w ">
+ <div class="icon-w">
<div class="os-icon os-icon-layout"></div>
</div>
<span>{{issueType.name}}</span>
@@ -326,7 +326,7 @@
</li>
<li class="sub-header" ng-if="$root.checkMngPermissionSettings()">
- <span>紐⑸줉愿�由�</span>
+ <span>LIST MANAGEMENT</span>
</li>
<li class="" ng-if="$root.checkMngPermission('USER_PERMISSION_MNG_ISSUE_STATUS')">
<a ui-sref="companyField.list" tabindex="-1">
diff --git a/src/main/webapp/views/workspace/workspaceUserDepartmentModify.html b/src/main/webapp/views/workspace/workspaceUserDepartmentModify.html
index ca26f41..9c454b3 100644
--- a/src/main/webapp/views/workspace/workspaceUserDepartmentModify.html
+++ b/src/main/webapp/views/workspace/workspaceUserDepartmentModify.html
@@ -1,4 +1,4 @@
-<div class="formModal" xmlns:cursor="http://www.w3.org/1999/xhtml">
+<div class="formModal">
<div class="modal-header faded smaller">
<div class="modal-title">
<strong>遺��꽌 �닔�젙</strong>
--
Gitblit v1.8.0