jro_apps/redmine Commit - r601:3c8e7c79b639

0

app/controllers/projects_controller.rb +2 -2

               def roadmap
                 @trackers = Tracker.find(:all, :conditions => ["is_in_roadmap=?", true], :order => 'position')
                 retrieve_selected_tracker_ids(@trackers)
-                conditions = ("1" == params[:completed] ? nil : [ "#{Version.table_name}.effective_date > ? OR #{Version.table_name}.effective_date IS NULL", Date.today])
+                @versions = @project.versions.sort
-                @versions = @project.versions.find(:all, :conditions => conditions).sort
+                @versions = @versions.select {|v| !v.completed? } unless params[:completed]
               end
               def activity

0

app/models/version.rb +15 -1

@@ -34,8 +34,22 class Version < ActiveRecord::Base
34	effective_date	34	effective_date
35	end	35	end
36		36
		37	# Returns true if the version is completed: due date reached and no open issues
37	def completed?	38	def completed?
38	effective_date && effective_date <= Date.today	39	effective_date && (effective_date <= Date.today) && (open_issues_count == 0)
		40	end
		41
		42	# Returns true if the version is overdue: due date reached and some open issues
		43	def overdue?
		44	effective_date && (effective_date < Date.today) && (open_issues_count > 0)
		45	end
		46
		47	def open_issues_count
		48	@open_issues_count \|\|= Issue.count(:all, :conditions => ["fixed_version_id = ? AND is_closed = ?", self.id, false], :include => :status)
		49	end
		50
		51	def closed_issues_count
		52	@closed_issues_count \|\|= Issue.count(:all, :conditions => ["fixed_version_id = ? AND is_closed = ?", self.id, true], :include => :status)
39	end	53	end
40		54
41	def wiki_page	55	def wiki_page

0

app/views/projects/roadmap.rhtml +2 0

                 <a name="<%= version.name %>"><h3 class="icon22 icon22-package"><%= version.name %></h3></a>
                 <% if version.completed? %>
                   <p><%= format_date(version.effective_date) %></p>
+                <% elsif version.overdue? %>
+                  <p><strong><%= l(:label_roadmap_overdue, distance_of_time_in_words(Time.now, version.effective_date)) %> (<%= format_date(version.effective_date) %>)</strong></p>
                 <% elsif version.effective_date %>
                   <p><strong><%=l(:label_roadmap_due_in)%> <%= distance_of_time_in_words Time.now, version.effective_date %> (<%= format_date(version.effective_date) %>)</strong></p>
                 <% end %>

0

lang/bg.yml +1 0

             label_sort_lowest: Премести най-долу
             label_roadmap: Пътна карта
             label_roadmap_due_in: Излиза след
+            label_roadmap_overdue: %s late
             label_roadmap_no_issues: Няма задачи за тази версия
             label_search: Търсене
             label_result: %d резултат

0

lang/de.yml +1 0

             label_sort_lowest: Ende
             label_roadmap: Roadmap
             label_roadmap_due_in: Fällig in
+            label_roadmap_overdue: %s late
             label_roadmap_no_issues: Keine Tickets für diese Version
             label_search: Suche
             label_result: %d Resultat

0

lang/en.yml +1 0

             label_sort_lowest: Move to bottom
             label_roadmap: Roadmap
             label_roadmap_due_in: Due in
+            label_roadmap_overdue: %s late
             label_roadmap_no_issues: No issues for this version
             label_search: Search
             label_result: %d result

0

lang/es.yml +1 0

             label_sort_lowest: Último
             label_roadmap: Roadmap
             label_roadmap_due_in: Due in
+            label_roadmap_overdue: %s late
             label_roadmap_no_issues: No issues for this version
             label_search: Búsqueda
             label_result: %d resultado

0

lang/fr.yml +1 0

             label_sort_lowest: Descendre en dernier
             label_roadmap: Roadmap
             label_roadmap_due_in: Echéance dans
+            label_roadmap_overdue: En retard de %s
             label_roadmap_no_issues: Aucune demande pour cette version
             label_search: Recherche
             label_result: %d résultat

0

lang/it.yml +1 0

             label_sort_lowest: Sposta in fondo
             label_roadmap: Roadmap
             label_roadmap_due_in: Da ultimare in
+            label_roadmap_overdue: %s late
             label_roadmap_no_issues: Nessun contesto per questa versione
             label_search: Ricerca
             label_result: %d risultato

0

lang/ja.yml +1 0

             label_sort_lowest: 一番下へ
             label_roadmap: ロードマップ
             label_roadmap_due_in: 期日まで
+            label_roadmap_overdue: %s late
             label_roadmap_no_issues: このバージョンに向けての問題はありません
             label_search: 検索
             label_result: %d件の結果

0

lang/nl.yml +1 0

             label_sort_lowest: Verplaats naar eind
             label_roadmap: Roadmap
             label_roadmap_due_in: Due in
+            label_roadmap_overdue: %s late
             label_roadmap_no_issues: Geen issues voor deze versie
             label_search: Zoeken
             label_result: %d resultaat

0

lang/pt-br.yml +1 0

             label_sort_lowest: Mover para o fim
             label_roadmap: Roadmap
             label_roadmap_due_in: Due in
+            label_roadmap_overdue: %s late
             label_roadmap_no_issues: Sem tarefas para essa versao
             label_search: Busca
             label_result: %d resultado

0

lang/pt.yml +1 0

             label_sort_lowest: Mover para o fim
             label_roadmap: Roadmap
             label_roadmap_due_in: Termina em
+            label_roadmap_overdue: %s late
             label_roadmap_no_issues: Sem tarefas para essa versão
             label_search: Busca
             label_result: %d resultado

0

lang/sv.yml +1 0

             label_sort_lowest: Flytta till botten
             label_roadmap: Roadmap
             label_roadmap_due_in: Färdig om
+            label_roadmap_overdue: %s late
             label_roadmap_no_issues: Inga brister för denna version
             label_search: Sök
             label_result: %d resultat

0

lang/zh.yml +1 0

             label_sort_lowest: 置底
             label_roadmap: 路线图
             label_roadmap_due_in: Due in
+            label_roadmap_overdue: %s late
             label_roadmap_no_issues: 该版本没有任务
             label_search: 查找
             label_result: %d 个结果

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages