Skip to content

Commit b1de054

Browse files
committed
fixes server allocation display
1 parent b2cd7cc commit b1de054

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ This project follows [Semantic Versioning](http://semver.org) guidelines.
1111
### Changed
1212
### Fixed
1313
* Team Fortress named 'Insurgency' in panel in database seeder. ([#96](https://github.com/Pterodactyl/Panel/issues/96), PR by [@MeltedLux](https://github.com/MeltedLux))
14+
* Server allocation listing display now showing the connection IP unless an alias was assigned.
1415

1516
### Deprecated
1617
### Removed

resources/views/server/index.blade.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,9 +83,9 @@
8383
<ul class="nav nav-pills nav-stacked" id="conn_options">
8484
@foreach ($allocations as $allocation)
8585
<li role="presentation" @if($allocation->id === $server->allocation) class="active" @endif>
86-
<a href="#/set-connnection/{{ $allocation->ip }}:{{ $allocation->port }}" data-action="set-connection" data-connection="{{ $allocation->ip }}:{{ $allocation->port }}">{{ $allocation->ip_alias }}
86+
<a href="#/set-connnection/{{ $allocation->ip }}:{{ $allocation->port }}" data-action="set-connection" data-connection="{{ $allocation->ip }}:{{ $allocation->port }}">@if(!is_null($allocation->ip_alias)){{ $allocation->ip_alias }}@else{{ $allocation->ip }}@endif
8787
<span class="badge">{{ $allocation->port }}</span>
88-
@if($allocation->ip !== $allocation->ip_alias)<small><span class="pull-right">Alias for {{ $allocation->ip }}</span></small>@endif
88+
@if(!is_null($allocation->ip_alias))<small><span class="pull-right">Alias for {{ $allocation->ip }}</span></small>@endif
8989
</a>
9090
</li>
9191
@endforeach

0 commit comments

Comments
 (0)