From 25d146126359fc670f308462334eb668f77ec479 Mon Sep 17 00:00:00 2001
From: Manuel Rego Casasnovas <rego@igalia.com>
Date: Thu, 31 Jan 2013 17:13:24 +0100
Subject: [PATCH] jira-integration: Rename jiraLabelUrl to jiraLabels

Due to previous commit, this field could save a URL or a list of labels, so the
name has been changed to avoid misunderstandings.

FEA: ItEr77S16JiraAndTimConnectorContributionIntegration
---
 .../common/entities/JiraConfiguration.java      | 17 ++++++++++++-----
 .../src/main/resources/db.changelog-1.3.xml     | 11 +++++++++++
 .../common/entities/Configuration.hbm.xml       |  2 +-
 .../importers/JiraOrderElementSynchronizer.java | 10 +++++-----
 .../src/main/webapp/common/configuration.zul    |  8 ++++----
 5 files changed, 33 insertions(+), 15 deletions(-)

diff --git a/libreplan-business/src/main/java/org/libreplan/business/common/entities/JiraConfiguration.java b/libreplan-business/src/main/java/org/libreplan/business/common/entities/JiraConfiguration.java
index b84c3a668..6ed2dcc45 100755
--- a/libreplan-business/src/main/java/org/libreplan/business/common/entities/JiraConfiguration.java
+++ b/libreplan-business/src/main/java/org/libreplan/business/common/entities/JiraConfiguration.java
@@ -37,7 +37,14 @@ public class JiraConfiguration extends BaseEntity {
 
     private String jiraUrl;
 
-    private String jiraLabelUrl;
+    /**
+     * Stores one of the next 2 options:
+     * <ul>
+     * <li>A comma-separated list of labels</li>
+     * <li>A URL that will return a comma-separated list of labels</li>
+     * </ul>
+     */
+    private String jiraLabels;
 
     private String jiraUserId;
 
@@ -67,12 +74,12 @@ public class JiraConfiguration extends BaseEntity {
         this.jiraUrl = jiraUrl;
     }
 
-    public String getJiraLabelUrl() {
-        return jiraLabelUrl;
+    public String getJiraLabels() {
+        return jiraLabels;
     }
 
-    public void setJiraLabelUrl(String jiraLabelUrl) {
-        this.jiraLabelUrl = jiraLabelUrl;
+    public void setJiraLabels(String jiraLabels) {
+        this.jiraLabels = jiraLabels;
     }
 
     public String getJiraUserId() {
diff --git a/libreplan-business/src/main/resources/db.changelog-1.3.xml b/libreplan-business/src/main/resources/db.changelog-1.3.xml
index 29ccfdc4c..22d72d934 100644
--- a/libreplan-business/src/main/resources/db.changelog-1.3.xml
+++ b/libreplan-business/src/main/resources/db.changelog-1.3.xml
@@ -286,4 +286,15 @@
             referencedColumnNames="id" />
     </changeSet>
 
+    <changeSet id="rename-column-jira_label_url-in-configuration"
+        author="mrego">
+        <comment>
+            Rename column jira_label_url to jira_labels in configuration table
+        </comment>
+        <renameColumn tableName="configuration"
+            oldColumnName="jira_label_url"
+            newColumnName="jira_labels"
+            columnDataType="VARCHAR(255)" />
+    </changeSet>
+
 </databaseChangeLog>
diff --git a/libreplan-business/src/main/resources/org/libreplan/business/common/entities/Configuration.hbm.xml b/libreplan-business/src/main/resources/org/libreplan/business/common/entities/Configuration.hbm.xml
index b5887862e..e61bf5796 100644
--- a/libreplan-business/src/main/resources/org/libreplan/business/common/entities/Configuration.hbm.xml
+++ b/libreplan-business/src/main/resources/org/libreplan/business/common/entities/Configuration.hbm.xml
@@ -125,7 +125,7 @@
         <component name="jiraConfiguration" class="org.libreplan.business.common.entities.JiraConfiguration">
             <property name="jiraActivated" column="jira_activated" not-null="true"/>
             <property name="jiraUrl" column="jira_url"/>
-            <property name="jiraLabelUrl" column="jira_label_url"/>
+            <property name="jiraLabels" column="jira_labels"/>
             <property name="jiraUserId" column="jira_user_id"/>
             <property name="jiraPassword" column="jira_password"/>
             <many-to-one name="jiraConnectorTypeOfWorkHours" cascade="none"
diff --git a/libreplan-webapp/src/main/java/org/libreplan/importers/JiraOrderElementSynchronizer.java b/libreplan-webapp/src/main/java/org/libreplan/importers/JiraOrderElementSynchronizer.java
index d6deb5a15..ed2b2c653 100755
--- a/libreplan-webapp/src/main/java/org/libreplan/importers/JiraOrderElementSynchronizer.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/importers/JiraOrderElementSynchronizer.java
@@ -68,15 +68,15 @@ public class JiraOrderElementSynchronizer implements IJiraOrderElementSynchroniz
     @Override
     @Transactional(readOnly = true)
     public List<String> getAllJiraLabels() {
-        String jiraLabelUrl = configurationDAO.getConfiguration()
-                .getJiraConfiguration().getJiraLabelUrl();
+        String jiraLabels = configurationDAO.getConfiguration()
+                .getJiraConfiguration().getJiraLabels();
 
         String labels;
         try {
-            new URL(jiraLabelUrl);
-            labels = JiraRESTClient.getAllLables(jiraLabelUrl);
+            new URL(jiraLabels);
+            labels = JiraRESTClient.getAllLables(jiraLabels);
         } catch (MalformedURLException e) {
-            labels = jiraLabelUrl;
+            labels = jiraLabels;
         }
         return Arrays.asList(StringUtils.split(labels, ","));
     }
diff --git a/libreplan-webapp/src/main/webapp/common/configuration.zul b/libreplan-webapp/src/main/webapp/common/configuration.zul
index 7f567e653..a7e859daa 100644
--- a/libreplan-webapp/src/main/webapp/common/configuration.zul
+++ b/libreplan-webapp/src/main/webapp/common/configuration.zul
@@ -430,10 +430,6 @@
                                 <label value="${i18n:_('JIRA URL')}" />
                                 <textbox id="jiraURL" value="@{configurationController.jiraConfiguration.jiraUrl}"  width="300px"/>
                             </row>
-                            <row>
-                                <label value="${i18n:_('JIRA label URL')}" />
-                                <textbox id="jiraLabelURL" value="@{configurationController.jiraConfiguration.jiraLabelUrl}"  width="300px"/>
-                            </row>
                             <row>
                                 <label value="${i18n:_('JIRA sync account')}" />
                                 <textbox id="jiraSyncAccount" value="@{configurationController.jiraConfiguration.jiraUserId}"  width="300px"/>
@@ -442,6 +438,10 @@
                                 <label value="${i18n:_('JIRA sync password')}" />
                                 <textbox id="jiraSyncPassword" value="@{configurationController.jiraConfiguration.jiraPassword}"  type="password" width="300px"/>
                             </row>
+                            <row>
+                                <label value="${i18n:_('JIRA labels: comma-separated list of labels or URL')}" />
+                                <textbox id="jiraLabels" value="@{configurationController.jiraConfiguration.jiraLabels}"  width="300px"/>
+                            </row>
                             <row>
                                 <label value="${i18n:_('Hours type for JIRA connector')}" />
                                 <bandboxSearch