diff --git a/zanata-war/src/main/java/org/zanata/action/VersionHome.java b/zanata-war/src/main/java/org/zanata/action/VersionHome.java index 5a1a980050..a6ab8698dc 100644 --- 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 { 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 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 index ffaf552f5a..acbf5e17ad 100644 --- 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"/> + rendered="#{s:hasPermission(projectHome.instance, 'update')}"> - 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 index b276316928..0d89e715b4 100644 --- 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 @@ - diff --git a/zanata-war/src/main/webapp/iteration/view.xhtml b/zanata-war/src/main/webapp/iteration/view.xhtml index 478775be90..d659c5b501 100644 --- a/zanata-war/src/main/webapp/iteration/view.xhtml +++ b/zanata-war/src/main/webapp/iteration/view.xhtml @@ -408,8 +408,8 @@
  • -