added a simple search engine. left to do:

- full content search (only subject/titles for now)
- pagination
- results presentation improvement

git-svn-id: http://redmine.rubyforge.org/svn/trunk@279 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index ce2e39fac5b8dfafb3f77f80cffade850729e747..ab1cb3e1b4e6d14aedc0f4073cedbe6d6920fdd4 100644 (file)
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -539,6 +539,18 @@ class ProjectsController < ApplicationController
     end\r
   end\r
   \r
+  def search\r
+    @token = params[:token]\r
+    @scope = params[:scope] || (params[:submit] ? [] : %w(issues news documents) )\r
+\r
+    if @token and @token.length > 2\r
+      @results = []\r
+      @results += @project.issues.find(:all, :include => :author, :conditions => ["issues.subject like ?", "%#{@token}%"] ) if @scope.include? 'issues'\r
+      @results += @project.news.find(:all, :conditions => ["news.title like ?", "%#{@token}%"], :include => :author ) if @scope.include? 'news'\r
+      @results += @project.documents.find(:all, :conditions => ["title like ?", "%#{@token}%"] ) if @scope.include? 'documents'\r
+    end\r
+  end\r
+  \r
 private\r
   # Find project of id params[:id]\r
   # if not found, redirect to project list\r

diff --git a/app/views/layouts/base.rhtml b/app/views/layouts/base.rhtml
index b359898f0b7483e6808e5b3ac2b8daafe7729b85..53c346dc8fe301c809b009ba558eddd3712402d0 100644 (file)
--- a/app/views/layouts/base.rhtml
+++ b/app/views/layouts/base.rhtml
@@ -93,6 +93,7 @@
         <%= link_to l(:label_document_plural), {:controller => 'projects', :action => 'list_documents', :id => @project }, :class => "menuItem" %>\r
         <%= link_to l(:label_member_plural), {:controller => 'projects', :action => 'list_members', :id => @project }, :class => "menuItem" %>\r
         <%= link_to l(:label_attachment_plural), {:controller => 'projects', :action => 'list_files', :id => @project }, :class => "menuItem" %>\r
+        <%= link_to l(:label_search), {:controller => 'projects', :action => 'search', :id => @project }, :class => "menuItem" %>\r
         <%= link_to l(:label_repository), {:controller => 'repositories', :action => 'show', :id => @project}, :class => "menuItem" if @project.repository and !@project.repository.new_record? %>\r
         <%= link_to_if_authorized l(:label_settings), {:controller => 'projects', :action => 'settings', :id => @project }, :class => "menuItem" %>\r
     </div>\r
@@ -116,6 +117,7 @@
                                <li><%= link_to l(:label_document_plural), :controller => 'projects', :action => 'list_documents', :id => @project %></li>\r
                                <li><%= link_to l(:label_member_plural), :controller => 'projects', :action => 'list_members', :id => @project %></li>\r
                                <li><%= link_to l(:label_attachment_plural), :controller => 'projects', :action => 'list_files', :id => @project %></li>\r
+                               <li><%= link_to l(:label_search), :controller => 'projects', :action => 'search', :id => @project %></li>\r
                                <li><%= link_to l(:label_repository), :controller => 'repositories', :action => 'show', :id => @project if @project.repository and !@project.repository.new_record? %></li>\r
                                <li><%= link_to_if_authorized l(:label_settings), :controller => 'projects', :action => 'settings', :id => @project %></li>\r
                        </ul>\r

diff --git a/app/views/projects/search.rhtml b/app/views/projects/search.rhtml
new file mode 100644 (file)
index 0000000..32e486f
--- /dev/null
+++ b/app/views/projects/search.rhtml
@@ -0,0 +1,32 @@
+<h2><%= l(:label_search) %></h2>\r
+\r
+<div class="box">\r
+<% form_tag({:action => 'search', :id => @project}, :method => :get) do %>\r
+<p><%= text_field_tag 'token', @token, :size => 30 %>\r
+<%= check_box_tag 'scope[]', 'issues', (@scope.include? 'issues') %> <label><%= l(:label_issue_plural) %></label>\r
+<%= check_box_tag 'scope[]', 'news', (@scope.include? 'news') %> <label><%= l(:label_news_plural) %></label>\r
+<%= check_box_tag 'scope[]', 'documents', (@scope.include? 'documents') %> <label><%= l(:label_document_plural) %></label></p>\r
+<%= submit_tag l(:button_submit), :name => 'submit' %>\r
+<% end %>\r
+</div>\r
+\r
+<% if @results %>\r
+    <h3><%= lwr(:label_result, @results.length) %></h3>\r
+    <ul>\r
+      <% @results.each do |e| %>\r
+        <li><p>\r
+        <% if e.is_a? Issue %>\r
+          <%= link_to "#{e.tracker.name} ##{e.id}", :controller => 'issues', :action => 'show', :id => e %>: <%= highlight(h(e.subject), @token) %><br />\r
+              <i><%= e.author.name %>, <%= format_time(e.created_on) %></i>\r
+        <% elsif e.is_a? News %>\r
+          <%=l(:label_news)%>: <%= link_to highlight(h(e.title), @token), :controller => 'news', :action => 'show', :id => e %><br />\r
+              <% unless e.summary.empty? %><%=h e.summary %><br /><% end %>\r
+              <i><%= e.author.name %>, <%= format_time(e.created_on) %></i>\r
+        <% elsif e.is_a? Document %>\r
+          <%=l(:label_document)%>: <%= link_to highlight(h(e.title), @token), :controller => 'documents', :action => 'show', :id => e %><br />\r
+              <i><%= format_time(e.created_on) %></i>\r
+        <% end %>\r
+        </p></li>  \r
+      <% end %>\r
+    </ul>\r
+<% end %>
\ No newline at end of file

diff --git a/db/migrate/025_add_search_permission.rb b/db/migrate/025_add_search_permission.rb
new file mode 100644 (file)
index 0000000..212a4dc
--- /dev/null
+++ b/db/migrate/025_add_search_permission.rb
@@ -0,0 +1,9 @@
+class AddSearchPermission < ActiveRecord::Migration
+  def self.up
+    Permission.create :controller => "projects", :action => "search", :description => "label_search", :sort => 130, :is_public => true, :mail_option => 0, :mail_enabled => 0
+  end
+
+  def self.down
+    Permission.find_by_controller_and_action('projects', 'roadmap').destroy
+  end
+end

diff --git a/lang/de.yml b/lang/de.yml
index 2bee78a3c2361d6eec653520962a3bfb1fefc053..4339cad97359f6e66dab00864ca6da3df440f211 100644 (file)
--- a/lang/de.yml
+++ b/lang/de.yml
@@ -315,6 +315,9 @@ label_sort_higher: Aufzurichten
 label_sort_lower: Herabzusteigen\r
 label_sort_lowest: Letzter\r
 label_roadmap: Roadmap\r
+label_search: Suche\r
+label_result: %d Resultat\r
+label_result_plural: %d Resultate\r
 \r
 button_login: Einloggen\r
 button_submit: Einreichen\r

diff --git a/lang/en.yml b/lang/en.yml
index 0696bda562c39fba51e56bf54e0ae3b86af73ccf..27e3cb77f98e88ab96703132ff20469d6352db22 100644 (file)
--- a/lang/en.yml
+++ b/lang/en.yml
@@ -315,6 +315,9 @@ label_sort_higher: Move up
 label_sort_lower: Move down\r
 label_sort_lowest: Move to bottom\r
 label_roadmap: Roadmap\r
+label_search: Search\r
+label_result: %d result\r
+label_result_plural: %d results\r
 \r
 button_login: Login\r
 button_submit: Submit\r

diff --git a/lang/es.yml b/lang/es.yml
index 9e7cbe9d17d7144aa515c86dae3902e6d1984452..d09f58bbbe390f51474fe5549e333de8b4376fa6 100644 (file)
--- a/lang/es.yml
+++ b/lang/es.yml
@@ -315,6 +315,9 @@ label_sort_higher: Subir
 label_sort_lower: Bajar\r
 label_sort_lowest: Último\r
 label_roadmap: Roadmap\r
+label_search: Búsqueda\r
+label_result: %d resultado\r
+label_result_plural: %d resultados\r
 \r
 button_login: Conexión\r
 button_submit: Someter\r

diff --git a/lang/fr.yml b/lang/fr.yml
index 77cd839d9b76b90e6c8428f1c993fb7b28fbcf10..30a4fb2d90de08e514844afb6edafb3edad00696 100644 (file)
--- a/lang/fr.yml
+++ b/lang/fr.yml
@@ -315,6 +315,9 @@ label_sort_higher: Remonter
 label_sort_lower: Descendre\r
 label_sort_lowest: Descendre en dernier\r
 label_roadmap: Roadmap\r
+label_search: Recherche\r
+label_result: %d résultat\r
+label_result_plural: %d résultats\r
 \r
 button_login: Connexion\r
 button_submit: Soumettre\r

diff --git a/lang/ja.yml b/lang/ja.yml
index 93d9e766b6bde293eb84eb0480409b7ba14d5fa9..7336c5781ca498eb5da75520ac275ff8e7fad866 100644 (file)
--- a/lang/ja.yml
+++ b/lang/ja.yml
@@ -316,6 +316,9 @@ label_sort_higher: 上へ
 label_sort_lower: 下へ\r
 label_sort_lowest: 一番下へ\r
 label_roadmap: ロードマップ\r
+label_search: Search\r
+label_result: %d result\r
+label_result_plural: %d results\r
 \r
 button_login: ログイン\r
 button_submit: 変更\r

diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index 2f20c8e9999d6a39b13e892a1a5a66ede5f2092b..aaf332a1858aa59923e5af66963398d79b3c4a3c 100644 (file)
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -243,6 +243,8 @@ legend {color: #505050;}
 hr { border:none; border-bottom: dotted 1px #c0c0c0; }\r
 table p {margin:0; padding:0;}\r
 \r
+strong.highlight { background-color: #FCFD8D;}\r
+\r
 div.square {\r
  border: 1px solid #999;\r
  float: left;\r