diff --git a/src/main/java/org/support/project/knowledge/deploy/InitDB.java b/src/main/java/org/support/project/knowledge/deploy/InitDB.java index da4ae3da0..92a71f12f 100644 --- a/src/main/java/org/support/project/knowledge/deploy/InitDB.java +++ b/src/main/java/org/support/project/knowledge/deploy/InitDB.java @@ -25,7 +25,7 @@ import org.support.project.knowledge.deploy.v1_11_0.Migrate_1_11_0; import org.support.project.knowledge.deploy.v1_11_0.Migrate_1_11_1; import org.support.project.knowledge.deploy.v1_11_0.Migrate_1_11_2; -import org.support.project.knowledge.deploy.v1_12.Migrate_1_12_0; +import org.support.project.knowledge.deploy.v1_11_0.Migrate_1_11_3; import org.support.project.knowledge.deploy.v1_1_0pre1.Migrate_1_1_0pre1; import org.support.project.knowledge.deploy.v1_4_0.Migrate_1_4_0; import org.support.project.knowledge.deploy.v1_5_0.Migrate_1_5_0; @@ -51,7 +51,7 @@ public class InitDB { private static final Map MAP = new LinkedHashMap<>(); private static final Migrate INIT = InitializeSystem.get(); - public static final String CURRENT = "1.12.0"; + public static final String CURRENT = "1.11.3"; public InitDB() { super(); @@ -84,7 +84,7 @@ public InitDB() { MAP.put("1.11.0", Migrate_1_11_0.get()); MAP.put("1.11.1", Migrate_1_11_1.get()); MAP.put("1.11.2", Migrate_1_11_2.get()); - MAP.put("1.12.0", Migrate_1_12_0.get()); + MAP.put("1.11.3", Migrate_1_11_3.get()); } public static void main(String[] args) throws Exception { diff --git a/src/main/java/org/support/project/knowledge/deploy/v1_12/Migrate_1_12_0.java b/src/main/java/org/support/project/knowledge/deploy/v1_11_0/Migrate_1_11_3.java similarity index 76% rename from src/main/java/org/support/project/knowledge/deploy/v1_12/Migrate_1_12_0.java rename to src/main/java/org/support/project/knowledge/deploy/v1_11_0/Migrate_1_11_3.java index aa18566d8..b5a53023e 100644 --- a/src/main/java/org/support/project/knowledge/deploy/v1_12/Migrate_1_12_0.java +++ b/src/main/java/org/support/project/knowledge/deploy/v1_11_0/Migrate_1_11_3.java @@ -1,12 +1,12 @@ -package org.support.project.knowledge.deploy.v1_12; +package org.support.project.knowledge.deploy.v1_11_0; import org.support.project.knowledge.deploy.Migrate; import org.support.project.ormapping.tool.dao.InitializeDao; -public class Migrate_1_12_0 implements Migrate { +public class Migrate_1_11_3 implements Migrate { - public static Migrate_1_12_0 get() { - return org.support.project.di.Container.getComp(Migrate_1_12_0.class); + public static Migrate_1_11_3 get() { + return org.support.project.di.Container.getComp(Migrate_1_11_3.class); } @Override diff --git a/src/main/webapp/WEB-INF/views/admin/template/edit.jsp b/src/main/webapp/WEB-INF/views/admin/template/edit.jsp index e77d645e7..1973ea1e9 100644 --- a/src/main/webapp/WEB-INF/views/admin/template/edit.jsp +++ b/src/main/webapp/WEB-INF/views/admin/template/edit.jsp @@ -49,7 +49,7 @@
- +
diff --git a/src/main/webapp/js/template-item-input.js b/src/main/webapp/js/template-item-input.js index ddba815e8..1e334511c 100644 --- a/src/main/webapp/js/template-item-input.js +++ b/src/main/webapp/js/template-item-input.js @@ -129,13 +129,16 @@ $(document).ready(function() { $('#template_info').removeClass('hide'); $('#template_info').addClass('show'); - if (!$('#content').val()) { - $('#content').val(template.initialValue); - initialValue = template.initialValue; - } else if (initialValue === $('#content').val()) { - // 初期値を指定してから変更していない + var contentStr = $('#content').val(); + if (!contentStr) { $('#content').val(template.initialValue); initialValue = template.initialValue; + } else { + if (initialValue.replace(/\r?\n/g,"") == contentStr.replace(/\r?\n/g,"")) { + // 初期値を指定してから変更していない + $('#content').val(template.initialValue ? template.initialValue : ''); + initialValue = template.initialValue; + } } $('#template_items').html('');