diff options
| -rw-r--r-- | rrs/models.py | 7 | ||||
| -rw-r--r-- | rrs/views.py | 7 | ||||
| -rw-r--r-- | templates/rrs/maintainers.html | 11 |
3 files changed, 13 insertions, 12 deletions
diff --git a/rrs/models.py b/rrs/models.py index d24bf92f96..cb1b67bd1d 100644 --- a/rrs/models.py +++ b/rrs/models.py @@ -93,10 +93,9 @@ class Milestone(models.Model): if current_date >= self.end_date: break; - week = "Wk" + str(week_no) - weeks[week] = {} - weeks[week]['start_date'] = current_date - weeks[week]['end_date'] = current_date + week_delta + weeks[week_no] = {} + weeks[week_no]['start_date'] = current_date + weeks[week_no]['end_date'] = current_date + week_delta current_date += week_delta week_no += 1 diff --git a/rrs/views.py b/rrs/views.py index 435265608c..820810262a 100644 --- a/rrs/views.py +++ b/rrs/views.py @@ -415,8 +415,10 @@ class MaintainerListView(ListView): if "All" in milestone.name: intervals = milestone.get_milestone_intervals(release) + interval_type = 'Milestone' else: intervals = milestone.get_week_intervals() + interval_type = 'Week' self.milestone_statistics = _get_milestone_statistics(milestone) @@ -460,6 +462,10 @@ class MaintainerListView(ListView): commit_date__lte = end_date).count() ml.interval_statistics.append('' if number == 0 else number) + # To add Wk prefix after get statics to avoid sorting problems + if interval_type == 'Week': + self.intervals = ['Wk' + str(i) for i in self.intervals] + return maintainer_list def get_context_data(self, **kwargs): @@ -481,6 +487,7 @@ class MaintainerListView(ListView): context['maintainer_count'] = self.maintainer_count context['intervals'] = self.intervals + context['interval_range'] = range(len(self.intervals)) context['current_interval'] = self.current_interval return context diff --git a/templates/rrs/maintainers.html b/templates/rrs/maintainers.html index 444aaab2f2..1386e65f70 100644 --- a/templates/rrs/maintainers.html +++ b/templates/rrs/maintainers.html @@ -183,14 +183,9 @@ $(document).ready(function() { 4: { sorter: false }, 5: { sorter: false }, 6: { sorter: false }, - 7: { sorter: false }, - 8: { sorter: false }, - 9: { sorter: false }, - 10: { sorter: false }, - 11: { sorter: false }, - 12: { sorter: false }, - 13: { sorter: false }, - 14: { sorter: false }, +{% for i in interval_range %} + {{ i|add:"7" }}: { sorter: false }, +{% endfor %} } }); {% endif %} |