OWL ITS + 탐지시스템(인터넷 진흥원)
jhjang
2021-12-14 b90cdc67fa2c27ecd0f0b091bb5abe2624312f05
Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa
3개 파일 변경됨
94 ■■■■■ 파일 변경됨
src/main/webapp/scripts/app/project/projectList.controller.js 2 ●●● 패치 | 보기 | raw | blame | 히스토리
src/main/webapp/scripts/config.js 6 ●●●● 패치 | 보기 | raw | blame | 히스토리
src/main/webapp/views/issue/issueListNormal.html 86 ●●●●● 패치 | 보기 | raw | blame | 히스토리
src/main/webapp/scripts/app/project/projectList.controller.js
@@ -362,7 +362,7 @@
                function changeLastProject(projectId) {
                    $rootScope.changeLastProject(projectId)
                    $state.go("issues.list")
                    $state.go("dashboards.dashboard")
                }
                $scope.fn.makeTableConfigs();
src/main/webapp/scripts/config.js
@@ -351,12 +351,12 @@
                                                $rootScope.$broadcast("changedLastProject", {id: el.id});
                                                $state.go("issues.list");
                                            }
                                            /*if (reload) {
                                            if (reload) {
                                                $state.go('dashboards.dashboard');
                                            }*/
                                            }
                                        }
                                    });
                                   //$state.go($state.current, {}, {reload: reload});
                                   // $state.go($state.current, {}, {reload: reload});
                                }
                            });
                        }
src/main/webapp/views/issue/issueListNormal.html
@@ -272,10 +272,94 @@
                                                    <div ng-switch on="customField.customFieldType">
                                                        <div ng-switch-when="INPUT">
                                                            <input type="text" class="form-control input-sm"
                                                            <input type="text"
                                                                   class="form-control input-sm"
                                                                   ng-model="customField.useValues"
                                                                   maxlength="100">
                                                        </div>
                                                        <div ng-switch-when="NUMBER">
                                                            <input type="text"
                                                                   class="form-control input-sm"
                                                                   name="numberType"
                                                                   ng-model="customField.useValues"
                                                                   kr-input
                                                                   placeholder="숫자만 입력 가능합니다."
                                                                   ng-pattern="/^[0-9]*$/"
                                                                   autocomplete="off">
                                                            <div ng-show="issueSearchForm.numberType.$error.pattern" class="help-block form-text text-danger"
                                                                 translate="common.invalidNumberFormat">숫자만 입력 가능합니다.
                                                            </div>
                                                        </div>
                                                        <!-- todo : 날짜 검색 문제 -->
                                                        <div ng-switch-when="DATETIME">
                                                            <input type="text" class="form-control input-sm"
                                                                   name="dateTime"
                                                                   ng-model="customField.useValues"
                                                                   maxlength="100"
                                                                   range-type="singleDate"
                                                                   date-range-picker>
                                                            <div class="row">
                                                                <div class="col-xs-12">
                                                                    <div id="createdWidget" class="bootstrap-datepicker "></div>
                                                                </div>
                                                            </div>
                                                        </div>
                                                        <div ng-switch-when="IP_ADDRESS">
                                                            <input type="text"
                                                                   class="form-control input-sm"
                                                                   name="ipAdress"
                                                                   ng-model="customField.useValues"
                                                                   kr-input
                                                                   ng-pattern="/^(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$/"
                                                                   placeholder="IP 주소 형식만 입력 가능합니다."
                                                                   autocomplete="off">
                                                            <div ng-show="issueSearchForm.ipAdress.$error.pattern" class="help-block form-text text-danger"
                                                                 translate="common.invalidipAdressFormat">IP주소 형식이 맞지 않습니다.
                                                            </div>
                                                        </div>
                                                        <div ng-switch-when="EMAIL">
                                                            <input type="email"
                                                                   class="form-control input-sm"
                                                                   name="email"
                                                                   ng-model="customField.useValues"
                                                                   kr-input
                                                                   ng-pattern="/^[a-zA-Z0-9._-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,4}$/"
                                                                   placeholder="이메일 형식만 입력 가능합니다."
                                                                   autocomplete="off">
                                                            <div ng-show="issueSearchForm.email.$error.pattern" class="help-block form-text text-danger"
                                                                 translate="common.invalidEmailFormat">이메일 형식이 맞지 않습니다.
                                                            </div>
                                                        </div>
                                                        <div ng-switch-when="SITE">
                                                            <input type="text"
                                                                   class="form-control input-sm"
                                                                   name="site"
                                                                   ng-model="customField.useValues"
                                                                   kr-input
                                                                   ng-pattern="/((http|https):\/\/)?(\w+:{0,1}\w*@)?(\S+)(:[0-9]+)?(\/|\/([\w#!:.?+=&%@!\-\/]))?/"
                                                                   placeholder="홈페이지 주소 형식만 입력 가능합니다."
                                                                   autocomplete="off">
                                                            <div ng-show="issueSearchForm.site.$error.pattern" class="help-block form-text text-danger"
                                                                 translate="common.invalidSiteFormat">홈페이지 주소 형식이 맞지 않습니다.(http://로 시작하셔야합니다)
                                                            </div>
                                                        </div>
                                                        <div ng-switch-when="TEL">
                                                            <input type="text"
                                                                   class="form-control input-sm"
                                                                   name="tel"
                                                                   ng-model="customField.useValues"
                                                                   kr-input
                                                                   ng-pattern="/^\d{2,3}-\d{3,4}-\d{4}$/"
                                                                   placeholder="연락처 형식만 입력 가능합니다."
                                                                   autocomplete="off">
                                                            <div ng-show="issueSearchForm.tel.$error.pattern" class="help-block form-text text-danger"
                                                                 translate="common.invalidTelFormat">전화번호 형식이 맞지 않습니다.
                                                            </div>
                                                        </div>
                                                        <div ng-switch-default>
                                                            <ng-dropdown-multiselect class="multiSelect cursor"