From b4c6f551505166fea175bd7fa6be833379213f93 Mon Sep 17 00:00:00 2001
From: Alex Eng <aeng@redhat.com>
Date: Thu, 29 Jan 2015 18:22:18 +1000
Subject: [PATCH] Fix readonly first version issue:
 https://bugzilla.redhat.com/show_bug.cgi?id=1185170

Squashed commit of the following:

commit 10fb15a9645eb4a021ffcfe1d00542842bc30d96
Author: Alex Eng <aeng@redhat.com>
Date:   Thu Jan 29 11:24:15 2015 +1000

    Fix readonly first version issue: https://bugzilla.redhat.com/show_bug.cgi?id=1185170
---
 .../java/org/zanata/action/VersionHome.java   |  4 +++-
 zanata-war/src/main/webapp/WEB-INF/pages.xml  |  2 +-
 .../src/main/webapp/project/project.xhtml     | 22 ++++++++++---------
 3 files changed, 16 insertions(+), 12 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
index e2f0139a9a..fe69f871ef 100644
--- a/zanata-war/src/main/java/org/zanata/action/VersionHome.java
+++ b/zanata-war/src/main/java/org/zanata/action/VersionHome.java
@@ -150,8 +150,10 @@ private void setDefaultCopyFromVersion() {
             this.copyFromVersionSlug =
                     otherVersions.get(0).getVersion().getSlug();
 
+            copyFromVersion = true;
+        } else {
+            copyFromVersion = false;
         }
-        copyFromVersion = true;
     }
 
     public void init(boolean isNewInstance) {
diff --git a/zanata-war/src/main/webapp/WEB-INF/pages.xml b/zanata-war/src/main/webapp/WEB-INF/pages.xml
index 6203ebd0ce..334d573dcb 100644
--- a/zanata-war/src/main/webapp/WEB-INF/pages.xml
+++ b/zanata-war/src/main/webapp/WEB-INF/pages.xml
@@ -414,7 +414,7 @@
   </page>
 
   <page view-id="/project/add_iteration.xhtml">
-    <restrict>#{s:hasPermission(versionHome.instance, 'insert')}</restrict>
+    <restrict>#{s:hasPermission(projectHome.instance, 'insert')}</restrict>
     <param name="projectSlug" value="#{versionHome.projectSlug}" />
     <param name="copyFromVersionSlug" value="#{versionHome.copyFromVersionSlug}" />
     <action execute="#{versionHome.validateProjectSlug}" />
diff --git a/zanata-war/src/main/webapp/project/project.xhtml b/zanata-war/src/main/webapp/project/project.xhtml
index 6be03e4473..ede2c28ba7 100644
--- a/zanata-war/src/main/webapp/project/project.xhtml
+++ b/zanata-war/src/main/webapp/project/project.xhtml
@@ -34,20 +34,22 @@
 
     updateStateFromUrl();
     renderStatistics();
-  })
+  });
   //]]>
 
 </script>
 
-<a4j:jsFunction name="refreshStatistics" status="statistic-loader"
-  render="versions_form"
-  oncomplete="refreshTooltip('#{rich:clientId('versions_form')}')"
-  action="#{projectHomeAction.resetPageData}"/>
-
-<a4j:jsFunction name="renderStatistics" status="statistic-loader"
-  oncomplete="refreshTooltip('#{rich:clientId('versions_form')}')"
-  render="versions_form"
-  action="#{projectHomeAction.setPageRendered(true)}"/>
+  <h:form styleClass="l--push-bottom-0">
+    <a4j:jsFunction name="refreshStatistics" status="statistic-loader"
+      render="versions_form"
+      oncomplete="refreshTooltip('#{rich:clientId('versions_form')}')"
+      action="#{projectHomeAction.resetPageData}"/>
+
+    <a4j:jsFunction name="renderStatistics" status="statistic-loader"
+      oncomplete="refreshTooltip('#{rich:clientId('versions_form')}')"
+      render="versions_form"
+      action="#{projectHomeAction.setPageRendered(true)}"/>
+  </h:form>
 
 <div class="g">
   <div class="g__item w--1-m w--3-8-l w--1-3 l--push-bottom-half">