fix html bug

knightliao · Oct 26, 2015 · 912a5ca · 912a5ca
1 parent fe59012
commit 912a5ca
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 11 deletions.
diff --git a/disconf-client/pom.xml b/disconf-client/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <groupId>com.baidu.disconf</groupId>
         <artifactId>disconf-base</artifactId>
-        <version>2.6.26</version>
+        <version>2.6.27-SNAPSHOT</version>
         <relativePath>../</relativePath>
     </parent>
 

diff --git a/disconf-core/pom.xml b/disconf-core/pom.xml
@@ -14,7 +14,7 @@
         <groupId>com.baidu.disconf</groupId>
         <artifactId>disconf-base</artifactId>
         <relativePath>../</relativePath>
-        <version>2.6.26</version>
+        <version>2.6.27-SNAPSHOT</version>
     </parent>
 
     <licenses>

diff --git a/disconf-demos/disconf-spring-boot-demo/disconf-spring-boot-core/pom.xml b/disconf-demos/disconf-spring-boot-demo/disconf-spring-boot-core/pom.xml
@@ -32,7 +32,7 @@
         <dependency>
             <groupId>com.baidu.disconf</groupId>
             <artifactId>disconf-client</artifactId>
-            <version>2.6.26</version>
+            <version>2.6.27-SNAPSHOT</version>
             <exclusions>
                 <exclusion>
                     <groupId>ch.qos.logback</groupId>

diff --git a/disconf-demos/disconf-standalone-demo/pom.xml b/disconf-demos/disconf-standalone-demo/pom.xml
@@ -11,7 +11,7 @@
         <dependency>
             <groupId>com.baidu.disconf</groupId>
             <artifactId>disconf-client</artifactId>
-            <version>2.6.26</version>
+            <version>2.6.27-SNAPSHOT</version>
         </dependency>
 
         <dependency>

diff --git a/disconf-demos/disconf-standalone-dubbo-demo/pom.xml b/disconf-demos/disconf-standalone-dubbo-demo/pom.xml
@@ -11,7 +11,7 @@
         <dependency>
             <groupId>com.baidu.disconf</groupId>
             <artifactId>disconf-client</artifactId>
-            <version>2.6.26</version>
+            <version>2.6.27-SNAPSHOT</version>
         </dependency>
 
         <dependency>

diff --git a/disconf-tool/pom.xml b/disconf-tool/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.baidu.disconf</groupId>
         <artifactId>disconf-base</artifactId>
-        <version>2.6.26</version>
+        <version>2.6.27-SNAPSHOT</version>
     </parent>
     <artifactId>disconf-tool</artifactId>
     <version>${disconf-tool.version}</version>

diff --git a/disconf-web/html/assets/js/newconfigfile.js b/disconf-web/html/assets/js/newconfigfile.js
@@ -211,6 +211,10 @@ $("#uploadChoice").on(
                 'click',
                 function (e) {
 
+                    if (version == '自定义版本') {
+                        version = $('#selfversion_value').val();
+                    }
+
                     $("#error").addClass("hide");
 
                     var fileName = $("#fileName").val();
@@ -239,7 +243,7 @@ $("#uploadChoice").on(
                             "envId": envId,
                             "version": version,
                             "fileContent": fileContent,
-                            "fileName": fileName,
+                            "fileName": fileName
                         }
                     }).done(function (data) {
                         $("#error").removeClass("hide");

diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
 
     <groupId>com.baidu.disconf</groupId>
     <artifactId>disconf-base</artifactId>
-    <version>2.6.26</version>
+    <version>2.6.27-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <modules>
@@ -46,9 +46,9 @@
         <project.build.offline.sourceDir>${project.basedir}/src/main/resources</project.build.offline.sourceDir>
 
         <!-- 模块版本号 -->
-        <disconf-core.version>2.6.26</disconf-core.version>
-        <disconf-client.version>2.6.26</disconf-client.version>
-        <disconf-tool.version>2.6.26</disconf-tool.version>
+        <disconf-core.version>2.6.27-SNAPSHOT</disconf-core.version>
+        <disconf-client.version>2.6.27-SNAPSHOT</disconf-client.version>
+        <disconf-tool.version>2.6.27-SNAPSHOT</disconf-tool.version>
     </properties>
 
     <dependencyManagement>