# HG changeset patch # User luisf # Date 1365613996 -3600 # Node ID 94a6e3687c4541476964bc729f2fb65b838b350e # Parent f8c5708a6fd6ece52306c3cfe2a0668aeeaaa88b simplified tag searching on the projects#index diff -r f8c5708a6fd6 -r 94a6e3687c45 plugins/redmine_tags/app/helpers/tags_helper.rb --- a/plugins/redmine_tags/app/helpers/tags_helper.rb Wed Apr 10 16:53:44 2013 +0100 +++ b/plugins/redmine_tags/app/helpers/tags_helper.rb Wed Apr 10 18:13:16 2013 +0100 @@ -41,7 +41,8 @@ end def render_project_tag_link(tag, options = {}) - content = link_to tag.name, :controller => :projects, :action => :index, :project => { :tag_list => tag.name } + content = link_to tag.name, :controller => :projects, :action => :index, :tag_search => tag.name + if options[:show_count] content << content_tag('span', "(#{tag.count})", :class => 'tag-count') end diff -r f8c5708a6fd6 -r 94a6e3687c45 plugins/redmine_tags/app/views/projects/_filter_search_tags.html.erb --- a/plugins/redmine_tags/app/views/projects/_filter_search_tags.html.erb Wed Apr 10 16:53:44 2013 +0100 +++ b/plugins/redmine_tags/app/views/projects/_filter_search_tags.html.erb Wed Apr 10 18:13:16 2013 +0100 @@ -1,12 +1,31 @@ -

- <%- fields_for @project do |f| -%> -

-

- <%= f.text_field :tag_list, :label => :label_tags_search, :size => 60, :class => 'hol' -%> -

-
- <%= javascript_include_tag 'tags_input', :plugin => 'redmine_tags' -%> - <%= javascript_tag "observeProjectTagsField('#{url_for(:controller => 'auto_completes', :action => 'project_search_tags')}', true)" -%> -
- <%- end -%> -

+
+

<%= text_field_tag 'tag_search', params[:tag_search] -%> +
+ <%= l(:text_tags_info).html_safe %> +

+
+ <%= stylesheet_link_tag 'jquery.tagit.css', :plugin => 'redmine_tags' %> + <%= stylesheet_link_tag 'redmine_tags', :plugin => 'redmine_tags' %> + <%= javascript_include_tag 'tag-it', :plugin => 'redmine_tags' %> + + <%= javascript_tag "$('#tag_search').tagit({ + tagSource: function(search, showChoices) { + var that = this; + $.ajax({ + url: '#{url_for(:controller => 'auto_completes', :action => 'project_tags')}', + data: {q: search.term}, + success: function(choices) { + showChoices(that._subtractArray(jQuery.parseJSON(choices), that.assignedTags())); + } + }); + }, + }); +" %> + +
+ + + + + + diff -r f8c5708a6fd6 -r 94a6e3687c45 plugins/redmine_tags/lib/redmine_tags/patches/projects_controller_patch.rb --- a/plugins/redmine_tags/lib/redmine_tags/patches/projects_controller_patch.rb Wed Apr 10 16:53:44 2013 +0100 +++ b/plugins/redmine_tags/lib/redmine_tags/patches/projects_controller_patch.rb Wed Apr 10 18:13:16 2013 +0100 @@ -111,8 +111,8 @@ end # search for tags - if params.has_key?(:project) - tag_list = (params[:project][:tag_list] || "").strip.split(",") + if params.has_key?(:tag_search) + tag_list = (params[:tag_search] || "").strip.split(",") else tag_list = "" end