From 7f5428f3897cf22c34a00829a8eae6f260669999 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 월, 24 1월 2022 15:33:35 +0900
Subject: [PATCH] - 24시간제로 적용 안되는 문제 해결 - 문자열필드 maxlength 제거
---
src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java | 6 ++++--
src/main/webapp/views/customField/customFieldAdd.html | 6 ++----
src/main/webapp/views/issue/issueAddDown.html | 1 -
src/main/webapp/views/issue/issueListTimeline.html | 2 +-
src/main/webapp/views/customField/customFieldModify.html | 6 ++----
src/main/webapp/views/issue/issueAdd.html | 1 -
src/main/webapp/views/issue/issueListNormal.html | 2 +-
src/main/webapp/scripts/components/utils/dateRangePicker.directive.js | 8 ++++----
src/main/webapp/custom_components/js-autocomplete-single/js-autocomplete-single.js | 6 +++---
src/main/webapp/views/issue/issueAddRelation.html | 1 -
src/main/webapp/views/issue/issueModify.html | 1 -
src/main/webapp/scripts/app/issue/issueAdd.controller.js | 17 ++++++++++-------
12 files changed, 27 insertions(+), 30 deletions(-)
diff --git a/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java b/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java
index ce55b1b..a0bd6ab 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java
@@ -48,6 +48,8 @@
import java.io.IOException;
import java.util.*;
+import static kr.wisestone.owl.domain.enumType.CustomFieldType.INPUT;
+
@Service
public class IssueServiceImpl extends AbstractServiceImpl<Issue, Long, JpaRepository<Issue, Long>> implements IssueService {
@@ -809,7 +811,7 @@
useValues.add(issueCustomFieldValueVo.getUseValue());
customField.put(issueCustomFieldValueVo.getCustomFieldVo().getName(), useValues);
} else {
- if (issueCustomFieldValueVo.getCustomFieldVo().getCustomFieldType().equals(CustomFieldType.INPUT.toString())) {
+ if (issueCustomFieldValueVo.getCustomFieldVo().getCustomFieldType().equals(INPUT.toString())) {
customField.put(issueCustomFieldValueVo.getCustomFieldVo().getName(), issueCustomFieldValueVo.getUseValue());
} else {
customField.put(issueCustomFieldValueVo.getCustomFieldVo().getName(), Lists.newArrayList(issueCustomFieldValueVo.getUseValue()));
@@ -3555,7 +3557,7 @@
case EMAIL:
case SITE:
case TEL:
- if (cellValue.length() > 100) {
+ if (customField.getCustomFieldType() != INPUT && cellValue.length() > 100) {
throw new OwlRuntimeException(
this.messageAccessor.getMessage(MsgConstants.CUSTOM_FIELD_TEXT_TYPE_MAX_LENGTH_OUT));
}
diff --git a/src/main/webapp/custom_components/js-autocomplete-single/js-autocomplete-single.js b/src/main/webapp/custom_components/js-autocomplete-single/js-autocomplete-single.js
index e73daad..5d5fa69 100644
--- a/src/main/webapp/custom_components/js-autocomplete-single/js-autocomplete-single.js
+++ b/src/main/webapp/custom_components/js-autocomplete-single/js-autocomplete-single.js
@@ -22,7 +22,7 @@
source : '&',
page : "=",
totalPage : "=",
- inputDisabled : "=",
+ inputDisabled : "=?",
customInput : "=",
},
templateUrl : "custom_components/js-autocomplete-single/js-autocomplete-single.html",
@@ -31,7 +31,7 @@
var blank_pattern = /^\s+|\s+$/g;
// �엯�젰 �븘�뱶 鍮꾪솢�꽦�솕
- if (!angular.isDefined($scope.inputDisabled)) {
+ if (!$rootScope.isDefined($scope.inputDisabled)) {
$scope.inputDisabled = false;
}
@@ -227,7 +227,7 @@
function toggleDropdown() {
// �븘�씠�뀥�씠 �꽑�깮�릺�뼱 �엳�쓣 寃쎌슦 紐⑸줉 �젅�씠�뼱�뒗 �몴�떆�맆 �닔 �뾾�떎.
$scope.open = true;
- if ($scope.selectedModel != null && $scope.selectedModel.length > 0) {
+ if ($rootScope.isDefined($scope.selectedModel) && $scope.selectedModel.length > 0) {
$scope.open = false;
$scope.options = [];
}
diff --git a/src/main/webapp/scripts/app/issue/issueAdd.controller.js b/src/main/webapp/scripts/app/issue/issueAdd.controller.js
index b99941e..a683d87 100644
--- a/src/main/webapp/scripts/app/issue/issueAdd.controller.js
+++ b/src/main/webapp/scripts/app/issue/issueAdd.controller.js
@@ -849,9 +849,11 @@
$resourceProvider.getPageContent(0, 1000))).then(function (result) {
if (result.data.message.status === "success") {
- $scope.vm.form.projects.push(result.data.data);
- $scope.vm.projectName = result.data.data.name;
- $scope.fn.getIssueTypeOfProject();
+ if ($rootScope.isDefined(result.data.data)) {
+ $scope.vm.form.projects.push(result.data.data);
+ $scope.vm.projectName = result.data.data.name;
+ $scope.fn.getIssueTypeOfProject();
+ }
}
else {
SweetAlert.swal($filter("translate")("issue.failedToIssueTypeListLookup"), result.data.message.message, "error"); // �씠�뒋 ���엯 紐⑸줉 議고쉶 �떎�뙣
@@ -867,9 +869,9 @@
function getIssueTypes() {
var deferred = $q.defer();
- /*if (!$rootScope.isDefined($scope.vm.form.projects[0])) {
+ if (!$rootScope.isDefined($scope.vm.form.projects[0])) {
return;
- }*/
+ }
IssueType.find($resourceProvider.getContent({},
$resourceProvider.getPageContent(0, 1000))).then(function (result) {
@@ -896,6 +898,7 @@
if (result.data.message.status === "success") {
$scope.vm.issueTypes = result.data.data;
+ //$scope.fn.getIssueTypeCustomFields();
}
else {
SweetAlert.swal($filter("translate")("issue.failedToIssueTypeListLookup"), result.data.message.message, "error"); // �씠�뒋 ���엯 紐⑸줉 議고쉶 �떎�뙣
@@ -1046,7 +1049,7 @@
}
function getPartners() {
- if($scope.vm.form.issueTypeId === ""){
+ if($scope.vm.form.issueTypeId === "" && $rootScope.issueTypeMenu != null){
$scope.vm.form.issueTypeId = $rootScope.issueTypeMenu.id
}
var content = {
@@ -1062,7 +1065,7 @@
}
function getDepartments() {
- if($scope.vm.form.issueTypeId === ""){
+ if($scope.vm.form.issueTypeId === "" && $rootScope.issueTypeMenu != null){
$scope.vm.form.issueTypeId = $rootScope.issueTypeMenu.id
}
var content = {
diff --git a/src/main/webapp/scripts/components/utils/dateRangePicker.directive.js b/src/main/webapp/scripts/components/utils/dateRangePicker.directive.js
index 4e1655e..b5f5eaf 100644
--- a/src/main/webapp/scripts/components/utils/dateRangePicker.directive.js
+++ b/src/main/webapp/scripts/components/utils/dateRangePicker.directive.js
@@ -77,8 +77,8 @@
});
} else if ($attrs["rangeType"] === "singleDate") {
$($element).daterangepicker({
- timePicker24Hour : true,
timePicker: true,
+ timePicker24Hour : true,
timePickerSeconds : true,
autoUpdateInput: true,
autoApply : true,
@@ -87,7 +87,7 @@
//parentEl : $scope.parentEl !== undefined ? $scope.parentEl : "",
locale: {
- format: 'YYYY-MM-DD hh:mm:ss',
+ format: 'YYYY-MM-DD H:mm:ss',
separator: "~",
applyLabel: options.applyLabel,
cancelLabel: options.cancelLabel,
@@ -102,8 +102,8 @@
});
} else if ($attrs["rangeType"] === "multiDate") {
$($element).daterangepicker({
- timePicker24Hour : true,
timePicker: true,
+ timePicker24Hour : true,
timePickerSeconds : true,
autoUpdateInput: true,
autoApply : true,
@@ -112,7 +112,7 @@
//parentEl : $scope.parentEl !== undefined ? $scope.parentEl : "",
locale: {
- format: 'YYYY-MM-DD hh:mm:ss',
+ format: 'YYYY-MM-DD H:mm:ss',
separator: "~",
applyLabel: options.applyLabel,
cancelLabel: options.cancelLabel,
diff --git a/src/main/webapp/views/customField/customFieldAdd.html b/src/main/webapp/views/customField/customFieldAdd.html
index cfb3e78..b647bfc 100644
--- a/src/main/webapp/views/customField/customFieldAdd.html
+++ b/src/main/webapp/views/customField/customFieldAdd.html
@@ -97,9 +97,7 @@
name="defaultValue"
class="form-control"
ng-model="vm.form.defaultValue"
- maxlength="100"
kr-input
- ng-maxlength="100"
autocomplete="off">
@@ -187,9 +185,9 @@
translate="common.invalidTelFormat">�쟾�솕踰덊샇 �삎�떇�씠 留욎� �븡�뒿�땲�떎.
</div>
- <small ng-if="vm.form.customFieldType == 'INPUT'" translate="common.upTo100Characters">
+ <!--<small ng-if="vm.form.customFieldType == 'INPUT'" translate="common.upTo100Characters">
理쒕� 100湲��옄源뚯� �엯�젰�븷 �닔 �엳�뒿�땲�떎.
- </small>
+ </small>-->
<div class="help-block form-text text-danger" ng-if="vm.form.customFieldType == 'SINGLE_SELECT'"
translate="customField.selectSingleFieldListHashTag">
diff --git a/src/main/webapp/views/customField/customFieldModify.html b/src/main/webapp/views/customField/customFieldModify.html
index af7ea75..3680ca7 100644
--- a/src/main/webapp/views/customField/customFieldModify.html
+++ b/src/main/webapp/views/customField/customFieldModify.html
@@ -99,9 +99,7 @@
name="defaultValue"
class="form-control"
ng-model="vm.form.defaultValue"
- maxlength="100"
kr-input
- ng-maxlength="100"
autocomplete="off">
<input ng-if="vm.form.customFieldType == 'NUMBER'"
@@ -191,9 +189,9 @@
<!-- class="help-block form-text text-danger" translate="common.upTo100Characters">-->
<!-- 理쒕� 100湲��옄源뚯� �엯�젰�븷 �닔 �엳�뒿�땲�떎.-->
<!-- </small>-->
- <small ng-if="vm.form.customFieldType == 'INPUT'" translate="common.upTo100Characters">
+ <!--<small ng-if="vm.form.customFieldType == 'INPUT'" translate="common.upTo100Characters">
理쒕� 100湲��옄源뚯� �엯�젰�븷 �닔 �엳�뒿�땲�떎.
- </small>
+ </small>-->
<div class="help-block form-text text-danger" ng-if="vm.form.customFieldType == 'SINGLE_SELECT'"
translate="customField.selectSingleFieldListHashTag">
�떒�씪 �꽑�깮 �븘�뱶 紐⑸줉�뿉 �엳�뒗 媛믪쓣 湲곕낯�쟻�쑝濡� �꽑�깮�븯怨� �떢�쓣 �븣�뒗 �빐�떆�깭洹몃�� �궗�슜�빐�빞�빀�땲�떎. ex) #���긽媛�
diff --git a/src/main/webapp/views/issue/issueAdd.html b/src/main/webapp/views/issue/issueAdd.html
index fb8fe29..3da416a 100644
--- a/src/main/webapp/views/issue/issueAdd.html
+++ b/src/main/webapp/views/issue/issueAdd.html
@@ -239,7 +239,6 @@
<input type="text" class="form-control input-sm"
name="item_{{$index}}"
ng-model="issueCustomField.useValues"
- maxlength="100"
autocomplete="off"
kr-input
ng-required="issueCustomField.fieldOption == '01' || issueCustomField.customFieldVo.requiredData == 'Y'">
diff --git a/src/main/webapp/views/issue/issueAddDown.html b/src/main/webapp/views/issue/issueAddDown.html
index 3df5230..b5646e1 100644
--- a/src/main/webapp/views/issue/issueAddDown.html
+++ b/src/main/webapp/views/issue/issueAddDown.html
@@ -237,7 +237,6 @@
<input type="text" class="form-control input-sm"
name="input"
ng-model="issueCustomField.useValues"
- maxlength="100"
autocomplete="off"
kr-input
ng-required="issueCustomField.fieldOption == '01' || issueCustomField.customFieldVo.requiredData == 'Y'">
diff --git a/src/main/webapp/views/issue/issueAddRelation.html b/src/main/webapp/views/issue/issueAddRelation.html
index 6ce14a6..2b542b8 100644
--- a/src/main/webapp/views/issue/issueAddRelation.html
+++ b/src/main/webapp/views/issue/issueAddRelation.html
@@ -249,7 +249,6 @@
<input type="text" class="form-control input-sm"
name="input"
ng-model="issueCustomField.useValues"
- maxlength="100"
autocomplete="off"
kr-input
ng-required="issueCustomField.fieldOption == '01' || issueCustomField.customFieldVo.requiredData == 'Y'">
diff --git a/src/main/webapp/views/issue/issueListNormal.html b/src/main/webapp/views/issue/issueListNormal.html
index 13a629d..8e645ab 100644
--- a/src/main/webapp/views/issue/issueListNormal.html
+++ b/src/main/webapp/views/issue/issueListNormal.html
@@ -274,7 +274,7 @@
<input type="text"
class="form-control input-sm"
ng-model="customField.useValues"
- maxlength="100">
+ >
</div>
<div ng-switch-when="NUMBER">
<input type="text"
diff --git a/src/main/webapp/views/issue/issueListTimeline.html b/src/main/webapp/views/issue/issueListTimeline.html
index 86e4a75..0ea4ae6 100644
--- a/src/main/webapp/views/issue/issueListTimeline.html
+++ b/src/main/webapp/views/issue/issueListTimeline.html
@@ -260,7 +260,7 @@
<div ng-switch-when="INPUT">
<input type="text" class="form-control input-sm"
ng-model="customField.useValues"
- maxlength="100">
+ >
</div>
<div ng-switch-default>
diff --git a/src/main/webapp/views/issue/issueModify.html b/src/main/webapp/views/issue/issueModify.html
index f16e46a..6ab924d 100644
--- a/src/main/webapp/views/issue/issueModify.html
+++ b/src/main/webapp/views/issue/issueModify.html
@@ -237,7 +237,6 @@
<input type="text" class="form-control input-sm"
name="item_{{$index}}"
ng-model="issueCustomField.useValues"
- maxlength="100"
autocomplete="off"
kr-input
ng-required="issueCustomField.fieldOption == '01' || issueCustomField.customFieldVo.requiredData == 'Y'">
--
Gitblit v1.8.0