Fixed a problem preventing login

2014-05-17 12:54:39 -06:00
parent ffa8239e42
commit e5bf3f5a5c
4 changed files with 289 additions and 295 deletions
@@ -1,10 +1,10 @@
-= form_for @user, :html => (@user.id ? {:multipart => true} : {}) do |f|
+= form_for @user, :html => (@user && @user.id ? {:multipart => true} : {}) do |f|
 	%div{:class => (@user.id ? 'columns medium-6' : '')}
 		= f.text_field :username
 		= f.email_field :email
 		- if !@user.id
-			= f.password_field, :password
-			= f.password_field, :password_confirmation
+			= f.password_field :password
+			= f.password_field :password_confirmation
 			= f.actions :register
 	- if @user.id
 		.columns.medium-6