scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-12-29 11:45:18 +08:00
Code Issues Projects Releases Packages Wiki Activity

first run

Browse source
This commit is contained in:
zmagod 2016-10-24 20:07:20 +02:00
parent 12c77df883
commit e02132578a
2 changed files with 18 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -11,7 +11,8 @@ class Users::SettingsController < ApplicationController
:tutorial,
:reset_tutorial,
:notifications_settings,
:user_current_organization
:user_current_organization,
:destroy_user_organization
]
before_action :check_organization_permission, only: [
@ -401,6 +402,7 @@ class Users::SettingsController < ApplicationController
end
if !invalid
reset_current_organization
if params[:leave] then
flash[:notice] = I18n.t(
"users.settings.organizations.index.leave_flash",
@ -598,4 +600,15 @@ class Users::SettingsController < ApplicationController
UserNotification.create(notification: notification, user: target_user)
end
end
# checks if the user is still in the current organization
def reset_current_organization
if @user.organizations_ids.exclude? @user.current_organization_id
@user.current_organization_id = @user.organizations_ids.first
end
end
# def reset_current_organization_of_removed_users
#
# end
end

4
app/models/user.rb
View file

@ -259,6 +259,10 @@ class User < ActiveRecord::Base
.uniq
end
def organizations_ids
organizations.pluck(:id)
end
protected
def time_zone_check