Download as
Browse Code »

Commit ae462c5e3d83eb92613ec145a3b5651b3597b2b8

Authored by LeandroNunes
1 parent e035ee75
Exists in master and in 22 other branches angular_poc, api-article-archived, article-readonly, backup-7-jan-2016, captcha_serpro_plugin, content-manager-hostspot, export-comment-paragraph, fix_event_date_issue, login-captcha, master_rails3, new_video_plugin, pg_search_rank, production, refactor_with_role, refactor_with_role_scope, remove_profile_cat_icons, resend_confirmation_email, staging, staging_rails3, tasks_keep_filter_params, theme-brasil-digital-from-staging, travis

ActionItem85: fixing bug 

git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@766 3f533792-8f58-4932-b0fe-aaf55b0a4547
Showing 2 changed files with 3 additions and 10 deletions   Show diff stats
app/controllers/application.rb
  Diff comments   View file @ae462c5
@@ -12,7 +12,7 @@ class ApplicationController < ActionController::Base @@ -12,7 +12,7 @@ class ApplicationController < ActionController::Base
12 extend PermissionCheck 12 extend PermissionCheck
13 init_gettext 'noosfero' 13 init_gettext 'noosfero'
14 14
15 - before_filter :detect_stuff_by_domain, :load_profile_from_params 15 + before_filter :detect_stuff_by_domain
16 attr_reader :environment 16 attr_reader :environment
17 17
18 protected 18 protected
@@ -28,13 +28,6 @@ class ApplicationController < ActionController::Base @@ -28,13 +28,6 @@ class ApplicationController < ActionController::Base
28 end 28 end
29 end 29 end
30 30
31 -# before_filter :load_profile_from_params  
32 - def load_profile_from_params  
33 - if params[:profile]  
34 - @profile ||= Profile.find_by_identifier(params[:profile])  
35 - end  
36 - end  
37 -  
38 def profile 31 def profile
39 @profile 32 @profile
40 end 33 end
app/helpers/application_helper.rb
  Diff comments   View file @ae462c5
@@ -256,11 +256,11 @@ module ApplicationHelper @@ -256,11 +256,11 @@ module ApplicationHelper
256 end 256 end
257 257
258 def search_box 258 def search_box
259 - [form_tag( '/search'), 259 + [form_tag( :controller => 'search', :action => 'index'),
260 text_field_tag( 'query', _('Search'), :id => "input_search"), 260 text_field_tag( 'query', _('Search'), :id => "input_search"),
261 submit_tag(_('Search'), :id => 'button_search'), 261 submit_tag(_('Search'), :id => 'button_search'),
262 '</form>', 262 '</form>',
263 - observe_field('input_search', :function => '', :on => :click) 263 + observe_field('input_search', :function => "", :on => :focus)
264 ].join("\n") 264 ].join("\n")
265 end 265 end
266 266