mirror of
https://github.com/meineerde/redmine.git
synced 2026-03-11 11:43:08 +00:00
Still display versions which are due today
This commit is contained in:
parent
7e359d3d7e
commit
16a3a5429e
@ -167,7 +167,12 @@ module ApplicationHelper
|
|||||||
|
|
||||||
def due_date_distance_in_words(date)
|
def due_date_distance_in_words(date)
|
||||||
if date
|
if date
|
||||||
l((date < Date.today ? :label_roadmap_overdue : :label_roadmap_due_in), distance_of_date_in_words(Date.today, date))
|
if date == Date.today
|
||||||
|
l(:label_roadmap_due_today)
|
||||||
|
else
|
||||||
|
label = (date < Date.today ? :label_roadmap_overdue : :label_roadmap_due_in)
|
||||||
|
l(label, distance_of_date_in_words(Date.today, date))
|
||||||
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|||||||
@ -71,7 +71,7 @@ class Version < ActiveRecord::Base
|
|||||||
|
|
||||||
# Returns true if the version is completed: due date reached and no open issues
|
# Returns true if the version is completed: due date reached and no open issues
|
||||||
def completed?
|
def completed?
|
||||||
effective_date && (effective_date <= Date.today) && (open_issues_count == 0)
|
effective_date && (effective_date < Date.today) && (open_issues_count == 0)
|
||||||
end
|
end
|
||||||
|
|
||||||
def behind_schedule?
|
def behind_schedule?
|
||||||
|
|||||||
@ -649,6 +649,7 @@ de:
|
|||||||
label_sort_lowest: Ans Ende
|
label_sort_lowest: Ans Ende
|
||||||
label_roadmap: Roadmap
|
label_roadmap: Roadmap
|
||||||
label_roadmap_due_in: "Fällig in {{value}}"
|
label_roadmap_due_in: "Fällig in {{value}}"
|
||||||
|
label_roadmap_due_doday: "Fällig heute"
|
||||||
label_roadmap_overdue: "{{value}} verspätet"
|
label_roadmap_overdue: "{{value}} verspätet"
|
||||||
label_roadmap_no_issues: Keine Tickets für diese Version
|
label_roadmap_no_issues: Keine Tickets für diese Version
|
||||||
label_search: Suche
|
label_search: Suche
|
||||||
|
|||||||
@ -636,6 +636,7 @@ en:
|
|||||||
label_sort_lower: Move down
|
label_sort_lower: Move down
|
||||||
label_sort_lowest: Move to bottom
|
label_sort_lowest: Move to bottom
|
||||||
label_roadmap: Roadmap
|
label_roadmap: Roadmap
|
||||||
|
label_roadmap_due_today: "Due today"
|
||||||
label_roadmap_due_in: "Due in {{value}}"
|
label_roadmap_due_in: "Due in {{value}}"
|
||||||
label_roadmap_overdue: "{{value}} late"
|
label_roadmap_overdue: "{{value}} late"
|
||||||
label_roadmap_no_issues: No issues for this version
|
label_roadmap_no_issues: No issues for this version
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user