scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-02-06 15:05:26 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1022 from okriuchykhin/ok_SCI_2136

Browse source 
Fix manage repository permissions [SCI-2136]
This commit is contained in:
okriuchykhin 2018-03-09 10:15:24 +01:00 committed by GitHub
commit 160935cde0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/permissions/team.rb
View file

@ -105,7 +105,7 @@ end
Canaid::Permissions.register_for(Repository) do Canaid::Permissions.register_for(Repository) do
# repository: update, delete # repository: update, delete
can :manage_repository do |user, repository| can :manage_repository do |user, repository|
can_create_repositories?(user, repository.team) user.is_admin_of_team?(repository.team)
end end
end end

2
app/views/repositories/_repository.html.erb
View file

@ -32,7 +32,7 @@
data-toggle="dropdown" data-toggle="dropdown"
aria-haspopup="true" aria-haspopup="true"
aria-expanded="true" aria-expanded="true"
<%= "disabled='disabled'" if !can_manage_repository?(repository) && !can_create_repositories?(repository.team) %>> <%= "disabled='disabled'" unless can_manage_repository?(repository) || can_create_repositories?(repository.team) %>>
<span class="glyphicon glyphicon-cog"></span> <span class="glyphicon glyphicon-cog"></span>
<span class="caret"></span> <span class="caret"></span>
</div> </div>