appoxy_sessions 0.0.17 → 0.0.18

data/lib/sessions/shareable.rb

@@ -64,11 +64,12 @@ module Appoxy
                                                        :status=>"invited",
                                                        item_id_name => self.id}.merge(access_rights), true)
 
-                ret = {
-                        :user=>user,
-                        :ac=>activation_code
-                }
-                return ret
+#                ret = {
+#                        :user=>user,
+#                        :ac=>activation_code
+#                }
+#                return ret
+                return user
 
             end
 

data/lib/sessions/users_controller.rb

@@ -7,9 +7,9 @@ module Appoxy
             def new
                 before_new
                 if params[:id]
-                    @user = User.find params[:id]
+                    @user = ::User.find params[:id]
                 else
-                    @user = User.new
+                    @user = ::User.new
                     @user.email = params[:email] if params[:email]
                 end
                 @user.activation_code = params[:ac] if params[:ac]
@@ -97,7 +97,7 @@ module Appoxy
             # Usually a user gets here via an activation link in email.
             def activate
                 logout_keeping_session!
-                @user = User.find_by_activation_code(params[:ac]) unless params[:ac].blank?
+                @user = ::User.find_by_activation_code(params[:ac]) unless params[:ac].blank?
                 case
                     when (!params[:ac].blank?) && @user && !@user.is_active?
                         flash[:info] = "Account activated. please login."

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: appoxy_sessions
 version: !ruby/object:Gem::Version 
-  hash: 61
+  hash: 59
   prerelease: false
   segments: 
   - 0
   - 0
-  - 17
-  version: 0.0.17
+  - 18
+  version: 0.0.18
 platform: ruby
 authors: 
 - Travis Reeder
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-08 00:00:00 -07:00
+date: 2010-06-18 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency