scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-12-30 20:23:14 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #472 from okriuchykhin/ok_SCI_984

Browse source 
Check that user is a member of a team when switching to it [SCI-984]
This commit is contained in:
okriuchykhin 2017-02-07 09:36:46 +01:00 committed by GitHub
commit e2de3c92e7
1 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
app/controllers/users/settings_controller.rb
View file

@ -350,16 +350,19 @@ class Users::SettingsController < ApplicationController
end
def user_current_team
@user.current_team_id = params[:user][:current_team_id]
@changed_team = Team.find_by_id(@user.current_team_id)
if params[:user][:current_team_id].present? && @user.save
flash[:success] = t('users.settings.changed_team_flash',
team: @changed_team.name)
redirect_to root_path
else
flash[:alert] = t('users.settings.changed_team_error_flash')
redirect_to :back
team_id = params[:user][:current_team_id].to_i
if @user.teams_ids.include?(team_id)
@user.current_team_id = team_id
@changed_team = Team.find_by_id(@user.current_team_id)
if @user.save
flash[:success] = t('users.settings.changed_team_flash',
team: @changed_team.name)
redirect_to root_path
return
end
end
flash[:alert] = t('users.settings.changed_team_error_flash')
redirect_to :back
end
private