jro_apps/redmine Commit - r276:75324e48592f

app/views/projects/search.rhtml created 644 +32 0

@@ -0,0 +1,32
	1	<h2><%= l(:label_search) %></h2>
	2
	3	<div class="box">
	4	<% form_tag({:action => 'search', :id => @project}, :method => :get) do %>
	5	<p><%= text_field_tag 'token', @token, :size => 30 %>
	6	<%= check_box_tag 'scope[]', 'issues', (@scope.include? 'issues') %> <label><%= l(:label_issue_plural) %></label>
	7	<%= check_box_tag 'scope[]', 'news', (@scope.include? 'news') %> <label><%= l(:label_news_plural) %></label>
	8	<%= check_box_tag 'scope[]', 'documents', (@scope.include? 'documents') %> <label><%= l(:label_document_plural) %></label></p>
	9	<%= submit_tag l(:button_submit), :name => 'submit' %>
	10	<% end %>
	11	</div>
	12
	13	<% if @results %>
	14	<h3><%= lwr(:label_result, @results.length) %></h3>
	15	<ul>
	16	<% @results.each do \|e\| %>
	17	<li><p>
	18	<% if e.is_a? Issue %>
	19	<%= link_to "#{e.tracker.name} ##{e.id}", :controller => 'issues', :action => 'show', :id => e %>: <%= highlight(h(e.subject), @token) %><br />
	20	<i><%= e.author.name %>, <%= format_time(e.created_on) %></i>
	21	<% elsif e.is_a? News %>
	22	<%=l(:label_news)%>: <%= link_to highlight(h(e.title), @token), :controller => 'news', :action => 'show', :id => e %><br />
	23	<% unless e.summary.empty? %><%=h e.summary %><br /><% end %>
	24	<i><%= e.author.name %>, <%= format_time(e.created_on) %></i>
	25	<% elsif e.is_a? Document %>
	26	<%=l(:label_document)%>: <%= link_to highlight(h(e.title), @token), :controller => 'documents', :action => 'show', :id => e %><br />
	27	<i><%= format_time(e.created_on) %></i>
	28	<% end %>
	29	</p></li>
	30	<% end %>
	31	</ul>
	32	<% end %> No newline at end of file

db/migrate/025_add_search_permission.rb created 644 +9 0

@@ -0,0 +1,9
	1	class AddSearchPermission < ActiveRecord::Migration
	2	def self.up
	3	Permission.create :controller => "projects", :action => "search", :description => "label_search", :sort => 130, :is_public => true, :mail_option => 0, :mail_enabled => 0
	4	end
	5
	6	def self.down
	7	Permission.find_by_controller_and_action('projects', 'roadmap').destroy
	8	end
	9	end

app/controllers/projects_controller.rb +12 0

@@ -539,6 +539,18 class ProjectsController < ApplicationController
539	end	539	end
540	end	540	end
541		541
		542	def search
		543	@token = params[:token]
		544	@scope = params[:scope] \|\| (params[:submit] ? [] : %w(issues news documents) )
		545
		546	if @token and @token.length > 2
		547	@results = []
		548	@results += @project.issues.find(:all, :include => :author, :conditions => ["issues.subject like ?", "%#{@token}%"] ) if @scope.include? 'issues'
		549	@results += @project.news.find(:all, :conditions => ["news.title like ?", "%#{@token}%"], :include => :author ) if @scope.include? 'news'
		550	@results += @project.documents.find(:all, :conditions => ["title like ?", "%#{@token}%"] ) if @scope.include? 'documents'
		551	end
		552	end
		553
542	private	554	private
543	# Find project of id params[:id]	555	# Find project of id params[:id]
544	# if not found, redirect to project list	556	# if not found, redirect to project list

app/views/layouts/base.rhtml +2 0

                     <%= link_to l(:label_document_plural), {:controller => 'projects', :action => 'list_documents', :id => @project }, :class => "menuItem" %>
                     <%= link_to l(:label_member_plural), {:controller => 'projects', :action => 'list_members', :id => @project }, :class => "menuItem" %>
                     <%= link_to l(:label_attachment_plural), {:controller => 'projects', :action => 'list_files', :id => @project }, :class => "menuItem" %>
+                    <%= link_to l(:label_search), {:controller => 'projects', :action => 'search', :id => @project }, :class => "menuItem" %>
                     <%= link_to l(:label_repository), {:controller => 'repositories', :action => 'show', :id => @project}, :class => "menuItem" if @project.repository and !@project.repository.new_record? %>
                     <%= link_to_if_authorized l(:label_settings), {:controller => 'projects', :action => 'settings', :id => @project }, :class => "menuItem" %>
                 </div>
             				<li><%= link_to l(:label_document_plural), :controller => 'projects', :action => 'list_documents', :id => @project %></li>
             				<li><%= link_to l(:label_member_plural), :controller => 'projects', :action => 'list_members', :id => @project %></li>
             				<li><%= link_to l(:label_attachment_plural), :controller => 'projects', :action => 'list_files', :id => @project %></li>
+            				<li><%= link_to l(:label_search), :controller => 'projects', :action => 'search', :id => @project %></li>
             				<li><%= link_to l(:label_repository), :controller => 'repositories', :action => 'show', :id => @project if @project.repository and !@project.repository.new_record? %></li>
             				<li><%= link_to_if_authorized l(:label_settings), :controller => 'projects', :action => 'settings', :id => @project %></li>
             			</ul>

lang/de.yml +3 0

             label_sort_lower: Herabzusteigen
             label_sort_lowest: Letzter
             label_roadmap: Roadmap
+            label_search: Suche
+            label_result: %d Resultat
+            label_result_plural: %d Resultate
             button_login: Einloggen
             button_submit: Einreichen

lang/en.yml +3 0

             label_sort_lower: Move down
             label_sort_lowest: Move to bottom
             label_roadmap: Roadmap
+            label_search: Search
+            label_result: %d result
+            label_result_plural: %d results
             button_login: Login
             button_submit: Submit

lang/es.yml +3 0

             label_sort_lower: Bajar
             label_sort_lowest: Último
             label_roadmap: Roadmap
+            label_search: Búsqueda
+            label_result: %d resultado
+            label_result_plural: %d resultados
             button_login: Conexión
             button_submit: Someter

lang/fr.yml +3 0

             label_sort_lower: Descendre
             label_sort_lowest: Descendre en dernier
             label_roadmap: Roadmap
+            label_search: Recherche
+            label_result: %d résultat
+            label_result_plural: %d résultats
             button_login: Connexion
             button_submit: Soumettre

lang/ja.yml +3 0

             label_sort_lower: 下へ
             label_sort_lowest: 一番下へ
             label_roadmap: ロードマップ
+            label_search: Search
+            label_result: %d result
+            label_result_plural: %d results
             button_login: ログイン
             button_submit: 変更

public/stylesheets/application.css +2 0

             hr { border:none; border-bottom: dotted 1px #c0c0c0; }
             table p {margin:0; padding:0;}
+            strong.highlight { background-color: #FCFD8D;}
             div.square {
              border: 1px solid #999;
              float: left;

	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