From 41c8f3c976c0d8ec4b0a6ad3d7f4ce90a9de03c7 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 목, 25 11월 2021 21:19:22 +0900
Subject: [PATCH] 프로젝트 담당부서 수정
---
src/main/webapp/views/project/projectModify.html | 2 +-
src/main/webapp/i18n/ko/global.json | 2 +-
src/main/resources/mybatis/query-template/projectRoleDepartment-template.xml | 2 +-
src/main/webapp/WEB-INF/i18n/code_ko_KR.properties | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/main/resources/mybatis/query-template/projectRoleDepartment-template.xml b/src/main/resources/mybatis/query-template/projectRoleDepartment-template.xml
index c052414..b4d28ae 100644
--- a/src/main/resources/mybatis/query-template/projectRoleDepartment-template.xml
+++ b/src/main/resources/mybatis/query-template/projectRoleDepartment-template.xml
@@ -21,7 +21,7 @@
<select id="findProjectRoleDepartment" resultType="java.util.HashMap" parameterType="java.util.HashMap">
SELECT
DISTINCT d.id as id,
- d.department_name as name
+ d.department_name as departmentName
FROM
project p
INNER JOIN project_role pr on p.id = pr.project_id
diff --git a/src/main/webapp/WEB-INF/i18n/code_ko_KR.properties b/src/main/webapp/WEB-INF/i18n/code_ko_KR.properties
index fed6e33..7e823ba 100644
--- a/src/main/webapp/WEB-INF/i18n/code_ko_KR.properties
+++ b/src/main/webapp/WEB-INF/i18n/code_ko_KR.properties
@@ -80,7 +80,7 @@
common.datetimeField=\uB0A0\uC9DC \uD544\uB4DC
common.ipAddressField=IP \uC8FC\uC18C \uD544\uB4DC
common.emailField=\uC774\uBA54\uC77C \uD544\uB4DC
-common.siteField=\uD648\uD398\uC774\uC9C0 \uD544\uB4DC
+common.siteField=URL \uD544\uB4DC
common.telField=\uC804\uD654\uBC88\uD638 \uD544\uB4DC
common.customField=\uC0AC\uC6A9\uC790 \uC815\uC758 \uD544\uB4DC
common.customFieldList=\uC0AC\uC6A9\uC790 \uC815\uC758 \uD544\uB4DC \uBAA9\uB85D
diff --git a/src/main/webapp/i18n/ko/global.json b/src/main/webapp/i18n/ko/global.json
index aa6e320..f89fc50 100644
--- a/src/main/webapp/i18n/ko/global.json
+++ b/src/main/webapp/i18n/ko/global.json
@@ -826,7 +826,7 @@
"datetimeField": "�궇吏� �븘�뱶",
"ipAddressField": "IP Address �븘�뱶",
"emailField": "�씠硫붿씪 �븘�뱶",
- "siteField": "�솃�럹�씠吏� �븘�뱶",
+ "siteField": "URL �븘�뱶",
"telField": "�쟾�솕踰덊샇 �븘�뱶"
},
"tasks": {
diff --git a/src/main/webapp/views/project/projectModify.html b/src/main/webapp/views/project/projectModify.html
index f5d03ce..6cc203b 100644
--- a/src/main/webapp/views/project/projectModify.html
+++ b/src/main/webapp/views/project/projectModify.html
@@ -116,7 +116,7 @@
extra-settings="{ displayProp : 'byName' , idProp : 'id', imageable : false, maxlength : 100, autoResize : true }"></js-autocomplete-multi>
<div class="select3-selection__choicediv mt-10">
- <span class="select3-selection__choice" ng-repeat="user in vm.form.departments">
+ <span class="select3-selection__choice" ng-repeat="department in vm.form.departments">
<span>{{department.byName}}</span> <!--�궗�슜�옄媛� �냽�빐 �엳�뒗 遺��꽌 �씠由� 異쒕젰-->
<span class="select3-selection__choice__remove" ng-click="fn.removeDepartment($index)">횞</span>
</span>
--
Gitblit v1.8.0