From 04f3138b8243713a914b7eb1c3fcdbca84e72fb2 Mon Sep 17 00:00:00 2001
From: Manuel Rego Casasnovas <rego@igalia.com>
Date: Wed, 13 Feb 2013 13:45:47 +0100
Subject: [PATCH] tim-connector: Hide Tim sync UI in order edition if Tim is
 not activated

Like in the case of JIRA, the Tim synchronization UI in the project edition will
only appear if Tim connector is activated.

FEA: ItEr77S16JiraAndTimConnectorContributionIntegration
---
 .../orders/TimSynchronizationController.java  |  4 +-
 .../components/_timOrderTimesheetSync.zul     | 51 +++++++++----------
 2 files changed, 27 insertions(+), 28 deletions(-)

diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/orders/TimSynchronizationController.java b/libreplan-webapp/src/main/java/org/libreplan/web/orders/TimSynchronizationController.java
index 9303b8b59..678e4e699 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/web/orders/TimSynchronizationController.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/web/orders/TimSynchronizationController.java
@@ -100,9 +100,9 @@ public class TimSynchronizationController extends GenericForwardComposer {
         }
     }
 
-    public boolean isTimDeactivated() {
+    public boolean isTimActivated() {
         AppProperties appProperties = appPropertiesDAO.findByMajorIdAndName(
                 "Tim", "Activated");
-        return !appProperties.getPropertyValue().equalsIgnoreCase("Y");
+        return appProperties.getPropertyValue().equalsIgnoreCase("Y");
     }
 }
diff --git a/libreplan-webapp/src/main/webapp/orders/components/_timOrderTimesheetSync.zul b/libreplan-webapp/src/main/webapp/orders/components/_timOrderTimesheetSync.zul
index 3d7d377f0..88eb48348 100644
--- a/libreplan-webapp/src/main/webapp/orders/components/_timOrderTimesheetSync.zul
+++ b/libreplan-webapp/src/main/webapp/orders/components/_timOrderTimesheetSync.zul
@@ -17,39 +17,38 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
  -->
 
-<vbox id="${arg.id}"
-    apply="org.libreplan.web.orders.TimSynchronizationController" width="100%">
-<groupbox style="margin-top: 5px" closable="false">
-   <caption label="${i18n:_('Tim sync information')}" />
-   <separator spacing="10px"/>
-   <hbox width="100%">
-       <separator spacing="10px" width="100%"/>
-
-       <grid fixedLayout="true" hflex="1">
-           <columns>
-               <column width="200px" />
-               <column  />
-           </columns>
-           <rows>
-                 <row>
-                    <label value="${i18n:_('Tim last sync')}"/>
-                    <hbox>
+<groupbox id="${arg.id}"
+    apply="org.libreplan.web.orders.TimSynchronizationController"
+    style="margin-top: 5px" closable="false"
+    visible="@{timSynchronizationController.timActivated}">
+    <caption label="${i18n:_('Tim sync information')}" />
+    <separator spacing="10px"/>
+    <hbox width="100%">
+        <separator spacing="10px" width="100%"/>
+        <grid fixedLayout="true" hflex="1">
+            <columns>
+                <column width="200px" />
+                <column  />
+            </columns>
+            <rows>
+               <row>
+                   <label value="${i18n:_('Tim last sync')}"/>
+                   <hbox>
                        <label id="labelLastSyncDate" value=""/>
                        <separator bar="false" spacing="15px" orient="vertical"/>
                        <label id="labelProductCode" value=""/>
-                    </hbox>
-                    </row>
-                 <row>
-                    <label value="${i18n:_('Tim product code')}"/>
-                    <hbox>
+                   </hbox>
+               </row>
+               <row>
+                   <label value="${i18n:_('Tim product code')}"/>
+                   <hbox>
                        <textbox id="txtProductCode" value=""
                            width="350px"/>
-                        <button label="${i18n:_('Export to Tim')}" id="exportToTimButton" disabled="@{timSynchronizationController.timDeactivated}"
+                       <button label="${i18n:_('Export to Tim')}" id="exportToTimButton"
                            onClick="timSynchronizationController.startExportToTim()" />
-                    </hbox>
+                   </hbox>
                </row>
            </rows>
        </grid>
    </hbox>
-</groupbox>
-</vbox>
+</groupbox>
\ No newline at end of file