OWL ITS + 탐지시스템(인터넷 진흥원)
사용자정의 필드 날짜 수정, 프로젝트 생성시 대쉬보드 이동 오류 수정
4개 파일 변경됨
36 ■■■■ 파일 변경됨
src/main/webapp/bower_components/bootstrap-daterangepicker/daterangepicker.js 23 ●●●● 패치 | 보기 | raw | blame | 히스토리
src/main/webapp/scripts/app/project/projectAdd.controller.js 2 ●●● 패치 | 보기 | raw | blame | 히스토리
src/main/webapp/scripts/components/utils/dateRangePicker.directive.js 5 ●●●●● 패치 | 보기 | raw | blame | 히스토리
src/main/webapp/views/customField/customFieldAdd.html 6 ●●●● 패치 | 보기 | raw | blame | 히스토리
src/main/webapp/bower_components/bootstrap-daterangepicker/daterangepicker.js
@@ -382,16 +382,28 @@
        }
        if (this.singleDatePicker) {
            this.container.addClass('single');
            this.container.find('.calendar.left').addClass('single');
            this.container.find('.calendar.left').show();
            this.container.find('.calendar.right').hide();
            this.container.find('.daterangepicker_input input, .daterangepicker_input > i').hide();
            if (this.timePicker) {
                this.container.find('.ranges ul').hide();
            } else {
                this.container.find('.ranges').hide();
            }
            this.container.find('.calendar').on('focus.daterangepicker', '.daterangepicker_input input', $.proxy(this.formInputsBlurred, this))
            //this.container.find('.ranges ul').show();
            this.container.find('.ranges').show();
            //this.container.find('.applyBtn, .cancelBtn').addClass('hide');
            //this.container.find('.ranges').on('click.daterangepicker', 'button.cancelBtn', $.proxy(this.clickCancel, this))
            //this.container.find('.applyBtn, .cancelBtn').addClass(this.buttonClasses);
            //this.container.find('.cancelBtn').addClass(this.cancelClass);
            //this.container.find('.applyBtn').html(this.locale.applyLabel);
            //this.container.find('.cancelBtn').html(this.locale.cancelLabel);
            // if (this.timePicker) {
            //     this.container.find('.ranges ul').hide();
            // } else {
            //     this.container.find('.ranges').hide();
            // }
        }
        if ((typeof options.ranges === 'undefined' && !this.singleDatePicker) || this.alwaysShowCalendars) {
@@ -413,7 +425,6 @@
            this.container.find('.cancelBtn').addClass(this.cancelClass);
        this.container.find('.applyBtn').html(this.locale.applyLabel);
        this.container.find('.cancelBtn').html(this.locale.cancelLabel);
        //
        // event listeners
        //
src/main/webapp/scripts/app/project/projectAdd.controller.js
@@ -121,7 +121,7 @@
                        if (result.data.message.status === "success") {
                            $scope.fn.cancel();
                            $rootScope.user.lastProjectId = result.data.data.id;
                            // $rootScope.user.lastProjectId = result.data.data.id;
                            //  목록 화면 갱신
                            $rootScope.$broadcast("getProjectList", {});
                        }
src/main/webapp/scripts/components/utils/dateRangePicker.directive.js
@@ -82,6 +82,7 @@
                                        autoApply : true,
                                        singleDatePicker : true,
                                        isSingle : true,
                                        //parentEl : $scope.parentEl !== undefined ? $scope.parentEl : "",
                                        locale: {
                                            format: 'YYYY-MM-DD',
@@ -92,6 +93,10 @@
                                        },
                                        opens : "center"
                                    });
                                    // singleDate 취소 버튼 (값 초기화)
                                    $($element).on('cancel.daterangepicker', function(ev, picker) {
                                        $scope.ngModel = "";
                                    });
                                }
                            }
                            else {
src/main/webapp/views/customField/customFieldAdd.html
@@ -112,14 +112,14 @@
                <input ng-if="vm.form.customFieldType == 'DATETIME'"
                       name="dateTime"
                       class="form-control input-readonly"
                       placeholder="{{'issue.clickToSelectDate' | translate}}"
                       ng-model="vm.form.defaultValue"
                       modal-form-auto-scroll
                       range-type="singleDate"
                       onfocus="this.blur()"
                       date-range-picker>
                <div class="row">
                    <div class="col-xs-12">
                        <div id="createdWidget" class="bootstrap-datepicker"></div>
                        <div id="createdWidget" class="bootstrap-datepicker "></div>
                    </div>
                </div>
@@ -205,4 +205,4 @@
                ng-click="fn.formSubmit()"><span translate="common.save">저장</span>
        </button>
    </div>
</div>
</div>