From cbea736b9cc99c6693edd3f2be0dd5376a78281c Mon Sep 17 00:00:00 2001
From: wyu <kknd09321@nate.com>
Date: 월, 29 11월 2021 16:50:48 +0900
Subject: [PATCH] 사용자정의 필드 수정
---
src/main/webapp/views/project/projectCustomFieldConfig.html | 16 ++
src/main/webapp/custom_components/js-html-diff/js-html-diff.directive.js | 25 +++++
src/main/webapp/scripts/components/utils/issueSearchCustomFieldViewElement.directive.js | 37 +++++++
src/main/webapp/scripts/app/issue/issueList.controller.js | 24 ++++
src/main/webapp/i18n/ko/global.json | 12 +-
src/main/webapp/scripts/app/issue/issueDetail.controller.js | 24 ++++
src/main/webapp/scripts/app/issue/issueListTimeline.controller.js | 24 ++++
src/main/webapp/custom_components/js-table/tableColumnGenerator.directive.js | 36 +++---
src/main/webapp/scripts/app/issue/issueAdd.controller.js | 24 ++++
src/main/webapp/scripts/app/issue/issueModify.controller.js | 24 ++++
10 files changed, 220 insertions(+), 26 deletions(-)
diff --git a/src/main/webapp/custom_components/js-html-diff/js-html-diff.directive.js b/src/main/webapp/custom_components/js-html-diff/js-html-diff.directive.js
index e74bb4c..9126043 100644
--- a/src/main/webapp/custom_components/js-html-diff/js-html-diff.directive.js
+++ b/src/main/webapp/custom_components/js-html-diff/js-html-diff.directive.js
@@ -421,6 +421,31 @@
issueTypeCustomField.target = [];
issueTypeCustomField.next = [];
break;
+
+ case "NUMBER" :
+ issueTypeCustomField.target = "";
+ issueTypeCustomField.next = "";
+ break
+ case "DATETIME" :
+ issueTypeCustomField.target = "";
+ issueTypeCustomField.next = "";
+ break
+ case "IP_ADDRESS" :
+ issueTypeCustomField.target = "";
+ issueTypeCustomField.next = "";
+ break
+ case "EMAIL" :
+ issueTypeCustomField.target = "";
+ issueTypeCustomField.next = "";
+ break
+ case "SITE" :
+ issueTypeCustomField.target = "";
+ issueTypeCustomField.next = "";
+ break
+ case "TEL" :
+ issueTypeCustomField.target = "";
+ issueTypeCustomField.next = "";
+ break
}
$scope.vm.customFieldVos.push(issueTypeCustomField);
diff --git a/src/main/webapp/custom_components/js-table/tableColumnGenerator.directive.js b/src/main/webapp/custom_components/js-table/tableColumnGenerator.directive.js
index b5be364..c773066 100644
--- a/src/main/webapp/custom_components/js-table/tableColumnGenerator.directive.js
+++ b/src/main/webapp/custom_components/js-table/tableColumnGenerator.directive.js
@@ -381,30 +381,30 @@
case "INPUT" :
makeTag += "<span translate='common.stringField'>臾몄옄�뿴 �븘�뱶</span>";
break;
- case "NUMBER" :
- makeTag += "<span translate='common.numberField'>�닽�옄 �븘�뱶</span>";
- break;
- case "DATETIME" :
- makeTag += "<span translate='common.datetimeField'>�닽�옄 �븘�뱶</span>";
- break;
- case "IP_ADDRESS" :
- makeTag += "<span translate='common.ipAddressField'>�닽�옄 �븘�뱶</span>";
- break;
- case "EMAIL" :
- makeTag += "<span translate='common.emailField'>�닽�옄 �븘�뱶</span>";
- break;
- case "SITE" :
- makeTag += "<span translate='common.siteField'>�닽�옄 �븘�뱶</span>";
- break;
- case "TEL" :
- makeTag += "<span translate='common.telField'>�닽�옄 �븘�뱶</span>";
- break;
case "MULTI_SELECT" :
makeTag += "<span translate='common.multipleSelectionField'>�떎以� �꽑�깮 �븘�뱶</span>";
break;
case "SINGLE_SELECT" :
makeTag += "<span translate='common.singleSelectionField'>�떒�씪 �꽑�깮 �븘�뱶</span>";
break;
+ case "NUMBER" :
+ makeTag += "<span translate='common.numberField'>�닽�옄 �븘�뱶</span>";
+ break;
+ case "DATETIME" :
+ makeTag += "<span translate='common.datetimeField'>�궇吏� �븘�뱶</span>";
+ break;
+ case "IP_ADDRESS" :
+ makeTag += "<span translate='common.ipAddressField'>IP ADDRESS �븘�뱶</span>";
+ break;
+ case "EMAIL" :
+ makeTag += "<span translate='common.emailField'>�씠硫붿씪 �븘�뱶</span>";
+ break;
+ case "SITE" :
+ makeTag += "<span translate='common.siteField'>URL �븘�뱶</span>";
+ break;
+ case "TEL" :
+ makeTag += "<span translate='common.telField'>�쟾�솕踰덊샇 �븘�뱶</span>";
+ break;
}
break;
diff --git a/src/main/webapp/i18n/ko/global.json b/src/main/webapp/i18n/ko/global.json
index 1025a3a..97ef54f 100644
--- a/src/main/webapp/i18n/ko/global.json
+++ b/src/main/webapp/i18n/ko/global.json
@@ -827,12 +827,12 @@
"import": "媛��졇�삤湲�",
"diffuserURL": "�쑀�룷�옄URL",
"country": "援�媛�",
- "numberField": "�닽�옄 �븘�뱶",
- "datetimeField": "�궇吏� �븘�뱶",
- "ipAddressField": "IP Address �븘�뱶",
- "emailField": "�씠硫붿씪 �븘�뱶",
- "siteField": "URL �븘�뱶",
- "telField": "�쟾�솕踰덊샇 �븘�뱶",
+ "numberField": "�닽�옄 �꽑�깮 �븘�뱶",
+ "datetimeField": "�궇吏� �꽑�깮 �븘�뱶",
+ "ipAddressField": "IP Address �꽑�깮 �븘�뱶",
+ "emailField": "�씠硫붿씪 �꽑�깮 �븘�뱶",
+ "siteField": "URL �꽑�깮 �븘�뱶",
+ "telField": "�쟾�솕踰덊샇 �꽑�깮 �븘�뱶",
"invalidipAdressFormat": "IP 二쇱냼 �삎�떇�씠 留욎� �븡�뒿�땲�떎.",
"invalidNumberFormat": "�닽�옄留� �엯�젰 媛��뒫�빀�땲�떎.",
"invalidDateFormat": "�궇吏� �삎�떇�씠 留욎� �븡�뒿�땲�떎.(xxxx-xx-xx)",
diff --git a/src/main/webapp/scripts/app/issue/issueAdd.controller.js b/src/main/webapp/scripts/app/issue/issueAdd.controller.js
index ca93bbb..5fa436e 100644
--- a/src/main/webapp/scripts/app/issue/issueAdd.controller.js
+++ b/src/main/webapp/scripts/app/issue/issueAdd.controller.js
@@ -706,6 +706,30 @@
}
});
break;
+
+ case "NUMBER" :
+ issueTypeCustomField.useValues = issueTypeCustomField.customFieldVo.defaultValue;
+ break;
+
+ case "DATETIME" :
+ issueTypeCustomField.useValues = issueTypeCustomField.customFieldVo.defaultValue;
+ break;
+
+ case "IP_ADDRESS" :
+ issueTypeCustomField.useValues = issueTypeCustomField.customFieldVo.defaultValue;
+ break;
+
+ case "EMAIL" :
+ issueTypeCustomField.useValues = issueTypeCustomField.customFieldVo.defaultValue;
+ break;
+
+ case "SITE" :
+ issueTypeCustomField.useValues = issueTypeCustomField.customFieldVo.defaultValue;
+ break;
+
+ case "TEL" :
+ issueTypeCustomField.useValues = issueTypeCustomField.customFieldVo.defaultValue;
+ break;
}
$scope.vm.form.issueCustomFields.push(issueTypeCustomField);
diff --git a/src/main/webapp/scripts/app/issue/issueDetail.controller.js b/src/main/webapp/scripts/app/issue/issueDetail.controller.js
index 2a82faf..2051ed4 100644
--- a/src/main/webapp/scripts/app/issue/issueDetail.controller.js
+++ b/src/main/webapp/scripts/app/issue/issueDetail.controller.js
@@ -888,6 +888,30 @@
case "MULTI_SELECT" :
issueTypeCustomField.useValues = [];
break;
+
+ case "NUMBER" :
+ issueTypeCustomField.useValues = ""
+ break;
+
+ case "DATETIME" :
+ issueTypeCustomField.useValues = ""
+ break;
+
+ case "IP_ADDRESS" :
+ issueTypeCustomField.useValues = ""
+ break;
+
+ case "EMAIL" :
+ issueTypeCustomField.useValues = ""
+ break;
+
+ case "SITE" :
+ issueTypeCustomField.useValues = ""
+ break;
+
+ case "TEL" :
+ issueTypeCustomField.useValues = ""
+ break;
}
$scope.vm.viewer.issueCustomFields.push(issueTypeCustomField);
diff --git a/src/main/webapp/scripts/app/issue/issueList.controller.js b/src/main/webapp/scripts/app/issue/issueList.controller.js
index dd3880b..05d69f9 100644
--- a/src/main/webapp/scripts/app/issue/issueList.controller.js
+++ b/src/main/webapp/scripts/app/issue/issueList.controller.js
@@ -830,6 +830,30 @@
case "SINGLE_SELECT" :
customField.useValues = [];
break;
+
+ case "NUMBER" :
+ customField.useValues = "";
+ break;
+
+ case "DATETIME" :
+ customField.useValues = "";
+ break;
+
+ case "IP_ADDRESS" :
+ customField.useValues = "";
+ break;
+
+ case "EMAIL" :
+ customField.useValues = "";
+ break;
+
+ case "SITE" :
+ customField.useValues = "";
+ break;
+
+ case "TEL" :
+ customField.useValues = "";
+ break;
}
$scope.vm.customFields.push(customField);
diff --git a/src/main/webapp/scripts/app/issue/issueListTimeline.controller.js b/src/main/webapp/scripts/app/issue/issueListTimeline.controller.js
index e533d82..9306520 100644
--- a/src/main/webapp/scripts/app/issue/issueListTimeline.controller.js
+++ b/src/main/webapp/scripts/app/issue/issueListTimeline.controller.js
@@ -320,6 +320,30 @@
case "SINGLE_SELECT" :
customField.useValues = [];
break;
+
+ case "NUMBER" :
+ customField.useValues = "";
+ break;
+
+ case "DATETIME" :
+ customField.useValues = "";
+ break;
+
+ case "IP_ADDRESS" :
+ customField.useValues = "";
+ break;
+
+ case "EMAIL" :
+ customField.useValues = "";
+ break;
+
+ case "SITE" :
+ customField.useValues = "";
+ break;
+
+ case "TEL" :
+ customField.useValues = "";
+ break;
}
$scope.vm.customFields.push(customField);
diff --git a/src/main/webapp/scripts/app/issue/issueModify.controller.js b/src/main/webapp/scripts/app/issue/issueModify.controller.js
index 1528f46..0fe9484 100644
--- a/src/main/webapp/scripts/app/issue/issueModify.controller.js
+++ b/src/main/webapp/scripts/app/issue/issueModify.controller.js
@@ -743,6 +743,30 @@
case "MULTI_SELECT" :
issueTypeCustomField.useValues = [];
break;
+
+ case "NUMBER" :
+ issueTypeCustomField.useValues = ""
+ break;
+
+ case "DATETIME" :
+ issueTypeCustomField.useValues = ""
+ break;
+
+ case "IP_ADDRESS" :
+ issueTypeCustomField.useValues = ""
+ break;
+
+ case "EMAIL" :
+ issueTypeCustomField.useValues = ""
+ break;
+
+ case "SITE" :
+ issueTypeCustomField.useValues = ""
+ break;
+
+ case "TEL" :
+ issueTypeCustomField.useValues = ""
+ break;
}
$scope.vm.form.issueCustomFields.push(issueTypeCustomField);
diff --git a/src/main/webapp/scripts/components/utils/issueSearchCustomFieldViewElement.directive.js b/src/main/webapp/scripts/components/utils/issueSearchCustomFieldViewElement.directive.js
index 97ce5f3..1a2335b 100644
--- a/src/main/webapp/scripts/components/utils/issueSearchCustomFieldViewElement.directive.js
+++ b/src/main/webapp/scripts/components/utils/issueSearchCustomFieldViewElement.directive.js
@@ -81,6 +81,43 @@
});
break;
+
+ case "NUMBER" :
+ makeTag += "<p>";
+ makeTag += customField.useValues;
+ makeTag += "<span ng-click='fn.remove(" + customField.id + ")'>횞</span>";
+ makeTag += "</p>";
+ break;
+ case "DATETIME" :
+ makeTag += "<p>";
+ makeTag += customField.useValues;
+ makeTag += "<span ng-click='fn.remove(" + customField.id + ")'>횞</span>";
+ makeTag += "</p>";
+ break;
+ case "IP_ADDRESS" :
+ makeTag += "<p>";
+ makeTag += customField.useValues;
+ makeTag += "<span ng-click='fn.remove(" + customField.id + ")'>횞</span>";
+ makeTag += "</p>";
+ break;
+ case "EMAIL" :
+ makeTag += "<p>";
+ makeTag += customField.useValues;
+ makeTag += "<span ng-click='fn.remove(" + customField.id + ")'>횞</span>";
+ makeTag += "</p>";
+ break;
+ case "SITE" :
+ makeTag += "<p>";
+ makeTag += customField.useValues;
+ makeTag += "<span ng-click='fn.remove(" + customField.id + ")'>횞</span>";
+ makeTag += "</p>";
+ break;
+ case "TEL" :
+ makeTag += "<p>";
+ makeTag += customField.useValues;
+ makeTag += "<span ng-click='fn.remove(" + customField.id + ")'>횞</span>";
+ makeTag += "</p>";
+ break;
}
}
});
diff --git a/src/main/webapp/views/project/projectCustomFieldConfig.html b/src/main/webapp/views/project/projectCustomFieldConfig.html
index fe77c1e..b253b79 100644
--- a/src/main/webapp/views/project/projectCustomFieldConfig.html
+++ b/src/main/webapp/views/project/projectCustomFieldConfig.html
@@ -45,8 +45,14 @@
{{customField.name}}
</div>
<small class="fc-grey" ng-show="customField.customFieldType == 'INPUT'" translate="common.stringField">臾몄옄�뿴 �븘�뱶</small>
- <small class="fc-grey" ng-show="customField.customFieldType == 'MULTI_SELECT'" translate="common.multipleSelectionField">�떎以� �꽑�깮 �븘�뱶</small>
<small class="fc-grey" ng-show="customField.customFieldType == 'SINGLE_SELECT'" translate="common.singleSelectionField">�떒�씪 �꽑�깮 �븘�뱶</small>
+ <small class="fc-grey" ng-show="customField.customFieldType == 'MULTI_SELECT'" translate="common.multipleSelectionField">�떎以� �꽑�깮 �븘�뱶</small>
+ <small class="fc-grey" ng-show="customField.customFieldType == 'NUMBER'" translate="common.numberField">�닽�옄 �꽑�깮 �븘�뱶</small>
+ <small class="fc-grey" ng-show="customField.customFieldType == 'DATETIME'" translate="common.datetimeField">�궇吏� �꽑�깮 �븘�뱶</small>
+ <small class="fc-grey" ng-show="customField.customFieldType == 'IP_ADDRESS'" translate="common.ipAddressField">IP Address �꽑�깮 �븘�뱶</small>
+ <small class="fc-grey" ng-show="customField.customFieldType == 'EMAIL'" translate="common.emailField">�씠硫붿씪 �꽑�깮 �븘�뱶</small>
+ <small class="fc-grey" ng-show="customField.customFieldType == 'SITE'" translate="common.siteField">URL �꽑�깮 �븘�뱶</small>
+ <small class="fc-grey" ng-show="customField.customFieldType == 'TEL'" translate="common.telField">�쟾�솕踰덊샇 �꽑�깮 �븘�뱶</small>
</div>
<!--<span>{{customField.name}}</span> <input type="checkbox" ng-model="customField.checked">-->
@@ -73,8 +79,14 @@
{{relationCustomField.name}}
</div>
<small class="fc-grey" ng-show="relationCustomField.customFieldType == 'INPUT'" translate="common.stringField">臾몄옄�뿴 �븘�뱶</small>
- <small class="fc-grey" ng-show="relationCustomField.customFieldType == 'MULTI_SELECT'" translate="common.multipleSelectionField">�떎以� �꽑�깮 �븘�뱶</small>
<small class="fc-grey" ng-show="relationCustomField.customFieldType == 'SINGLE_SELECT'" translate="common.singleSelectionField">�떒�씪 �꽑�깮 �븘�뱶</small>
+ <small class="fc-grey" ng-show="relationCustomField.customFieldType == 'MULTI_SELECT'" translate="common.multipleSelectionField">�떎以� �꽑�깮 �븘�뱶</small>
+ <small class="fc-grey" ng-show="relationCustomField.customFieldType == 'NUMBER'" translate="common.numberField">�닽�옄 �꽑�깮 �븘�뱶</small>
+ <small class="fc-grey" ng-show="relationCustomField.customFieldType == 'DATETIME'" translate="common.datetimeField">�궇吏� �꽑�깮 �븘�뱶</small>
+ <small class="fc-grey" ng-show="relationCustomField.customFieldType == 'IP_ADDRESS'" translate="common.ipAddressField">IP Address �꽑�깮 �븘�뱶</small>
+ <small class="fc-grey" ng-show="relationCustomField.customFieldType == 'EMAIL'" translate="common.emailField">�씠硫붿씪 �꽑�깮 �븘�뱶</small>
+ <small class="fc-grey" ng-show="relationCustomField.customFieldType == 'SITE'" translate="common.siteField">URL �꽑�깮 �븘�뱶</small>
+ <small class="fc-grey" ng-show="relationCustomField.customFieldType == 'TEL'" translate="common.telField">�쟾�솕踰덊샇 �꽑�깮 �븘�뱶</small>
</div>
<!--<span>{{relationCustomField.name}}</span> <input type="checkbox"
ng-model="relationCustomField.checked">-->
--
Gitblit v1.8.0