jro_apps/redmine Commit - r13476:0ed895388b89

Option to search open issues only (#10734)....

Jean-Philippe Lang -

r13476:0ed895388b89

parent child

Context file:

r13476:0ed895388b89

Collapse all files

app/controllers/search_controller.rb +2 -1

                 @all_words = params[:all_words] ? params[:all_words].present? : true
                 @titles_only = params[:titles_only] ? params[:titles_only].present? : false
                 @search_attachments = params[:attachments].presence || '0'
+                @open_issues = params[:open_issues] ? params[:open_issues].present? : false
                 # quick jump to an issue
                 if (m = @question.match(/^#?(\d+)$/)) && (issue = Issue.visible.find_by_id(m[1].to_i))
                 fetcher = Redmine::Search::Fetcher.new(
                   @question, User.current, @scope, projects_to_search,
-                  :all_words => @all_words, :titles_only => @titles_only, :attachments => @search_attachments,
+                  :all_words => @all_words, :titles_only => @titles_only, :attachments => @search_attachments, :open_issues => @open_issues,
                   :cache => params[:page].present?
                 )

app/models/issue.rb +2 -1

               acts_as_customizable
               acts_as_watchable
               acts_as_searchable :columns => ['subject', "#{table_name}.description"],
-                                 :preload => [:project, :status, :tracker]
+                                 :preload => [:project, :status, :tracker],
+                                 :scope => lambda {|options| options[:open_issues] ? self.open : self.all}
               acts_as_event :title => Proc.new {|o| "#{o.tracker.name} ##{o.id} (#{o.status}): #{o.subject}"},
                             :url => Proc.new {|o| {:controller => 'issues', :action => 'show', :id => o.id}},

app/views/search/index.html.erb +1 0

             <fieldset class="collapsible collapsed">
               <legend onclick="toggleFieldset(this);"><%= l(:label_options) %></legend>
               <div id="options-content" style="display:none;">
+                <p><label><%= check_box_tag 'open_issues', 1, @open_issues %> <%= l(:label_search_open_issues_only) %></label></p>
                 <p>
                   <label><%= radio_button_tag 'attachments', '0', @search_attachments == '0' %> <%= l(:label_search_attachments_no) %></label>
                   <label><%= radio_button_tag 'attachments', '1', @search_attachments == '1' %> <%= l(:label_search_attachments_yes) %></label>

config/locales/en.yml +1 0

               label_search_attachments_yes: Search attachment filenames and descriptions
               label_search_attachments_no: Do not search attachments
               label_search_attachments_only: Search attachments only
+              label_search_open_issues_only: Open issues only
               button_login: Login
               button_submit: Submit

config/locales/fr.yml +1 0

               label_search_attachments_yes: Rechercher les noms et descriptions de fichiers
               label_search_attachments_no: Ne pas rechercher les fichiers
               label_search_attachments_only: Rechercher les fichiers uniquement
+              label_search_open_issues_only: Demandes ouvertes uniquement
               button_login: Connexion
               button_submit: Soumettre

lib/plugins/acts_as_searchable/lib/acts_as_searchable.rb +6 -6

                         unless options[:attachments] == 'only'
                           r = fetch_ranks_and_ids(
-                            search_scope(user, projects).
+                            search_scope(user, projects, options).
                             where(search_tokens_condition(columns, tokens, options[:all_words])),
                             options[:limit]
                           )
                               visibility = clauses.join(' OR ')
                               r |= fetch_ranks_and_ids(
-                                search_scope(user, projects).
+                                search_scope(user, projects, options).
                                 joins(:custom_values).
                                 where(visibility).
                                 where(search_tokens_condition(["#{CustomValue.table_name}.value"], tokens, options[:all_words])),
                           if !options[:titles_only] && searchable_options[:search_journals]
                             r |= fetch_ranks_and_ids(
-                              search_scope(user, projects).
+                              search_scope(user, projects, options).
                               joins(:journals).
                               where("#{Journal.table_name}.private_notes = ? OR (#{Project.allowed_to_condition(user, :view_private_notes)})", false).
                               where(search_tokens_condition(["#{Journal.table_name}.notes"], tokens, options[:all_words])),
                         if searchable_options[:search_attachments] && (options[:titles_only] ? options[:attachments] == 'only' : options[:attachments] != '0')
                           r |= fetch_ranks_and_ids(
-                            search_scope(user, projects).
+                            search_scope(user, projects, options).
                             joins(:attachments).
                             where(search_tokens_condition(["#{Attachment.table_name}.filename", "#{Attachment.table_name}.description"], tokens, options[:all_words])),
                             options[:limit]
                       private :fetch_ranks_and_ids
                       # Returns the search scope for user and projects
-                      def search_scope(user, projects)
+                      def search_scope(user, projects, options={})
                         if projects.is_a?(Array) && projects.empty?
                           # no results
                           return none
                         scope = (searchable_options[:scope] || self)
                         if scope.is_a? Proc
-                          scope = scope.call
+                          scope = scope.call(options)
                         end
                         if respond_to?(:visible) && !searchable_options.has_key?(:permission)

test/functional/search_controller_test.rb +9 0

@@ -209,6 +209,15 class SearchControllerTest < ActionController::TestCase
209	assert_equal 2, results.size	209	assert_equal 2, results.size
210	end	210	end
211		211
		212	def test_search_open_issues
		213	Issue.generate! :subject => 'search_open'
		214	Issue.generate! :subject => 'search_open', :status_id => 5
		215
		216	get :index, :id => 1, :q => 'search_open', :open_issues => '1'
		217	results = assigns(:results)
		218	assert_equal 1, results.size
		219	end
		220
212	def test_search_all_words	221	def test_search_all_words
213	# 'all words' is on by default	222	# 'all words' is on by default
214	get :index, :id => 1, :q => 'recipe updating saving', :all_words => '1'	223	get :index, :id => 1, :q => 'recipe updating saving', :all_words => '1'

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	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