From 87747a1cdcb43d1e69961f1cc4e149a8a4f191ea Mon Sep 17 00:00:00 2001
From: Manuel Rego Casasnovas <rego@igalia.com>
Date: Fri, 1 Feb 2013 10:35:59 +0100
Subject: [PATCH] jira-integration: Hide JIRA part in project edition if not
 activated

If JIRA is not activated the part to do the synchronization with the server in
the project edition shouldn't be visible.

FEA: ItEr77S16JiraAndTimConnectorContributionIntegration
---
 .../main/java/org/libreplan/web/orders/IOrderModel.java    | 2 ++
 .../java/org/libreplan/web/orders/OrderCRUDController.java | 4 ++++
 .../src/main/java/org/libreplan/web/orders/OrderModel.java | 7 +++++++
 libreplan-webapp/src/main/webapp/orders/_edition.zul       | 3 ++-
 4 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/orders/IOrderModel.java b/libreplan-webapp/src/main/java/org/libreplan/web/orders/IOrderModel.java
index d8c3d7fbb..0986edd16 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/web/orders/IOrderModel.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/web/orders/IOrderModel.java
@@ -148,4 +148,6 @@ public interface IOrderModel extends IIntegrationEntityModel {
     boolean isOnlyChildAndParentAlreadyInUseByHoursOrExpenses(
             OrderElement orderElement);
 
+    boolean isJiraActivated();
+
 }
diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java b/libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java
index b14fb1ae1..590b3c456 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java
@@ -1855,4 +1855,8 @@ public class OrderCRUDController extends GenericForwardComposer {
         }
     }
 
+    public boolean isJiraActivated() {
+        return orderModel.isJiraActivated();
+    }
+
 }
diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java b/libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java
index ea29d4eec..6e0168085 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java
@@ -928,4 +928,11 @@ public class OrderModel extends IntegrationEntityModel implements IOrderModel {
         }
     }
 
+    @Override
+    @Transactional(readOnly = true)
+    public boolean isJiraActivated() {
+        return configurationDAO.getConfiguration().getJiraConfiguration()
+                .isJiraActivated();
+    }
+
 }
diff --git a/libreplan-webapp/src/main/webapp/orders/_edition.zul b/libreplan-webapp/src/main/webapp/orders/_edition.zul
index 5c99ffec3..44df032cf 100644
--- a/libreplan-webapp/src/main/webapp/orders/_edition.zul
+++ b/libreplan-webapp/src/main/webapp/orders/_edition.zul
@@ -281,7 +281,8 @@
                        </grid>
                      </groupbox>
                 </groupbox>
-                <groupbox style="margin-top: 5px" sclass="jiraLabel" closable="false">
+                <groupbox style="margin-top: 5px" sclass="jiraLabel" closable="false"
+                    visible="@{controller.jiraActivated}">
                    <caption label="${i18n:_('JIRA import information')}" />
                    <separator spacing="10px"/>
                    <hbox width="100%">