diff options
| author | jessib <jessib@leap.se> | 2012-11-26 10:15:22 -0800 |
|---|---|---|
| committer | jessib <jessib@leap.se> | 2012-11-26 10:15:22 -0800 |
| commit | 3e744e4e226eae3ea2f900d9fccc32b6c046d65f (patch) | |
| tree | 1b19232d08229b178c094c92e2242ce1686099ae /users/app/views/sessions/new.html.haml | |
| parent | d9d67bd60d3fdfa4106977de9e5aba11f659fc79 (diff) | |
| parent | bf74255d1530fe5852dc6e6c27ef975ce9aa8d3c (diff) | |
Merge branch 'develop' into help_develop
Conflicts:
users/app/views/sessions/_nav.html.haml
Diffstat (limited to 'users/app/views/sessions/new.html.haml')
| -rw-r--r-- | users/app/views/sessions/new.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/users/app/views/sessions/new.html.haml b/users/app/views/sessions/new.html.haml index c91d3f2..a04f584 100644 --- a/users/app/views/sessions/new.html.haml +++ b/users/app/views/sessions/new.html.haml @@ -1,6 +1,6 @@ .span8.offset2 %h2=t :login - = simple_form_for :session, :url => sessions_path, :html => { :id => :new_session, :class => 'form-horizontal' } do |f| + = simple_form_for @session, :validate => true, :html => { :id => :new_session, :class => 'form-horizontal' } do |f| %legend=t :login_message = f.input :login, :input_html => { :id => :srp_username } = f.input :password, :required => true, :input_html => { :id => :srp_password } |