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: + * + */ + 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" /> + + + Rename column jira_label_url to jira_labels in configuration table + + + + 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 @@ - + 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 @@