Mercurial > hg > soundsoftware-site
changeset 816:f3c3a1c55451 luisf
Merge from branch "live"
| author | luisf <luis.figueira@eecs.qmul.ac.uk> |
|---|---|
| date | Wed, 23 Nov 2011 16:10:31 +0000 |
| parents | 4d3ac2b4156c (diff) 03d855015db8 (current diff) |
| children | 6973eeea55ac 7614169e14ed cbd0b4560105 |
| files | |
| diffstat | 2 files changed, 5 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/vendor/plugins/redmine_tags/assets/javascripts/tags_input.js Wed Nov 23 15:43:50 2011 +0000 +++ b/vendor/plugins/redmine_tags/assets/javascripts/tags_input.js Wed Nov 23 16:10:31 2011 +0000 @@ -86,7 +86,7 @@ addTagsList: function(tags_list) { var tags = tags_list.split(','); for (var i = 0; i < tags.length; i++) { - this.addTag(tags[i].strip()); + this.addTag(tags[i].strip().stripTags().toLowerCase()); } },
--- a/vendor/plugins/redmine_tags/lib/redmine_tags/patches/projects_controller_patch.rb Wed Nov 23 15:43:50 2011 +0000 +++ b/vendor/plugins/redmine_tags/lib/redmine_tags/patches/projects_controller_patch.rb Wed Nov 23 16:10:31 2011 +0000 @@ -10,24 +10,21 @@ skip_before_filter :authorize, :only => [:set_fieldset_status] skip_before_filter :find_project, :only => [:set_fieldset_status] before_filter :add_tags_to_project, :only => [:save, :update] -# before_filter :filter_projects, :only => :index alias :index filtered_index end end module InstanceMethods - - - + def add_tags_to_project if params && params[:project] && !params[:project][:tag_list].nil? - old_tags = @project.tag_list.to_s - new_tags = params[:project][:tag_list].to_s + old_tags = @project.tag_list.to_s.downcase + new_tags = params[:project][:tag_list].to_s.downcase unless (old_tags == new_tags) - @project.tag_list = new_tags + @project.tag_list = ActionController::Base.helpers.strip_tags(new_tags) end end end