Download as
Browse Code »

Commit 20018afbbf88b6bb1e7d54f92da3c30123519694

Authored by Tallys Martins
1 parent 9e3e94b3
Exists in multi_env_on_remote_user

Allow multi environment on remote user plugin 

Signed-off-by: Macartur Sousa <macartur.sc@gmail.com
Signed-off-by: Gabriel Silva <gabriel93.silva@gmail.com>
Signed-off-by: Tallys Martins <tallysmartins@yahoo.com.br>
Showing 1 changed file with 4 additions and 4 deletions   Show diff stats
plugins/remote_user/lib/remote_user_plugin.rb
  Diff comments   View file @20018af
@@ -28,9 +28,9 @@ class RemoteUserPlugin &lt; Noosfero::Plugin @@ -28,9 +28,9 @@ class RemoteUserPlugin &lt; Noosfero::Plugin
28 end 28 end
29 29
30 if !logged_in? 30 if !logged_in?
31 - self.current_user = User.find_by_login(remote_user) 31 + self.current_user = User.where(environment_id: environment, login: remote_user).first
32 unless self.current_user 32 unless self.current_user
33 - self.current_user = User.create!(:login => remote_user, :email => remote_user_email, :name => remote_user_name, :password => ('pw4'+remote_user), :password_confirmation => ('pw4'+remote_user)) 33 + self.current_user = User.create!(:environment => environment, :login => remote_user, :email => remote_user_email, :name => remote_user_name, :password => ('pw4'+remote_user), :password_confirmation => ('pw4'+remote_user))
34 self.current_user.activate 34 self.current_user.activate
35 end 35 end
36 self.current_user.save! 36 self.current_user.save!
@@ -39,9 +39,9 @@ class RemoteUserPlugin &lt; Noosfero::Plugin @@ -39,9 +39,9 @@ class RemoteUserPlugin &lt; Noosfero::Plugin
39 self.current_user.forget_me 39 self.current_user.forget_me
40 reset_session 40 reset_session
41 41
42 - self.current_user = User.find_by_login(remote_user) 42 + self.current_user = User.where(environment_id: environment, login: remote_user).first
43 unless self.current_user 43 unless self.current_user
44 - self.current_user = User.create!(:login => remote_user, :email => remote_user_email, :name => remote_user_name, :password => ('pw4'+remote_user), :password_confirmation => ('pw4'+remote_user)) 44 + self.current_user = User.create!(:environment => environment, :login => remote_user, :email => remote_user_email, :name => remote_user_name, :password => ('pw4'+remote_user), :password_confirmation => ('pw4'+remote_user))
45 self.current_user.activate 45 self.current_user.activate
46 end 46 end
47 self.current_user.save! 47 self.current_user.save!