htwkmooc/codeocean
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

removed code duplication

Browse Source
This commit is contained in:
Hauke Klement
2015-02-12 13:15:31 +01:00
parent c562d4b0ef
commit e8db4a4b10
3 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/controllers/concerns/common_behavior.rb
View File

@ -28,7 +28,6 @@ module CommonBehavior
format.html { render(options[:template]) }
format.json { render(json: @object.errors, status: :unprocessable_entity) }
end
private :respond_with_invalid_object
def respond_with_valid_object(format, options = {})
format.html { redirect_to(options[:path], notice: options[:notice]) }

6
app/controllers/internal_users_controller.rb
View File

@ -15,8 +15,7 @@ class InternalUsersController < ApplicationController
format.html { redirect_to(sign_in_path, notice: t('.success')) }
format.json { render(nothing: true, status: :ok) }
else
format.html { render(:activate) }
format.json { render(json: @user.errors, status: :unprocessable_entity) }
respond_with_invalid_object(format, object: @user, template: :activate)
end
end
end
@ -94,8 +93,7 @@ class InternalUsersController < ApplicationController
format.html { redirect_to(sign_in_path, notice: t('.success')) }
format.json { render(nothing: true, status: :ok) }
else
format.html { render(:reset_password) }
format.json { render(json: @user.errors, status: :unprocessable_entity) }
respond_with_invalid_object(format, object: @user, template: :reset_password)
end
end
end