jro_apps/redmine Commit - r9999:f1650b8ff48a

Adds autocomplete to issue field on time logging form....

Jean-Philippe Lang -

r9999:f1650b8ff48a

parent child

Context file:

r9999:f1650b8ff48a

Collapse all files

app/controllers/auto_completes_controller.rb +4 -2

             # Redmine - project management software
             # Copyright (C) 2006-2012  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             class AutoCompletesController < ApplicationController
               before_filter :find_project
               def issues
                 @issues = []
                 q = (params[:q] || params[:term]).to_s.strip
                 if q.present?
-                  scope = (params[:scope] == "all" ? Issue : @project.issues).visible
+                  scope = (params[:scope] == "all" || @project.nil? ? Issue : @project.issues).visible
                   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
                 render :layout => false
               end
               private
               def find_project
-                @project = Project.find(params[:project_id])
+                if params[:project_id].present?
+                  @project = Project.find(params[:project_id])
+                end
               rescue ActiveRecord::RecordNotFound
                 render_404
               end
             end

app/views/timelog/_form.html.erb +2 0

             <%= error_messages_for 'time_entry' %>
             <%= back_url_hidden_field_tag %>
             <div class="box tabular">
             	<% if @time_entry.new_record? %>
             	  <% if params[:project_id] %>
             	    <%= f.hidden_field :project_id %>
             	  <% else %>
             	    <p><%= f.select :project_id, project_tree_options_for_select(Project.allowed_to(:log_time).all, :selected => @time_entry.project), :required => true %></p>
             	  <% end %>
             	<% end %>
             	<p><%= f.text_field :issue_id, :size => 6 %> <em><%= h("#{@time_entry.issue.tracker.name} ##{@time_entry.issue.id}: #{@time_entry.issue.subject}") if @time_entry.issue %></em></p>
             	<p><%= f.text_field :spent_on, :size => 10, :required => true %><%= calendar_for('time_entry_spent_on') %></p>
             	<p><%= f.text_field :hours, :size => 6, :required => true %></p>
             	<p><%= f.text_field :comments, :size => 100 %></p>
             	<p><%= f.select :activity_id, activity_collection_for_select_options(@time_entry), :required => true %></p>
             	<% @time_entry.custom_field_values.each do |value| %>
             	  <p><%= custom_field_tag_with_label :time_entry, value %></p>
             	<% end %>
             	<%= call_hook(:view_timelog_edit_form_bottom, { :time_entry => @time_entry, :form => f }) %>
             </div>
+            <%= javascript_tag "observeAutocompleteField('time_entry_issue_id', '#{escape_javascript auto_complete_issues_path(:project_id => @project, :scope => (@project ? nil : 'all'))}')" %>

test/functional/auto_completes_controller_test.rb +7 0

             require File.expand_path('../../test_helper', __FILE__)
             class AutoCompletesControllerTest < ActionController::TestCase
               fixtures :projects, :issues, :issue_statuses,
                        :enumerations, :users, :issue_categories,
                        :trackers,
                        :projects_trackers,
                        :roles,
                        :member_roles,
                        :members,
                        :enabled_modules,
                        :workflows,
                        :journals, :journal_details
               def test_issues_should_not_be_case_sensitive
                 get :issues, :project_id => 'ecookbook', :q => 'ReCiPe'
                 assert_response :success
                 assert_not_nil assigns(:issues)
                 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_not_nil assigns(:issues)
                 assert assigns(:issues).include?(Issue.find(13))
               end
               def test_auto_complete_with_scope_all_should_search_other_projects
                 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_without_project_should_search_all_projects
+                get :issues, :q => '13'
+                assert_response :success
+                assert_not_nil assigns(:issues)
+                assert assigns(:issues).include?(Issue.find(13))
+              end
               def test_auto_complete_without_scope_all_should_not_search_other_projects
                 get :issues, :project_id => 'ecookbook', :q => '13'
                 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