From ae462c5e3d83eb92613ec145a3b5651b3597b2b8 Mon Sep 17 00:00:00 2001 From: LeandroNunes Date: Sat, 20 Oct 2007 03:01:47 +0000 Subject: [PATCH] ActionItem85: fixing bug --- app/controllers/application.rb | 9 +-------- app/helpers/application_helper.rb | 4 ++-- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/app/controllers/application.rb b/app/controllers/application.rb index 7cbbb3f..74c21e5 100644 --- a/app/controllers/application.rb +++ b/app/controllers/application.rb @@ -12,7 +12,7 @@ class ApplicationController < ActionController::Base extend PermissionCheck init_gettext 'noosfero' - before_filter :detect_stuff_by_domain, :load_profile_from_params + before_filter :detect_stuff_by_domain attr_reader :environment protected @@ -28,13 +28,6 @@ class ApplicationController < ActionController::Base end end -# before_filter :load_profile_from_params - def load_profile_from_params - if params[:profile] - @profile ||= Profile.find_by_identifier(params[:profile]) - end - end - def profile @profile end diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 2c552ec..8a5c8e3 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -256,11 +256,11 @@ module ApplicationHelper end def search_box - [form_tag( '/search'), + [form_tag( :controller => 'search', :action => 'index'), text_field_tag( 'query', _('Search'), :id => "input_search"), submit_tag(_('Search'), :id => 'button_search'), '', - observe_field('input_search', :function => '', :on => :click) + observe_field('input_search', :function => "", :on => :focus) ].join("\n") end -- libgit2 0.21.2