scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-12-26 17:51:13 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #4318 from okriuchykhin/ok_SCI_7058

Browse source 
Fix team switching when viewing repository from another team [SCI-7058]
This commit is contained in:
Alex Kriuchykhin 2022-08-08 13:10:31 +02:00 committed by GitHub
commit 897a8f71ec
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/controllers/repositories_controller.rb
View file

@ -9,7 +9,6 @@ class RepositoriesController < ApplicationController
include RepositoriesDatatableHelper
include MyModulesHelper
before_action :switch_team_with_param, only: :show
before_action :load_repository, except: %i(index create create_modal sidebar archive restore)
before_action :load_repositories, only: %i(index show sidebar)
before_action :load_repositories_for_archiving, only: :archive
@ -47,6 +46,7 @@ class RepositoriesController < ApplicationController
end
def show
current_team_switch(@repository.team)
@display_edit_button = can_create_repository_rows?(@repository)
@display_delete_button = can_delete_repository_rows?(@repository)
@display_duplicate_button = can_create_repository_rows?(@repository)
@ -425,7 +425,7 @@ class RepositoriesController < ApplicationController
def load_repository
repository_id = params[:id] || params[:repository_id]
@repository = Repository.accessible_by_teams(current_team).find_by(id: repository_id)
@repository = Repository.accessible_by_teams(current_user.teams).find_by(id: repository_id)
render_404 unless @repository
end