Fix in create version page: https://bugzilla.redhat.com/show_bug.cgi?…

…id=1129906
zanata · Aug 13, 2014 · 0fb73a9 · 0fb73a9
1 parent 2b5db8a
commit 0fb73a9
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 35 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
@@ -127,7 +127,8 @@ public class VersionHome extends SlugHome<HProjectIteration> {
             new VersionLocaleAutocomplete();
 
     @Getter
-    private boolean copyFromVersion;
+    @Setter
+    private boolean copyFromVersion = true;
 
     @Getter
     @Setter
@@ -144,36 +145,23 @@ public VersionItem apply(HProjectIteration input) {
                 }
             };
 
-    public void setCopyFromVersion(boolean copyFromVersion) {
-        this.copyFromVersion = copyFromVersion;
+    private void setDefaultCopyFromVersion() {
         List<VersionItem> otherVersions = getOtherVersions();
-        if (!otherVersions.isEmpty()) {
+        if (!otherVersions.isEmpty()
+                && StringUtils.isEmpty(copyFromVersionSlug)) {
             this.copyFromVersionSlug =
                     otherVersions.get(0).getVersion().getSlug();
-        } else {
-            this.copyFromVersionSlug = "";
         }
     }
 
-    public void reset() {
-        slug = null;
-        copyFromVersionSlug = null;
-        clearInstance();
-    }
-
     public void init(boolean isNewInstance) {
         this.isNewInstance = isNewInstance;
         if (isNewInstance) {
-            // set copy from version option to true
-            if (StringUtils.isNotEmpty(copyFromVersionSlug)) {
-                copyFromVersion = true;
-            } else {
-                ProjectType projectType = getProject().getDefaultProjectType();
-                if (projectType != null) {
-                    selectedProjectType = projectType.name();
-                }
+            ProjectType projectType = getProject().getDefaultProjectType();
+            if (projectType != null) {
+                selectedProjectType = projectType.name();
             }
-
+            setDefaultCopyFromVersion();
         } else {
             ProjectType versionProjectType = getInstance().getProjectType();
             if (versionProjectType != null) {
@@ -465,11 +453,13 @@ public void copyProjectTypeFromProject() {
     }
 
     /**
-     * @return comma-separated list of accepted file extensions. May be an empty string
+     * @return comma-separated list of accepted file extensions. May be an empty
+     *         string
      */
     public String getAcceptedSourceFileTypes() {
-        return Joiner.on(", ")
-            .join(ProjectType.getSupportedSourceFileTypes(getProjectType()));
+        return Joiner
+                .on(", ")
+                .join(ProjectType.getSupportedSourceFileTypes(getProjectType()));
     }
 
     private void updateProjectType() {

diff --git a/zanata-war/src/main/webapp/WEB-INF/layout/project/versions-tab.xhtml b/zanata-war/src/main/webapp/WEB-INF/layout/project/versions-tab.xhtml
@@ -45,7 +45,7 @@
       status="versionTab-versionsLoader"/>
 
     <s:fragment
-      rendered="#{s:hasPermission(projectHome.instance, 'insert')}">
+      rendered="#{s:hasPermission(projectHome.instance, 'update')}">
       <div
         class="dropdown dropdown--header dropdown--small dropdown--right dropdown--inline js-dropdown"
         id="versions-more-actions">
@@ -55,10 +55,9 @@
         <ul class="dropdown__content js-dropdown__content" role="content"
           aria-labelledby="dropdownContent">
           <li>
-            <s:link id="new-version-link"
+            <s:link id="new-version-link" propagation="none"
               value="#{msgs['jsf.project.NewVersion']}"
-              view="/project/add_iteration.xhtml"
-              action="#{versionHome.reset()}">
+              view="/project/add_iteration.xhtml">
               <f:param name="projectSlug" value="#{projectHomeAction.slug}"/>
               <i class="i i--plus i__item__icon"></i>
             </s:link>
@@ -140,11 +139,10 @@
                 </a>
                 <ul class="dropdown__content js-dropdown__content">
                   <s:fragment
-                    rendered="#{s:hasPermission(projectHome.instance, 'insert')}">
+                    rendered="#{s:hasPermission(projectHome.instance, 'update')}">
                     <li>
                       <s:link view="/project/add_iteration.xhtml"
-                        action="#{versionHome.reset()}"
-                        styleClass="i__item--right"
+                        propagation="none" styleClass="i__item--right"
                         value="#{msgs['jsf.copyVersion.versionPage.label']}">
                         <f:param name="projectSlug"
                           value="#{projectHome.slug}"/>
@@ -189,7 +187,7 @@
               </div>
             </s:div>
 
-            <s:link view="/iteration/view.xhtml" action="#{versionHome.reset()}"
+            <s:link view="/iteration/view.xhtml" propagation="none"
               disabled="#{projectHomeAction.isVersionCopying(version.project.slug, version.slug)}">
               <f:param name="projectSlug" value="#{projectHomeAction.slug}"/>
               <f:param name="iterationSlug" value="#{version.slug}"/>

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
@@ -147,7 +147,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}"/>
 

diff --git a/zanata-war/src/main/webapp/iteration/view.xhtml b/zanata-war/src/main/webapp/iteration/view.xhtml
@@ -408,8 +408,8 @@
               </s:fragment>
               <s:fragment rendered="#{s:hasPermission(versionHome.instance.project, 'insert')}">
                 <li>
-                  <s:link view="/project/add_iteration.xhtml" action="#{versionHome.reset()}"
-                    styleClass="i__item--right"
+                  <s:link view="/project/add_iteration.xhtml"
+                    styleClass="i__item--right" propagation="none"
                     value="#{msgs['jsf.copyVersion.versionPage.label']}">
                     <f:param name="projectSlug" value="#{versionHome.projectSlug}"/>
                     <f:param name="copyFromVersionSlug" value="#{versionHome.slug}"/>