caboose-cms 0.8.18 → 0.8.19
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/app/controllers/caboose/login_controller.rb +4 -2
- data/lib/caboose/version.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 9358c4e426e2ac03fbb5cadc8906d0bb3f56c622
|
|
4
|
+
data.tar.gz: 3f2f75073157e3e4ff49ac36b9709ae65c059c65
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: ed6dc00cb2f42e15cfdb9ef37db29e983e9af887c34722cdb4b4c3a304ec066572afa394df3fbcf459a98d0f747a8cd55abbd6f6dca70f632a0656d5462a454a
|
|
7
|
+
data.tar.gz: 67b0a26a36ceee5e3e406c6ebcb5742208abe7a1ed8cbd3905d81e8a187673f42aa75eb2192ba5c76bcc0c94629df3cc535cadd8dca65a5b1766c221a23e740a
|
|
@@ -92,8 +92,10 @@ module Caboose
|
|
|
92
92
|
# @route GET /login/reset-password/:reset_id
|
|
93
93
|
def reset_password_form
|
|
94
94
|
@return_url = params[:return_url].nil? ? "/" : params[:return_url]
|
|
95
|
-
|
|
96
|
-
|
|
95
|
+
if logged_in?
|
|
96
|
+
redirect_to @return_url
|
|
97
|
+
return
|
|
98
|
+
end
|
|
97
99
|
@reset_id = params[:reset_id]
|
|
98
100
|
@user = Caboose::User.user_for_reset_id(@reset_id)
|
|
99
101
|
render :layout => Caboose::login_layout
|
data/lib/caboose/version.rb
CHANGED