RenJuan/TASKPM
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

jira-integration: Disable hours edition in JIRA issues

Browse source 
For tasks that are JIRA issues the hours fields will be readonly.

FEA: ItEr77S16JiraAndTimConnectorContributionIntegration
This commit is contained in:
Manuel Rego Casasnovas 2013-01-30 14:01:39 +01:00
parent 2a359993ce
commit 72ada7c634
6 changed files with 21 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderLineGroup.java
View file

@ -163,6 +163,11 @@ public class OrderLineGroup extends OrderElement implements
return getThis().isUpdatedFromTimesheets();
}
@Override
public boolean isJiraIssue() {
return getThis().isJiraIssue();
}
}
public static OrderLineGroup create() {

5
libreplan-business/src/main/java/org/libreplan/business/templates/entities/OrderElementTemplate.java
View file

@ -625,4 +625,9 @@ public abstract class OrderElementTemplate extends BaseEntity implements
return false;
}
@Override
public boolean isJiraIssue() {
return false;
}
}

5
libreplan-business/src/main/java/org/libreplan/business/templates/entities/OrderLineGroupTemplate.java
View file

@ -105,6 +105,11 @@ public class OrderLineGroupTemplate extends OrderElementTemplate implements
return false;
}
@Override
public boolean isJiraIssue() {
return false;
}
}
public static OrderLineGroupTemplate createNew() {

2
libreplan-business/src/main/java/org/libreplan/business/trees/ITreeNode.java
View file

@ -62,4 +62,6 @@ public interface ITreeNode<T extends ITreeNode<T>> {
boolean isUpdatedFromTimesheets();
boolean isJiraIssue();
}

4
libreplan-webapp/src/main/java/org/libreplan/web/orders/criterionrequirements/AssignedCriterionRequirementToOrderElementController.java
View file

@ -207,7 +207,9 @@ public class AssignedCriterionRequirementToOrderElementController extends
}
public boolean isEditableHoursGroup() {
return getElement() != null && getElement() instanceof OrderLine;
OrderElement element = getElement();
return element != null && element instanceof OrderLine
&& !element.isJiraIssue();
}
}

3
libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java
View file

@ -1006,8 +1006,7 @@ public abstract class TreeController<T extends ITreeNode<T>> extends
public void addHoursCell(final T currentElement) {
Intbox intboxHours = buildHoursIntboxFor(currentElement);
hoursIntBoxByElement.put(currentElement, intboxHours);
// TODO: Disable for JIRA issues
if (readOnly) {
if (readOnly || currentElement.isJiraIssue()) {
intboxHours.setDisabled(true);
}
Treecell cellHours = addCell(intboxHours);