Permalink
Browse files

Merge pull request #40 from infiro/standalon

WorkItem: 4516 Fixed a bug when move story from Product lv to iteration ...
  • Loading branch information...
2 parents e24bf87 + 2c123cf commit 56ef5f33ab16594ecf0be67cf05b4ad87947105b @bradens bradens committed Mar 18, 2012
@@ -38,6 +38,10 @@ static void addBacklogIntervalLimit(Criteria crit, Interval interval) {
Criterion overlaps = Restrictions.or(startDateLimit, endDateLimit);
Criterion withinIteration = Restrictions.and(Restrictions.le(
"startDate", startDate), Restrictions.ge("endDate", endDate));
- crit.add(Restrictions.or(overlaps, withinIteration));
+
+ // If backlog is product then ignore the start and end date (because product doesnt have enddate startdate)
+ Criterion timeConstraint = Restrictions.or(overlaps, withinIteration);
+ Criterion backlogProduct = Restrictions.isNull("startDate");
+ crit.add(Restrictions.or(timeConstraint, backlogProduct));
}
}
@@ -32,8 +32,8 @@
<ul class="backlogHierarchy">
<c:choose>
- <c:when test="${story.backlog == null}">
- <li style="list-style-image: url('static/img/hierarchy_arrow.png');">
+ <c:when test="${aef:isStandaloneIteration(story.iteration)}">
+ <li style="list-style-image: url('static/img/hierarchy_arrow.png');">
<a href="editBacklog.action?backlogId=${backlog.id}">
<c:out value="${backlog.name}" />
</a>

0 comments on commit 56ef5f3

Please sign in to comment.