From b1de054a9db7b3eb7aa7080979972f3d785700ee Mon Sep 17 00:00:00 2001
From: Dane Everitt <dane@daneeveritt.com>
Date: Wed, 28 Sep 2016 18:11:07 -0400
Subject: [PATCH] fixes server allocation display

---
 CHANGELOG.md                           | 1 +
 resources/views/server/index.blade.php | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 68a1849cc..73300d7a6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,7 @@ This project follows [Semantic Versioning](http://semver.org) guidelines.
 ### Changed
 ### Fixed
 * Team Fortress named 'Insurgency' in panel in database seeder. ([#96](https://github.com/Pterodactyl/Panel/issues/96), PR by [@MeltedLux](https://github.com/MeltedLux))
+* Server allocation listing display now showing the connection IP unless an alias was assigned.
 
 ### Deprecated
 ### Removed
diff --git a/resources/views/server/index.blade.php b/resources/views/server/index.blade.php
index ad812625a..0612c0ca8 100644
--- a/resources/views/server/index.blade.php
+++ b/resources/views/server/index.blade.php
@@ -83,9 +83,9 @@
                         <ul class="nav nav-pills nav-stacked" id="conn_options">
                             @foreach ($allocations as $allocation)
                                 <li role="presentation" @if($allocation->id === $server->allocation) class="active" @endif>
-                                    <a href="#/set-connnection/{{ $allocation->ip }}:{{ $allocation->port }}" data-action="set-connection" data-connection="{{ $allocation->ip }}:{{ $allocation->port }}">{{ $allocation->ip_alias }}
+                                    <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
                                         <span class="badge">{{ $allocation->port }}</span>
-                                        @if($allocation->ip !== $allocation->ip_alias)<small><span class="pull-right">Alias for {{ $allocation->ip }}</span></small>@endif
+                                        @if(!is_null($allocation->ip_alias))<small><span class="pull-right">Alias for {{ $allocation->ip }}</span></small>@endif
                                     </a>
                                 </li>
                             @endforeach