Download as
Browse Code »

Commit 46231f0f1d2d8aad0712ba98a6368af138a8561c

Authored by Dmitriy Zaporozhets
1 parent fbf69899
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Fix password set form and infinite loop

Showing 2 changed files with 9 additions and 8 deletions   Show diff stats
app/controllers/passwords_controller.rb
  Diff comments   View file @46231f0
1 1 class PasswordsController < ApplicationController
2 2 layout 'navless'
3 3  
  4 + skip_before_filter :check_password_expiration
  5 +
4 6 before_filter :set_user
5 7 before_filter :set_title
6 8  
... ...
app/views/passwords/new.html.haml
  Diff comments   View file @46231f0
1   -%h3.page_title Setup your new password
2   -
3   -%br
4   -
5   -= form_for @user, url: profile_password_path, method: :put do |f|
6   - .padded
7   - %p.slead After successful password update you will be redirected to dashboard
  1 += form_for @user, url: profile_password_path, method: :post do |f|
  2 + .light-well.padded
  3 + %p.slead
  4 + Please set new password before proceed.
  5 + %br
  6 + After successful password update you will be redirected to login screen
8 7 -if @user.errors.any?
9 8 .alert.alert-error
10 9 %ul
... ... @@ -20,4 +19,4 @@
20 19 = f.password_field :password_confirmation, required: true
21 20 .clearfix
22 21 .input
23   - = f.submit 'Save password', class: "btn btn-save"
  22 + = f.submit 'Set new password', class: "btn btn-create"
... ...