Fix create first version in project: https://bugzilla.redhat.com/show…

…_bug.cgi?id=1140429
zanata · Sep 11, 2014 · 69c7e84 · 69c7e84
1 parent 29fce14
commit 69c7e84
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 6 deletions.
diff --git a/zanata-war/src/main/java/org/zanata/action/VersionHome.java b/zanata-war/src/main/java/org/zanata/action/VersionHome.java
@@ -123,9 +123,10 @@ public class VersionHome extends SlugHome<HProjectIteration> {
     private VersionLocaleAutocomplete localeAutocomplete =
             new VersionLocaleAutocomplete();
 
+
     @Getter
     @Setter
-    private boolean copyFromVersion = true;
+    private boolean copyFromVersion = false;
 
     @Getter
     @Setter
@@ -148,6 +149,7 @@ private void setDefaultCopyFromVersion() {
                 && StringUtils.isEmpty(copyFromVersionSlug)) {
             this.copyFromVersionSlug =
                     otherVersions.get(0).getVersion().getSlug();
+            copyFromVersion = true;
         }
     }
 
@@ -164,7 +166,6 @@ public void init(boolean isNewInstance) {
             if (versionProjectType != null) {
                 selectedProjectType = versionProjectType.name();
             }
-            copyFromVersion = false;
             copyFromVersionSlug = "";
         }
     }

diff --git a/zanata-war/src/main/webapp/WEB-INF/layout/version/edit_form.xhtml b/zanata-war/src/main/webapp/WEB-INF/layout/version/edit_form.xhtml
@@ -19,6 +19,11 @@
       bindCopyFromVersionSlug(versionSlug);
     }
 
+    function onCopyFromVersionFlagChanged(chk, value) {
+      jQuery(getCopyFromVersionFlagInput()).val(value);
+      bindCopyFromVersion(value);
+    }
+
     function getProjectTypeId() {
       return "[id='#{rich:clientId('project-type')}']";
     }
@@ -34,6 +39,10 @@
     function getCopyFromVersionInput() {
       return "[id='#{rich:clientId('copyFromVersionSlug')}']";
     }
+
+    function getCopyFromVersionFlagInput() {
+      return "[id='#{rich:clientId('copyFromVersion')}']";
+    }
   </script>
 
   <a4j:jsFunction name="bindCopyFromVersionSlug">
@@ -43,8 +52,7 @@
   <a4j:jsFunction name="bindCopyFromVersion"
     oncomplete="zanata.form.appendRadios(getProjectTypeId());zanata.form.appendRadios(getProjectVersionId())"
     render="project-type-list, project-version">
-    <a4j:param name="val1" assignTo="#{value}"/>
-    <a4j:param name="val2" assignTo="#{versionHome.copyFromVersion}"/>
+    <a4j:param name="val" assignTo="#{versionHome.copyFromVersion}"/>
   </a4j:jsFunction>
 
   <div class="form__item l--push-top-1">
@@ -68,9 +76,11 @@
 
   <zanata:checkbox label="#{msgs['jsf.copyVersion.label']}" id="copy-from-version"
     rendered="#{not versionHome.managed and not empty versionHome.project.projectIterations}"
-    onValueChanged="bindCopyFromVersion" value="copy-version-checkbox"
+    onValueChanged="onCopyFromVersionFlagChanged" value="copy-version-checkbox"
     styleClass="l--push-v-1" checked="#{versionHome.copyFromVersion}"/>
 
+  <h:inputHidden id="copyFromVersion" value="#{versionHome.copyFromVersion}"/>
+
   <s:div id="project-type-list">
     <h:inputHidden id="selectedProjectType"
       value="#{versionHome.selectedProjectType}"
@@ -147,7 +157,6 @@
   </s:div>
 
   <s:div id="project-version" rendered="#{not versionHome.managed}">
-    <h:inputHidden id="copyFromVersion" value="#{versionHome.copyFromVersion}"/>
     <h:inputHidden id="copyFromVersionSlug"
       value="#{versionHome.copyFromVersionSlug}"/>