0
@@ -113,7 +113,7 @@ class Admin::AssetsController < Admin::BaseController
0
             
0
             if params[:conditions].has_key?(:tags)
0
               options[:include] << :tags
0
-              options[:conditions] << Asset.send(:sanitize_sql, ["(taggings.taggable_type = 'Asset' and tags.name IN (?))", Tag.parse(params[:q])])
0
+              options[:conditions] << Asset.send(:sanitize_sql, ["(taggings.taggable_type = 'Asset' and tags.name IN (?))", Tag.parse(params[:q].chomp("%"))])
0
             end
0
           end
0
         

0
@@ -7,20 +7,22 @@ class Tag < ActiveRecord::Base
0
     end
0
 
0
     # parses a comma separated list of tags into tag names
0
+    # handles all kinds of different tags. (comma seperated, space seperated (in quotation marks))
0
+    # should handle most the common keyword formats.
0
+    #
0
+    # e.g.: b'log, emacs fun, rails, ruby => "b'log", "emacs fun", "rails", "ruby"
0
+    #       "b'log" "emacs fun" "rails" "ruby" => "b'log", "emacs fun", "rails", "ruby"
0
+    #       'b\'log' 'emacs fun' 'rails' 'ruby' => "b'log", "emacs fun", "rails", "ruby"
0
     #
0
     #   Tag.parse('a, b, c')
0
     #   # => ['a', 'b', 'c']
0
     def parse(list)
0
       return list if list.is_a?(Array)
0
-      # more robust does handle all kinds of different tags. (comma seperated, space seperated (in quotation marks))
0
-      # should handle most the common keyword formats.
0
-      # e.g.: b'log, emacs fun, rails, ruby => "b'log", "emacs fun", "rails", "ruby"
0
-      #       "b'log" "emacs fun" "rails" "ruby" => "b'log", "emacs fun", "rails", "ruby"
0
-      #       'b\'log' 'emacs fun' 'rails' 'ruby' => "b'log", "emacs fun", "rails", "ruby"
0
-      #
0
-      list.scan(/((?: |)['"]{0,1})['"]?(.*?)(?:[,'"]|$)(?:\1(?: |$))/).collect{ |tag| tag.last }.uniq.delete_if{ |tag| tag == "" }
0
-      # the old version for legacy comparison.
0
-      #list.split(',').collect! { |s| s.gsub(/[^\w\ ]+/, '').downcase.strip }.delete_if { |s| s.blank? }
0
+      returning list.scan(/((?: |)['"]{0,1})['"]?(.*?)(?:[,'"]|$)(?:\1(?: |$))/) do |tags|
0
+        tags.collect! &:last
0
+        tags.uniq!
0
+        tags.delete_if &:blank?
0
+      end
0
     end
0
 
0
     # Parses comma separated tag list and returns tags for them.