jro_apps/redmine Commit - r9997:908b960e7181

Code cleanup....

Jean-Philippe Lang -

r9997:908b960e7181

parent child

Context file:

r9997:908b960e7181

Collapse all files

app/controllers/auto_completes_controller.rb +9 -11

               def issues
                 @issues = []
-                q = (params[:q] || params[:term]).to_s
+                q = (params[:q] || params[:term]).to_s.strip
-                query = (params[:scope] == "all" && Setting.cross_project_issue_relations?) ? Issue : @project.issues
+                if q.present?
-                if q.match(/^\d+$/)
+                  scope = (params[:scope] == "all" ? Issue : @project.issues).visible
-                  @issues << query.visible.find_by_id(q.to_i)
+                  if q.match(/^\d+$/)
+                    @issues << scope.find_by_id(q.to_i)
+                  end
+                  @issues += scope.where("LOWER(#{Issue.table_name}.subject) LIKE ?", "%#{q.downcase}%").order("#{Issue.table_name}.id DESC").limit(10).all
+                  @issues.compact!
                 end
-                unless q.blank?
-                  @issues += query.visible.find(:all, :conditions => ["LOWER(#{Issue.table_name}.subject) LIKE ?", "%#{q.downcase}%"], :limit => 10)
-                end
-                @issues.compact!
                 render :layout => false
               end
               private
               def find_project
-                project_id = (params[:issue] && params[:issue][:project_id]) || params[:project_id]
+                @project = Project.find(params[:project_id])
-                @project = Project.find(project_id)
               rescue ActiveRecord::RecordNotFound
                 render_404
               end
             end

app/views/issue_relations/_form.html.erb +1 -1

             <%= toggle_link l(:button_cancel), 'new-relation-form'%>
             </p>
-            <%= javascript_tag "observeAutocompleteField('relation_issue_to_id', '#{escape_javascript auto_complete_issues_path(:id => @issue, :project_id => @project, :scope => 'all')}')" %>
+            <%= javascript_tag "observeAutocompleteField('relation_issue_to_id', '#{escape_javascript auto_complete_issues_path(:project_id => @project, :scope => (Setting.cross_project_issue_relations? ? 'all' : nil))}')" %>
             <%= javascript_tag "setPredecessorFieldsVisibility();" %>

app/views/issues/_attributes.html.erb +1 -1

             <div class="splitcontentright">
             <% if @issue.safe_attribute? 'parent_issue_id' %>
             <p id="parent_issue"><%= f.text_field :parent_issue_id, :size => 10, :required => @issue.required_attribute?('parent_issue_id') %></p>
-            <%= javascript_tag "observeAutocompleteField('issue_parent_issue_id', '#{escape_javascript auto_complete_issues_path(:id => @issue, :project_id => @issue.project)}')" %>
+            <%= javascript_tag "observeAutocompleteField('issue_parent_issue_id', '#{escape_javascript auto_complete_issues_path(:project_id => @issue.project)}')" %>
             <% end %>
             <% if @issue.safe_attribute? 'start_date' %>

test/functional/auto_completes_controller_test.rb +22 -5

                 assert assigns(:issues).detect {|issue| issue.subject.match /recipe/}
               end
+              def test_issues_should_accept_term_param
+                get :issues, :project_id => 'ecookbook', :term => 'ReCiPe'
+                assert_response :success
+                assert_not_nil assigns(:issues)
+                assert assigns(:issues).detect {|issue| issue.subject.match /recipe/}
+              end
               def test_issues_should_return_issue_with_given_id
                 get :issues, :project_id => 'subproject1', :q => '13'
                 assert_response :success
                 assert assigns(:issues).include?(Issue.find(13))
               end
-              def test_auto_complete_with_scope_all_and_cross_project_relations
+              def test_auto_complete_with_scope_all_should_search_other_projects
-                Setting.cross_project_issue_relations = '1'
                 get :issues, :project_id => 'ecookbook', :q => '13', :scope => 'all'
                 assert_response :success
                 assert_not_nil assigns(:issues)
                 assert assigns(:issues).include?(Issue.find(13))
               end
-              def test_auto_complete_with_scope_all_without_cross_project_relations
+              def test_auto_complete_without_scope_all_should_not_search_other_projects
-                Setting.cross_project_issue_relations = '0'
+                get :issues, :project_id => 'ecookbook', :q => '13'
-                get :issues, :project_id => 'ecookbook', :q => '13', :scope => 'all'
                 assert_response :success
                 assert_equal [], assigns(:issues)
               end
+              def test_issues_should_return_json
+                get :issues, :project_id => 'subproject1', :q => '13'
+                assert_response :success
+                json = ActiveSupport::JSON.decode(response.body)
+                assert_kind_of Array, json
+                issue = json.first
+                assert_kind_of Hash, issue
+                assert_equal 13, issue['id']
+                assert_equal 13, issue['value']
+                assert_equal 'Bug #13: Subproject issue two', issue['label']
+              end
             end

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