Pastie Support Pastie or read my Pastie << self blog

Language: ActionScript C/C++ CSS Diff HTML (ERB / Rails) HTML / XML Java Javascript Objective C/C++ Pascal Perl PHP Plain text Python Ruby Ruby (on Rails) Shell Script (Bash) SQL YAML  

## mark a section (Learn more)

This paste will be private.

mbp% diff -ur searching searching.bak --exclude=.svn diff -ur --exclude=.svn searching/app/controllers/application.rb searching.bak/app/controllers/application.rb --- searching/app/controllers/application.rb 2006-12-10 13:13:34.000000000 -0600 +++ searching.bak/app/controllers/application.rb 2006-12-10 04:19:15.000000000 -0600 @@ -39,7 +39,11 @@ def context_search @klass = self.class.to_s.sub(/(\w+)Controller/, '\1').downcase.singularize.classify.constantize - @objects = @klass.search(params[:q]) + @objects = if params[:q].size > 2 + @klass.search(params[:q]) + else + [] + end render :partial => "shared/context_search_results", :locals => {:collection => @objects, :update => params[:id]} end diff -ur --exclude=.svn searching/db/schema.rb searching.bak/db/schema.rb --- searching/db/schema.rb 2006-12-10 13:16:49.000000000 -0600 +++ searching.bak/db/schema.rb 2006-12-10 13:02:17.000000000 -0600 @@ -2,7 +2,7 @@ # migrations feature of ActiveRecord to incrementally modify your database, and # then regenerate this schema definition. -ActiveRecord::Schema.define(:version => 26) do +ActiveRecord::Schema.define(:version => 25) do create_table "accountabilities", :audit => 2, :force => true do |t| t.column "lock_version", :integer, :default => 0 @@ -47,20 +47,16 @@ end create_table "activities", :audit => 2, :force => true do |t| - t.column "name", :string - t.column "created", :string, :limit => 200 - t.column "updated", :string, :limit => 200 - t.column "internal_id", :string, :limit => 5 - t.column "begin_date", :datetime - t.column "end_date", :datetime - t.column "lock_version", :integer, :default => 0 - t.column "description", :string, :limit => 1000 - t.column "billable", :boolean, :default => true - t.column "admin", :boolean, :default => false - t.column "timesheet_category", :string, :limit => 20 - t.column "is_worked", :boolean - t.column "is_paid", :boolean - t.column "is_hour_multiples", :boolean + t.column "name", :string + t.column "created", :string, :limit => 200 + t.column "updated", :string, :limit => 200 + t.column "internal_id", :string, :limit => 5 + t.column "begin_date", :datetime + t.column "end_date", :datetime + t.column "lock_version", :integer, :default => 0 + t.column "description", :string, :limit => 1000 + t.column "billable", :boolean, :default => true + t.column "admin", :boolean, :default => false end add_index "activities", ["begin_date"], :name => "activities_begin_date_index" @@ -1438,20 +1434,6 @@ add_index "tasks", ["justification_id", "justification_type"], :name => "tasks_just_id_type_idx" add_index "tasks", ["task_rule_id"], :name => "tasks_task_rule_id_index" - create_table "timeclocks", :audit => 3, :force => true do |t| - t.column "party_id", :integer, :null => false - t.column "activity_id", :integer, :null => false - t.column "in_time", :datetime - t.column "out_time", :datetime - t.column "is_modified", :boolean, :null => false - t.column "modifing_party_id", :integer - end - - create_table "timesheets", :audit => 3, :force => true do |t| - t.column "party_id", :integer, :null => false - t.column "payperiod_date", :date - end - create_table "tuple_domains", :audit => 2, :force => true do |t| t.column "lock_version", :integer, :default => 0 t.column "domain_name", :string, :limit => 30 Only in searching/log: development.log Only in searching/log: test.log diff -ur --exclude=.svn searching/public/javascripts/application.js searching.bak/public/javascripts/application.js --- searching/public/javascripts/application.js 2006-12-10 13:14:28.000000000 -0600 +++ searching.bak/public/javascripts/application.js 2006-12-10 04:41:55.000000000 -0600 @@ -82,6 +82,6 @@ function search_on_dom_id(node) { new Effect.BlindUp(node, {duration:0.25,queue:'front'}); new Effect.BlindDown(node+'_search', {duration:0.25,queue:'end'}); - $(node+'_search').blur(); + $(node+'_search').focus(); Element.update(node+'_area_search', '<a onclick=\"new Effect.BlindUp(\''+node+'_search\',{duration:0.25,queue:\'front\'}); new Effect.BlindDown(\''+node+'\', {duration:0.25,queue:\'end\'}); search_id_area_reset(\''+node+'\');\">Cancel</a>'); } \ No newline at end of file Only in searching.bak/tmp: pids diff -ur --exclude=.svn searching/vendor/plugins/searchable_models/lib/searchable_models.rb searching.bak/vendor/plugins/searchable_models/lib/searchable_models.rb --- searching/vendor/plugins/searchable_models/lib/searchable_models.rb 2006-12-10 13:13:38.000000000 -0600 +++ searching.bak/vendor/plugins/searchable_models/lib/searchable_models.rb 2006-12-10 01:51:59.000000000 -0600 @@ -17,11 +17,4 @@ rescue [] end - - def summary_name - [:title, :name, :label, :description].inject(nil) do |choice, meth| - choice ||= object.send(meth) if object.respond_to?(meth) - choice - end || "#{object.class.name.titleize} ##{object.id}" - end end \ No newline at end of file