From e667982e30dbf36b093132c7293d63e12242fb51 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 목, 09 12월 2021 10:47:58 +0900
Subject: [PATCH] Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa
---
src/main/webapp/scripts/app/api/apiSetting.controller.js | 6 ++----
src/main/resources/migration/V1_13__Alter_Table.sql | 17 +++++++++++++++++
src/main/resources/migration/V1_12__Alter_Table.sql | 18 +-----------------
src/main/webapp/views/api/apiSettingOverlap.html | 2 +-
src/main/webapp/index.html | 2 +-
src/main/webapp/scripts/main.js | 2 +-
6 files changed, 23 insertions(+), 24 deletions(-)
diff --git a/src/main/resources/migration/V1_12__Alter_Table.sql b/src/main/resources/migration/V1_12__Alter_Table.sql
index 36a476b..9944ff1 100644
--- a/src/main/resources/migration/V1_12__Alter_Table.sql
+++ b/src/main/resources/migration/V1_12__Alter_Table.sql
@@ -1,17 +1 @@
--- �븘�닔 �뜲�씠�꽣 �뿬遺�
-ALTER TABLE `custom_field` ADD COLUMN `required_data` VARCHAR(1) NOT NULL DEFAULT 'N';
-
--- url �빆紐� 異붽�
-ALTER TABLE `company_field` ADD COLUMN `url` VARCHAR(255) NULL;
-ALTER TABLE `isp_field` ADD COLUMN `url` VARCHAR(255) NULL;
-ALTER TABLE `hosting_field` ADD COLUMN `url` VARCHAR(255) NULL;
-
-ALTER TABLE `issue_company` ADD COLUMN `url` VARCHAR(255) NULL;
-ALTER TABLE `issue_isp` ADD COLUMN `url` VARCHAR(255) NULL;
-ALTER TABLE `issue_hosting` ADD COLUMN `url` VARCHAR(255) NULL;
-
--- �옄�룞 �셿猷� �긽�깭 異붽�
-ALTER TABLE `issue_type` ADD COLUMN `complete_issue_status_id` BIGINT(20) NULL;
-
--- �뾽泥댁쓽 url 而щ읆 INDEX 異붽�
-ALTER TABLE `company_field` ADD INDEX `urlIndex`(`url`);
+ALTER TABLE `user` ADD INDEX `levelIdIndex`(`level_id`);
\ No newline at end of file
diff --git a/src/main/resources/migration/V1_13__Alter_Table.sql b/src/main/resources/migration/V1_13__Alter_Table.sql
new file mode 100644
index 0000000..36a476b
--- /dev/null
+++ b/src/main/resources/migration/V1_13__Alter_Table.sql
@@ -0,0 +1,17 @@
+-- �븘�닔 �뜲�씠�꽣 �뿬遺�
+ALTER TABLE `custom_field` ADD COLUMN `required_data` VARCHAR(1) NOT NULL DEFAULT 'N';
+
+-- url �빆紐� 異붽�
+ALTER TABLE `company_field` ADD COLUMN `url` VARCHAR(255) NULL;
+ALTER TABLE `isp_field` ADD COLUMN `url` VARCHAR(255) NULL;
+ALTER TABLE `hosting_field` ADD COLUMN `url` VARCHAR(255) NULL;
+
+ALTER TABLE `issue_company` ADD COLUMN `url` VARCHAR(255) NULL;
+ALTER TABLE `issue_isp` ADD COLUMN `url` VARCHAR(255) NULL;
+ALTER TABLE `issue_hosting` ADD COLUMN `url` VARCHAR(255) NULL;
+
+-- �옄�룞 �셿猷� �긽�깭 異붽�
+ALTER TABLE `issue_type` ADD COLUMN `complete_issue_status_id` BIGINT(20) NULL;
+
+-- �뾽泥댁쓽 url 而щ읆 INDEX 異붽�
+ALTER TABLE `company_field` ADD INDEX `urlIndex`(`url`);
diff --git a/src/main/webapp/index.html b/src/main/webapp/index.html
index cdf13fd..e8de587 100644
--- a/src/main/webapp/index.html
+++ b/src/main/webapp/index.html
@@ -40,7 +40,7 @@
<link type="text/css" rel="stylesheet" href="custom_components/js-autocomplete-single/js-autocomplete-single.css">
<link type="text/css" rel="stylesheet" href="custom_components/js-autocomplete-multi/js-autocomplete-multi.css">
<link type="text/css" rel="stylesheet" href="custom_components/js-html-diff/js-html-diff.css">
- <link type="text/css" rel="stylesheet" href="assets/styles/main.css?version=1.0.0">
+ <link type="text/css" rel="stylesheet" href="assets/styles/main.css?version=0.9.0">
<link type="text/css" rel="stylesheet" href="https://fonts.googleapis.com/css?family=Rubik:300,400,500">
<!-- google font -->
diff --git a/src/main/webapp/scripts/app/api/apiSetting.controller.js b/src/main/webapp/scripts/app/api/apiSetting.controller.js
index 70103fc..acb070f 100644
--- a/src/main/webapp/scripts/app/api/apiSetting.controller.js
+++ b/src/main/webapp/scripts/app/api/apiSetting.controller.js
@@ -140,7 +140,7 @@
});
}
- $scope.$watch("vm.issueTypeId", function (newValue){
+ $scope.$watch("vm.issueTypeId", function (newValue, oldValue){
if (newValue != null && newValue !== "") {
$scope.fn.loadPage();
}
@@ -189,7 +189,6 @@
}
function onChangeIssueTypeOverlap() {
- $scope.fn.getIssueStatuses();
$scope.fn.getIssueTypeCustomFields();
$scope.fn.getOverlapList();
}
@@ -237,8 +236,6 @@
if (result.data.message.status === "success") {
SweetAlert.swal($filter("translate")("api.successToApiAutoCompleteIssueStatus"), result.data.message.message, "success"); // "�꽕�젙 �꽦怨�"
$scope.fn.getIssueTypes();
- $scope.fn.getIssueStatuses();
- $scope.fn.getIssueTypeCustomFields();
} else {
SweetAlert.swal($filter("translate")("api.failedToApiAutoCompleteIssueStatus"), result.data.message.message, "error"); // "�꽕�젙 �떎�뙣"
}
@@ -403,6 +400,7 @@
if (tab === "API_COL_SETTING") {
$scope.fn.onChangeColumnSetting();
} else if (tab === "API_OVERLAP_SETTING") {
+ $scope.fn.getIssueStatuses();
$scope.fn.onChangeIssueTypeOverlap();
} else if (tab === "API_SPEC_SETTING") {
$scope.fn.onChangeIssueTypeSpec();
diff --git a/src/main/webapp/scripts/main.js b/src/main/webapp/scripts/main.js
index ef59c0d..0973abc 100644
--- a/src/main/webapp/scripts/main.js
+++ b/src/main/webapp/scripts/main.js
@@ -4,7 +4,7 @@
'use strict';
require.config({
- urlArgs : "bust=v1.0.0",
+ urlArgs : "bust=v0.9.0",
paths : {
'jquery' : '../bower_components/jquery/dist/jquery',
'jquery-ui' : '../bower_components/jquery-ui/jquery-ui',
diff --git a/src/main/webapp/views/api/apiSettingOverlap.html b/src/main/webapp/views/api/apiSettingOverlap.html
index 6d83e51..ecfe175 100644
--- a/src/main/webapp/views/api/apiSettingOverlap.html
+++ b/src/main/webapp/views/api/apiSettingOverlap.html
@@ -62,7 +62,7 @@
class="form-control input-sm issue-select-label"
ng-style="{ 'color' : fn.getOptionColor(vm.completeIssueStatuses, vm.completeIssueStatusId) }"
ng-model="vm.completeIssueStatusId"
- ng-change="fn.onChangeIssueTypeSpec()"
+ ng-change="fn.onChangeIssueTypeOverlap()"
required>
<option ng-repeat="issueStatus in vm.completeIssueStatuses"
ng-style="{ 'color' : issueStatus.color, 'font-weight': 600 }"
--
Gitblit v1.8.0