appoxy_sessions 0.0.17 → 0.0.18
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- data/lib/sessions/shareable.rb +6 -5
- data/lib/sessions/users_controller.rb +3 -3
- metadata +4 -4
data/lib/sessions/shareable.rb
CHANGED
|
@@ -64,11 +64,12 @@ module Appoxy
|
|
|
64
64
|
:status=>"invited",
|
|
65
65
|
item_id_name => self.id}.merge(access_rights), true)
|
|
66
66
|
|
|
67
|
-
ret = {
|
|
68
|
-
:user=>user,
|
|
69
|
-
:ac=>activation_code
|
|
70
|
-
}
|
|
71
|
-
return ret
|
|
67
|
+
# ret = {
|
|
68
|
+
# :user=>user,
|
|
69
|
+
# :ac=>activation_code
|
|
70
|
+
# }
|
|
71
|
+
# return ret
|
|
72
|
+
return user
|
|
72
73
|
|
|
73
74
|
end
|
|
74
75
|
|
|
@@ -7,9 +7,9 @@ module Appoxy
|
|
|
7
7
|
def new
|
|
8
8
|
before_new
|
|
9
9
|
if params[:id]
|
|
10
|
-
@user = User.find params[:id]
|
|
10
|
+
@user = ::User.find params[:id]
|
|
11
11
|
else
|
|
12
|
-
@user = User.new
|
|
12
|
+
@user = ::User.new
|
|
13
13
|
@user.email = params[:email] if params[:email]
|
|
14
14
|
end
|
|
15
15
|
@user.activation_code = params[:ac] if params[:ac]
|
|
@@ -97,7 +97,7 @@ module Appoxy
|
|
|
97
97
|
# Usually a user gets here via an activation link in email.
|
|
98
98
|
def activate
|
|
99
99
|
logout_keeping_session!
|
|
100
|
-
@user = User.find_by_activation_code(params[:ac]) unless params[:ac].blank?
|
|
100
|
+
@user = ::User.find_by_activation_code(params[:ac]) unless params[:ac].blank?
|
|
101
101
|
case
|
|
102
102
|
when (!params[:ac].blank?) && @user && !@user.is_active?
|
|
103
103
|
flash[:info] = "Account activated. please login."
|
metadata
CHANGED
|
@@ -1,13 +1,13 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: appoxy_sessions
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
hash:
|
|
4
|
+
hash: 59
|
|
5
5
|
prerelease: false
|
|
6
6
|
segments:
|
|
7
7
|
- 0
|
|
8
8
|
- 0
|
|
9
|
-
-
|
|
10
|
-
version: 0.0.
|
|
9
|
+
- 18
|
|
10
|
+
version: 0.0.18
|
|
11
11
|
platform: ruby
|
|
12
12
|
authors:
|
|
13
13
|
- Travis Reeder
|
|
@@ -15,7 +15,7 @@ autorequire:
|
|
|
15
15
|
bindir: bin
|
|
16
16
|
cert_chain: []
|
|
17
17
|
|
|
18
|
-
date: 2010-06-
|
|
18
|
+
date: 2010-06-18 00:00:00 -07:00
|
|
19
19
|
default_executable:
|
|
20
20
|
dependencies:
|
|
21
21
|
- !ruby/object:Gem::Dependency
|