Merge branch 'release' into integration/master

zanata · Oct 28, 2014 · 240a396 · 240a396
2 parents 7b69bd2 + 689ed8f
commit 240a396
Showing 1 changed file with 5 additions and 2 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
@@ -126,7 +126,7 @@ public class VersionHome extends SlugHome<HProjectIteration> {
 
     @Getter
     @Setter
-    private boolean copyFromVersion = false;
+    private boolean copyFromVersion = true;
 
     @Getter
     @Setter
@@ -161,8 +161,11 @@ public void init(boolean isNewInstance) {
             if (projectType != null) {
                 selectedProjectType = projectType.name();
             }
-            setDefaultCopyFromVersion();
+            if(StringUtils.isEmpty(copyFromVersionSlug)) {
+                setDefaultCopyFromVersion();
+            }
         } else {
+            copyFromVersion = false;
             ProjectType versionProjectType = getInstance().getProjectType();
             if (versionProjectType != null) {
                 selectedProjectType = versionProjectType.name();