added email field to login screen. strange error won't let me log in?
This commit is contained in:
parent
214685e5a9
commit
a6f5603dc9
3 changed files with 8 additions and 9 deletions
|
|
@ -13,7 +13,7 @@ module SocketsHelper
|
||||||
begin
|
begin
|
||||||
v = render_to_string(:partial => type_partial(object), :locals => {:post => object}) unless object.is_a? Retraction
|
v = render_to_string(:partial => type_partial(object), :locals => {:post => object}) unless object.is_a? Retraction
|
||||||
rescue Exception => e
|
rescue Exception => e
|
||||||
Rails.logger.error ("web socket view rendering failed for some reason." + v.inspect)
|
Rails.logger.error("web socket view rendering failed for some reason." + v.inspect)
|
||||||
Rails.logger.error("Socketed object was #{object.inspect}")
|
Rails.logger.error("Socketed object was #{object.inspect}")
|
||||||
raise e
|
raise e
|
||||||
end
|
end
|
||||||
|
|
|
||||||
|
|
@ -1,12 +1,11 @@
|
||||||
= form_for(resource, :as => resource_name, :url => session_path(resource_name)) do |f|
|
= form_for(resource, :as => resource_name, :url => session_path(resource_name)) do |f|
|
||||||
%p
|
%p
|
||||||
|
= f.text_field :email
|
||||||
|
%br
|
||||||
= f.password_field :password
|
= f.password_field :password
|
||||||
%p
|
/- if devise_mapping.rememberable?
|
||||||
- if devise_mapping.rememberable?
|
/= f.check_box :remember_me
|
||||||
/= f.check_box :remember_me
|
/= f.label :remember_me
|
||||||
/= f.label :remember_me
|
= f.submit "Sign in"
|
||||||
|
|
||||||
= hidden_field_tag "user_email", "#{User.owner.email}", :name => "user[email]"
|
|
||||||
= f.submit "Sign in"
|
|
||||||
/= render :partial => "devise/shared/links"
|
/= render :partial => "devise/shared/links"
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -13,7 +13,7 @@
|
||||||
|
|
||||||
:javascript
|
:javascript
|
||||||
$(document).ready(function(){
|
$(document).ready(function(){
|
||||||
$("#user_password").focus();
|
$("#user_email").focus();
|
||||||
});
|
});
|
||||||
|
|
||||||
= csrf_meta_tag
|
= csrf_meta_tag
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue