jro_apps/redmine Commit - r866:d4e47d5d6498

0

app/controllers/projects_controller.rb +13 -1

@@ -188,7 +188,19 class ProjectsController < ApplicationController
188		188
189	# Show documents list of @project	189	# Show documents list of @project
190	def list_documents	190	def list_documents
191	@documents = @project.documents.find :all, :include => :category	191	@sort_by = %w(category date title author).include?(params[:sort_by]) ? params[:sort_by] : 'category'
		192	documents = @project.documents.find :all, :include => [:attachments, :category]
		193	case @sort_by
		194	when 'date'
		195	@grouped = documents.group_by {\|d\| d.created_on.to_date }
		196	when 'title'
		197	@grouped = documents.group_by {\|d\| d.title.first.upcase}
		198	when 'author'
		199	@grouped = documents.select{\|d\| d.attachments.any?}.group_by {\|d\| d.attachments.last.author}
		200	else
		201	@grouped = documents.group_by(&:category)
		202	end
		203	render :layout => false if request.xhr?
192	end	204	end
193		205
194	# Add a new issue to @project	206	# Add a new issue to @project

0

app/helpers/sort_helper.rb +1 -1

               #
               def sort_header_tag(column, options = {})
                 caption = options.delete(:caption) || titleize(Inflector::humanize(column))
-                options[:title]= l(:label_sort_by, caption) unless options[:title]
+                options[:title]= l(:label_sort_by, "\"#{caption}\"") unless options[:title]
                 content_tag('th', sort_link(column, caption), options)
               end

0

app/models/enumeration.rb +4 0

                 Enumeration.update_all("is_default = #{connection.quoted_false}", {:opt => opt}) if is_default?
               end
+              def <=>(enumeration)
+                position <=> enumeration.position
+              end
               def to_s; name end
             private

0

app/views/projects/list_documents.rhtml +14 -7

@@ -19,12 +19,19
19		19
20	<h2><%=l(:label_document_plural)%></h2>	20	<h2><%=l(:label_document_plural)%></h2>
21		21
22	<% if @documents.empty? %>	22	<% if @grouped.empty? %><p class="nodata"><%= l(:label_no_data) %></p><% end %>
23	<p class="nodata"><%= l(:label_no_data) %></p>	23
		24	<% @grouped.keys.sort.each do \|group\| %>
		25	<h3><%= group %></h3>
		26	<%= render :partial => 'documents/document', :collection => @grouped[group] %>
24	<% end %>	27	<% end %>
25		28
26	<% documents = @documents.group_by {\|d\| d.category } %>	29	<% content_for :sidebar do %>
27	<% documents.each do \|category, docs\| %>	30	<h3><%= l(:label_sort_by, '') %></h3>
28	<h3><%= category.name %></h3>	31	<% form_tag({}, :method => :get) do %>
29	<%= render :partial => 'documents/document', :collection => docs %>	32	<label><%= radio_button_tag 'sort_by', 'category', (@sort_by == 'category'), :onclick => 'this.form.submit();' %> <%= l(:field_category) %></label><br />
30	<% end %> No newline at end of file	33	<label><%= radio_button_tag 'sort_by', 'date', (@sort_by == 'date'), :onclick => 'this.form.submit();' %> <%= l(:label_date) %></label><br />
		34	<label><%= radio_button_tag 'sort_by', 'title', (@sort_by == 'title'), :onclick => 'this.form.submit();' %> <%= l(:field_title) %></label><br />
		35	<label><%= radio_button_tag 'sort_by', 'author', (@sort_by == 'author'), :onclick => 'this.form.submit();' %> <%= l(:field_author) %></label>
		36	<% end %>
		37	<% end %>

0

lang/bg.yml +1 -1

             label_date_from: От
             label_date_to: До
             label_language_based: В зависимост от езика
-            label_sort_by: Sort by "%s"
+            label_sort_by: Sort by %s
             label_send_test_email: Изпращане на тестов e-mail
             label_feeds_access_key_created_on: %s от създаването на RSS ключа
             label_module_plural: Модули

0

lang/cs.yml +1 -1

             label_date_from: Od
             label_date_to: Do
             label_language_based: Language based
-            label_sort_by: Seřadit podle "%s"
+            label_sort_by: Seřadit podle %s
             label_send_test_email: Poslat testovací email
             label_feeds_access_key_created_on: Přístupový klíč pro RSS byl vytvořen před %s

0

lang/de.yml +1 -1

             label_date_from: Von
             label_date_to: Bis
             label_language_based: Sprachabhängig
-            label_sort_by: Sortiert nach "%s"
+            label_sort_by: Sortiert nach %s
             label_send_test_email: Test-E-Mail senden
             label_feeds_access_key_created_on: RSS-Zugriffsschlüssel vor %s erstellt
             label_module_plural: Module

0

lang/en.yml +1 -1

             label_date_from: From
             label_date_to: To
             label_language_based: Language based
-            label_sort_by: Sort by "%s"
+            label_sort_by: Sort by %s
             label_send_test_email: Send a test email
             label_feeds_access_key_created_on: RSS access key created %s ago
             label_module_plural: Modules

0

lang/es.yml +1 -1

             label_index_by_title: Index by title
             label_jump_to_a_project: Jump to a project...
             field_assignable: Issues can be assigned to this role
-            label_sort_by: Sort by "%s"
+            label_sort_by: Sort by %s
             setting_issue_list_default_columns: Default columns displayed on the issue list
             text_issue_updated: Issue %s has been updated.
             notice_feeds_access_key_reseted: Your RSS access key was reseted.

0

lang/fr.yml +1 -1

             label_date_from: Du
             label_date_to: Au
             label_language_based: Basé sur la langue
-            label_sort_by: Trier par "%s"
+            label_sort_by: Trier par %s
             label_send_test_email: Envoyer un email de test
             label_feeds_access_key_created_on: Clé d'accès RSS créée il y a %s
             label_module_plural: Modules

0

lang/he.yml +1 -1

             label_date_from: מאת
             label_date_to: אל
             label_language_based: מבוסס שפה
-            label_sort_by: מין לפי "%s"
+            label_sort_by: מין לפי %s
             label_send_test_email: שלח דו"ל בדיקה
             label_feeds_access_key_created_on: מפתח הזנת RSS נוצר לפני%s
             label_module_plural: מודולים

0

lang/it.yml +1 -1

             label_date_from: From
             label_date_to: To
             label_language_based: Language based
-            label_sort_by: Sort by "%s"
+            label_sort_by: Sort by %s
             label_send_test_email: Send a test email
             label_feeds_access_key_created_on: RSS access key created %s ago
             label_module_plural: Modules

0

lang/ja.yml +1 -1

             label_date_from: From
             label_date_to: To
             label_language_based: 既定の言語の設定に従う
-            label_sort_by: Sort by "%s"
+            label_sort_by: Sort by %s
             label_send_test_email: テストメールを送信
             label_feeds_access_key_created_on: RSS access key created %s ago
             label_module_plural: Modules

0

lang/ko.yml +1 -1

             label_date_from: From
             label_date_to: To
             label_language_based: Language based
-            label_sort_by: Sort by "%s"
+            label_sort_by: Sort by %s
             label_send_test_email: Send a test email
             label_feeds_access_key_created_on: RSS access key created %s ago
             label_module_plural: Modules

0

lang/nl.yml +1 -1

             label_date_from: From
             label_date_to: To
             label_language_based: Language based
-            label_sort_by: Sort by "%s"
+            label_sort_by: Sort by %s
             label_send_test_email: Send a test email
             label_feeds_access_key_created_on: RSS access key created %s ago
             label_module_plural: Modules

0

lang/pl.yml +1 -1

             label_this_week: ten tydzień
             label_jump_to_a_project: Skocz do projektu...
             field_assignable: Zgłoszenia mogą być przypisane do tej roli
-            label_sort_by: Sortuj po "%s"
+            label_sort_by: Sortuj po %s
             text_issue_updated: Zgłoszenie %s zostało zaktualizowane.
             notice_feeds_access_key_reseted: Twój klucz dostępu RSS został zrestetowany.
             field_redirect_existing_links: Przekierowanie istniejących odnośników

0

lang/pt-br.yml +1 -1

             label_date_from: From
             label_date_to: To
             label_language_based: Language based
-            label_sort_by: Sort by "%s"
+            label_sort_by: Sort by %s
             label_send_test_email: Send a test email
             label_feeds_access_key_created_on: RSS access key created %s ago
             label_module_plural: Modules

0

lang/pt.yml +1 -1

             label_date_from: From
             label_date_to: To
             label_language_based: Language based
-            label_sort_by: Sort by "%s"
+            label_sort_by: Sort by %s
             label_send_test_email: Send a test email
             label_feeds_access_key_created_on: RSS access key created %s ago
             label_module_plural: Modules

0

lang/ro.yml +1 -1

             label_date_from: De la
             label_date_to: Pentru
             label_language_based: Bazat pe limbaj
-            label_sort_by: Sortare dupa "%s"
+            label_sort_by: Sortare dupa %s
             label_send_test_email: trimite un e-mail de test
             label_feeds_access_key_created_on: Parola de acces RSS creat cu %s mai devreme
             label_module_plural: Module

0

lang/sr.yml +1 -1

             label_date_from: Od
             label_date_to: Do
             label_language_based: Bazirano na jeziku
-            label_sort_by: Sortiraj po "%s"
+            label_sort_by: Sortiraj po %s
             label_send_test_email: Pošalji probni email
             label_feeds_access_key_created_on: RSS ključ za pristup je kreiran pre %s
             label_module_plural: Modulovi

0

lang/sv.yml +1 -1

             label_date_from: From
             label_date_to: To
             label_language_based: Language based
-            label_sort_by: Sort by "%s"
+            label_sort_by: Sort by %s
             label_send_test_email: Send a test email
             label_feeds_access_key_created_on: RSS access key created %s ago
             label_module_plural: Modules

0

lang/zh.yml +1 -1

             label_date_from: From
             label_date_to: To
             label_language_based: Language based
-            label_sort_by: Sort by "%s"
+            label_sort_by: Sort by %s
             label_send_test_email: Send a test email
             label_feeds_access_key_created_on: RSS access key created %s ago
             label_module_plural: Modules

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	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