From 7a74025253c2597c2b8e9577bcaff4aaaf581816 Mon Sep 17 00:00:00 2001 From: Reinier Balt Date: Tue, 11 Jan 2011 07:59:29 +0100 Subject: [PATCH] get autocomplete working for tags --- app/controllers/todos_controller.rb | 4 +- app/views/layouts/standard.html.erb | 6 ++- public/javascripts/application.js | 63 ++++++++++++++++++++++++----- 3 files changed, 60 insertions(+), 13 deletions(-) diff --git a/app/controllers/todos_controller.rb b/app/controllers/todos_controller.rb index 323dcb33..4bfb43de 100644 --- a/app/controllers/todos_controller.rb +++ b/app/controllers/todos_controller.rb @@ -7,7 +7,7 @@ class TodosController < ApplicationController append_before_filter :find_and_activate_ready, :only => [:index, :list_deferred] # TODO: replace :except with :only - append_before_filter :init, :except => [ :tag, :destroy, :completed, + append_before_filter :init, :except => [ :tag, :tags, :destroy, :completed, :completed_archive, :check_deferred, :toggle_check, :toggle_star, :edit, :update, :defer, :create, :calendar, :auto_complete_for_predecessor, :remove_predecessor, :add_predecessor] @@ -546,7 +546,7 @@ class TodosController < ApplicationController end def tags - @tags = Tag.all + @tags = Tag.find(:all, :conditions =>['name like ?', '%'+params[:term]+'%']) respond_to do |format| format.autocomplete { render :text => for_autocomplete(@tags, params[:term]) } end diff --git a/app/views/layouts/standard.html.erb b/app/views/layouts/standard.html.erb index fc40eafb..a097ac03 100644 --- a/app/views/layouts/standard.html.erb +++ b/app/views/layouts/standard.html.erb @@ -2,9 +2,9 @@ - <%= stylesheet_link_tag 'standard','superfish','niftyCorners', 'jquery-ui-1.8.6.custom', :cache => true %> + <%= stylesheet_link_tag 'standard','superfish','niftyCorners', 'jquery-ui-1.8.7.custom', :cache => true %> <%= stylesheet_link_tag "print", :media => "print" %> - <%= javascript_include_tag 'jquery-1.4.4.min', 'jquery-ui-1.8.6.custom.min', 'jquery.truncator', + <%= javascript_include_tag 'jquery-1.4.4.min', 'jquery-ui-1.8.7.custom.min', 'jquery.truncator', 'jquery.jeditable.mini', 'jquery.cookie', 'jquery.blockUI', 'jquery.form', :cache => 'jquery-all' %> <%= javascript_include_tag 'hoverIntent','superfish','application', 'accesskey-hints','niftycube','swfobject', :cache => 'tracks' %> @@ -12,6 +12,8 @@ <%= javascript_tag "var SOURCE_VIEW = '#{@source_view}';" %> <%= javascript_tag "var TAG_NAME = '#{@tag_name}';" if @tag_name %>