Production fixes

This commit is contained in:
2014-07-11 14:55:18 +02:00
parent 7a6177da2c
commit eab2b2178f
4 changed files with 17 additions and 8 deletions
+4 -4
View File
@@ -27,10 +27,10 @@ private
end
def layout_by_resource
if devise_controller?
return 'obtain_token' if session[:user_return_to].present?
return 'theme1' if session[:supplier_return_to].present?
end
#if devise_controller?
#return 'obtain_token' if session[:user_return_to].present? # resource_name == :user ????
#return 'theme1' if session[:supplier_return_to].present?
#end
"theme1"
end
+5
View File
@@ -158,4 +158,9 @@ module ApplicationHelper
I18n.locale == I18n.default_locale ? '/' : "/#{I18n.locale}"
end
def link_to_function(title, function, options={})
options[:onclick] = function
link_to title, 'javascript:void(0)', options
end
end