Remove 'open' column in project home is obsolete

zanata · Feb 27, 2012 · 630224c · 630224c
1 parent 803cdf4
commit 630224c
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/server/zanata-war/src/main/java/org/zanata/action/ProjectHome.java b/server/zanata-war/src/main/java/org/zanata/action/ProjectHome.java
@@ -226,7 +226,16 @@ else if (customizedItems != null)
 
    public boolean isReadOnly(HProjectIteration iteration)
    {
-      if (getInstance().getStatus() != EntityStatus.ACTIVE || (iteration != null && iteration.getStatus() != EntityStatus.ACTIVE))
+      if (getInstance().getStatus() == EntityStatus.READONLY || (iteration != null && iteration.getStatus() != EntityStatus.READONLY))
+      {
+         return true;
+      }
+      return false;
+   }
+
+   public boolean isObsolete(HProjectIteration iteration)
+   {
+      if (getInstance().getStatus() == EntityStatus.OBSOLETE || (iteration != null && iteration.getStatus() == EntityStatus.OBSOLETE))
       {
          return true;
       }

diff --git a/server/zanata-war/src/main/webapp/WEB-INF/layout/iteration_view_inline.xhtml b/server/zanata-war/src/main/webapp/WEB-INF/layout/iteration_view_inline.xhtml
@@ -31,13 +31,12 @@
     </div>
     </a4j:form>     
   </div>
-<s:fragment rendered="#{_iteration.status != 'OBSOLETE'}">
   <rich:dataTable id="data_table" width="100%" value="#{iterationTranslationAction.getTranslationLocale(projectHome.instance.slug, _iteration.slug)}"
                   var="hLocale"
                   styleClass="iteration_inline_tribes"
                   rowClasses="odd,even">
     <rich:column id="locale_id">#{hLocale.retrieveNativeName()} [#{hLocale.localeId.id}]</rich:column>
-    <rich:column id="translate">
+    <rich:column id="translate" rendered="#{!projectHome.isObsolete(_iteration)}">
       <h:outputLink
           rendered="#{s:hasPermission(hLocale, 'modify-translation') and !applicationConfiguration.debug and projectHome.isReadOnly(_iteration)}"
           value="#{request.contextPath}/webtrans/Application.html">
@@ -98,7 +97,6 @@
       </ui:include>
     </rich:column>
   </rich:dataTable>
-</s:fragment>
 </div>
 
 </ui:composition>