Mercurial > hg > soundsoftware-site

changeset 818:6973eeea55ac live

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from branch "luisf"
author Chris Cannam
date Wed, 23 Nov 2011 16:11:37 +0000
parents d338e072b97b (current diff) f3c3a1c55451 (diff)
children 2ec2657c8e6e
files
diffstat 2 files changed, 3 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/vendor/plugins/redmine_tags/assets/javascripts/tags_input.js	Wed Nov 23 15:44:36 2011 +0000
+++ b/vendor/plugins/redmine_tags/assets/javascripts/tags_input.js	Wed Nov 23 16:11:37 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().toLowerCase());
+      this.addTag(tags[i].strip().stripTags().toLowerCase());
     }
   },
 
--- a/vendor/plugins/redmine_tags/lib/redmine_tags/patches/projects_controller_patch.rb	Wed Nov 23 15:44:36 2011 +0000
+++ b/vendor/plugins/redmine_tags/lib/redmine_tags/patches/projects_controller_patch.rb	Wed Nov 23 16:11:37 2011 +0000
@@ -10,16 +10,13 @@
           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?
@@ -27,7 +24,7 @@
             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