# HG changeset patch # User luisf # Date 1321570038 0 # Node ID c118d3389088bff4dbdea439b5ac4eb454bcbea8 # Parent facded821cee4f2612d4795cc08c1a5cff9bba2a Fixes Bug #330. Removes unused code added in a previous commit (function observeProjectTagsField, tags_input.js file). diff -r facded821cee -r c118d3389088 vendor/plugins/redmine_tags/app/views/auto_completes/_search_tag_list.html.erb --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/vendor/plugins/redmine_tags/app/views/auto_completes/_search_tag_list.html.erb Thu Nov 17 22:47:18 2011 +0000 @@ -0,0 +1,5 @@ + diff -r facded821cee -r c118d3389088 vendor/plugins/redmine_tags/app/views/auto_completes/_tag_list.html.erb --- a/vendor/plugins/redmine_tags/app/views/auto_completes/_tag_list.html.erb Thu Nov 17 22:12:45 2011 +0000 +++ b/vendor/plugins/redmine_tags/app/views/auto_completes/_tag_list.html.erb Thu Nov 17 22:47:18 2011 +0000 @@ -2,5 +2,5 @@ <% @tags.each do |tag| -%> <%= content_tag 'li', h('%s (%d)' % [tag.name, tag.count]), :name => tag.name %> <% end -%> -<%= content_tag 'li', l(:auto_complete_new_tag) % @name, :name => @name %> + <%= content_tag 'li', l(:auto_complete_new_tag) % @name, :name => @name %> diff -r facded821cee -r c118d3389088 vendor/plugins/redmine_tags/app/views/projects/_filter_search_tags.html.erb --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/vendor/plugins/redmine_tags/app/views/projects/_filter_search_tags.html.erb Thu Nov 17 22:47:18 2011 +0000 @@ -0,0 +1,13 @@ +

+ <% fields_for @project, :builder => TabularFormBuilder do |f| -%> +

+

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

+
+ <%= javascript_include_tag 'tags_input', :plugin => 'redmine_tags' %> + + <%= javascript_tag "observeProjectTagsField('#{url_for(:controller => 'auto_completes', :action => 'project_search_tags', :project_id => Project.first.id)}')" %> +
+ <% end -%> +

diff -r facded821cee -r c118d3389088 vendor/plugins/redmine_tags/app/views/projects/_filter_tags.rhtml --- a/vendor/plugins/redmine_tags/app/views/projects/_filter_tags.rhtml Thu Nov 17 22:12:45 2011 +0000 +++ b/vendor/plugins/redmine_tags/app/views/projects/_filter_tags.rhtml Thu Nov 17 22:47:18 2011 +0000 @@ -7,7 +7,7 @@
<%= javascript_include_tag 'tags_input', :plugin => 'redmine_tags' %> - <%= javascript_tag "observeProjectTagsField('#{url_for(:controller => 'auto_completes', :action => 'project_tags', :project_id => Project.first.id)}', true)" %> + <%= javascript_tag "observeProjectTagsField('#{url_for(:controller => 'auto_completes', :action => 'project_tags', :project_id => Project.first.id)}')" %> <% end -%>

diff -r facded821cee -r c118d3389088 vendor/plugins/redmine_tags/app/views/projects/index.rhtml --- a/vendor/plugins/redmine_tags/app/views/projects/index.rhtml Thu Nov 17 22:12:45 2011 +0000 +++ b/vendor/plugins/redmine_tags/app/views/projects/index.rhtml Thu Nov 17 22:47:18 2011 +0000 @@ -34,7 +34,7 @@

- <%= render :partial => 'filter_tags' %> + <%= render :partial => 'filter_search_tags' %>

<%= submit_tag( l('button_filter'), :id => 'filter_button') -%>

diff -r facded821cee -r c118d3389088 vendor/plugins/redmine_tags/assets/javascripts/tags_input.js --- a/vendor/plugins/redmine_tags/assets/javascripts/tags_input.js Thu Nov 17 22:12:45 2011 +0000 +++ b/vendor/plugins/redmine_tags/assets/javascripts/tags_input.js Thu Nov 17 22:47:18 2011 +0000 @@ -93,11 +93,6 @@ new Redmine.TagsInput('issue_tag_list').autocomplete('issue_tag_candidates', url); } - -function observeProjectTagsField(url, index) { - if(index){ - new Redmine.TagsInput('project_tag_list').autocomplete('project_tag_candidates', url); - }else{ - new Redmine.TagsInput('project_tag_list').autocomplete('project_tag_candidates', url); - } +function observeProjectTagsField(url) { + new Redmine.TagsInput('project_tag_list').autocomplete('project_tag_candidates', url); } \ No newline at end of file diff -r facded821cee -r c118d3389088 vendor/plugins/redmine_tags/lib/redmine_tags/patches/auto_completes_controller_patch.rb --- a/vendor/plugins/redmine_tags/lib/redmine_tags/patches/auto_completes_controller_patch.rb Thu Nov 17 22:12:45 2011 +0000 +++ b/vendor/plugins/redmine_tags/lib/redmine_tags/patches/auto_completes_controller_patch.rb Thu Nov 17 22:47:18 2011 +0000 @@ -38,6 +38,12 @@ @tags = Project.available_tags :name_like => @name render :layout => false, :partial => 'tag_list' end + + def project_search_tags + @name = params[:q].to_s + @tags = Project.available_tags :name_like => @name + render :layout => false, :partial => 'search_tag_list' + end end end end