Skynet/misc_pterodactyl-panel
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix view-allocations permissions check in templates, closes #1021

Browse source
This commit is contained in:
Dane Everitt 2018-03-06 21:57:00 -06:00
parent c9e874d3ae
commit d3f797bf2a
No known key found for this signature in database
GPG key ID: EEA66103B3D71F53
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -6,6 +6,7 @@ This project follows [Semantic Versioning](http://semver.org) guidelines.
## v0.7.6 (Derelict Dermodactylus) ## v0.7.6 (Derelict Dermodactylus)
### Fixed ### Fixed
* Fixes a UI error when attempting to change the default Nest and Egg for an existing server. * Fixes a UI error when attempting to change the default Nest and Egg for an existing server.
* Correct permissions check in UI to allow subusers with permission to `view-allocations` the ability to actually see the sidebar link.
## v0.7.5 (Derelict Dermodactylus) ## v0.7.5 (Derelict Dermodactylus)
### Fixed ### Fixed

4
resources/themes/pterodactyl/layouts/master.blade.php
View file

@ -170,7 +170,7 @@
</a> </a>
</li> </li>
@endcan @endcan
@if(Gate::allows('view-startup', $server) || Gate::allows('access-sftp', $server) || Gate::allows('view-allocation', $server)) @if(Gate::allows('view-startup', $server) || Gate::allows('access-sftp', $server) || Gate::allows('view-allocations', $server))
<li class="treeview <li class="treeview
@if(starts_with(Route::currentRouteName(), 'server.settings')) @if(starts_with(Route::currentRouteName(), 'server.settings'))
active active
@ -184,7 +184,7 @@
</span> </span>
</a> </a>
<ul class="treeview-menu"> <ul class="treeview-menu">
@can('view-allocation', $server) @can('view-allocations', $server)
<li class="{{ Route::currentRouteName() !== 'server.settings.allocation' ?: 'active' }}"><a href="{{ route('server.settings.allocation', $server->uuidShort) }}"><i class="fa fa-angle-right"></i> @lang('navigation.server.port_allocations')</a></li> <li class="{{ Route::currentRouteName() !== 'server.settings.allocation' ?: 'active' }}"><a href="{{ route('server.settings.allocation', $server->uuidShort) }}"><i class="fa fa-angle-right"></i> @lang('navigation.server.port_allocations')</a></li>
@endcan @endcan
@can('access-sftp', $server) @can('access-sftp', $server)