jira-integration: Disable hours edition in JIRA issues
For tasks that are JIRA issues the hours fields will be readonly. FEA: ItEr77S16JiraAndTimConnectorContributionIntegration
This commit is contained in:
parent
2a359993ce
commit
72ada7c634
6 changed files with 21 additions and 3 deletions
|
|
@ -163,6 +163,11 @@ public class OrderLineGroup extends OrderElement implements
|
||||||
return getThis().isUpdatedFromTimesheets();
|
return getThis().isUpdatedFromTimesheets();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean isJiraIssue() {
|
||||||
|
return getThis().isJiraIssue();
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public static OrderLineGroup create() {
|
public static OrderLineGroup create() {
|
||||||
|
|
|
||||||
|
|
@ -625,4 +625,9 @@ public abstract class OrderElementTemplate extends BaseEntity implements
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean isJiraIssue() {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -105,6 +105,11 @@ public class OrderLineGroupTemplate extends OrderElementTemplate implements
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean isJiraIssue() {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public static OrderLineGroupTemplate createNew() {
|
public static OrderLineGroupTemplate createNew() {
|
||||||
|
|
|
||||||
|
|
@ -62,4 +62,6 @@ public interface ITreeNode<T extends ITreeNode<T>> {
|
||||||
|
|
||||||
boolean isUpdatedFromTimesheets();
|
boolean isUpdatedFromTimesheets();
|
||||||
|
|
||||||
|
boolean isJiraIssue();
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -207,7 +207,9 @@ public class AssignedCriterionRequirementToOrderElementController extends
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean isEditableHoursGroup() {
|
public boolean isEditableHoursGroup() {
|
||||||
return getElement() != null && getElement() instanceof OrderLine;
|
OrderElement element = getElement();
|
||||||
|
return element != null && element instanceof OrderLine
|
||||||
|
&& !element.isJiraIssue();
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1006,8 +1006,7 @@ public abstract class TreeController<T extends ITreeNode<T>> extends
|
||||||
public void addHoursCell(final T currentElement) {
|
public void addHoursCell(final T currentElement) {
|
||||||
Intbox intboxHours = buildHoursIntboxFor(currentElement);
|
Intbox intboxHours = buildHoursIntboxFor(currentElement);
|
||||||
hoursIntBoxByElement.put(currentElement, intboxHours);
|
hoursIntBoxByElement.put(currentElement, intboxHours);
|
||||||
// TODO: Disable for JIRA issues
|
if (readOnly || currentElement.isJiraIssue()) {
|
||||||
if (readOnly) {
|
|
||||||
intboxHours.setDisabled(true);
|
intboxHours.setDisabled(true);
|
||||||
}
|
}
|
||||||
Treecell cellHours = addCell(intboxHours);
|
Treecell cellHours = addCell(intboxHours);
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue