From f5d8984c5b87604e10c073bab15599c2d46998af Mon Sep 17 00:00:00 2001 From: Manuel Rego Casasnovas Date: Thu, 31 Jan 2013 11:00:52 +0100 Subject: [PATCH] jira-integration: Disable code edition in task pop-up for JIRA issues JIRA issues code is not editable in the WBS and it shouldn't be editable in the task edition pop-up either. FEA: ItEr77S16JiraAndTimConnectorContributionIntegration --- .../web/orders/DetailsOrderElementController.java | 11 +++++++++++ .../src/main/webapp/orders/_orderElementDetails.zul | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/orders/DetailsOrderElementController.java b/libreplan-webapp/src/main/java/org/libreplan/web/orders/DetailsOrderElementController.java index d94ba7829..07e5a3ca5 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/orders/DetailsOrderElementController.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/orders/DetailsOrderElementController.java @@ -84,4 +84,15 @@ public class DetailsOrderElementController extends return Util.getMoneyFormat(); } + public boolean isCodeDisabled() { + if (isCodeAutogenerated()) { + return true; + } + OrderElement orderElement = orderElementModel.getOrderElement(); + if (orderElement == null) { + return false; + } + return orderElement.isJiraIssue(); + } + } \ No newline at end of file diff --git a/libreplan-webapp/src/main/webapp/orders/_orderElementDetails.zul b/libreplan-webapp/src/main/webapp/orders/_orderElementDetails.zul index 723cead56..b575ab383 100644 --- a/libreplan-webapp/src/main/webapp/orders/_orderElementDetails.zul +++ b/libreplan-webapp/src/main/webapp/orders/_orderElementDetails.zul @@ -39,7 +39,7 @@ + disabled="@{detailsController.codeDisabled}" />