sonot
/
PteroTheme
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixes server overview listing location as the node

This commit is contained in:
Dane Everitt 2016-10-21 14:48:04 -04:00
parent 8660fcdc60
commit f9f751b7f2
No known key found for this signature in database
GPG Key ID: EEA66103B3D71F53
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG.md
View File

@ -16,6 +16,10 @@ This project follows [Semantic Versioning](http://semver.org) guidelines.
* Environment setting script is much more user friendly and does not require an excessive amount of clicking and typing. * Environment setting script is much more user friendly and does not require an excessive amount of clicking and typing.
* File upload method switched from BinaryJS to Socket.io implementation to fix bugs as well as be a little speedier and allow upload throttling. * File upload method switched from BinaryJS to Socket.io implementation to fix bugs as well as be a little speedier and allow upload throttling.
* `Server::getbyUUID()` now accepts either the `uuidShort` or full-length `uuid` for server identification. * `Server::getbyUUID()` now accepts either the `uuidShort` or full-length `uuid` for server identification.
* API keys are tied to individual users and no longer created through the Admin CP.
### Fixed
* Server overview listing the location short-code as the name of the node.
## v0.5.0-pre.2 (Bodacious Boreopterus) ## v0.5.0-pre.2 (Bodacious Boreopterus)

2
resources/views/base/index.blade.php
View File

@ -58,7 +58,7 @@
</td> </td>
@endif @endif
<td><a href="/server/{{ $server->uuidShort }}">{{ $server->name }}</a></td> <td><a href="/server/{{ $server->uuidShort }}">{{ $server->name }}</a></td>
<td><code>{{ $server->a_locationShort }}</code></td> <td>{{ $server->nodeName }}</td>
<td><code>@if(!is_null($server->ip_alias)){{ $server->ip_alias }}@else{{ $server->ip }}@endif:{{ $server->port }}</code></td> <td><code>@if(!is_null($server->ip_alias)){{ $server->ip_alias }}@else{{ $server->ip }}@endif:{{ $server->port }}</code></td>
<td class="text-center" data-action="players">--</td> <td class="text-center" data-action="players">--</td>
<td class="text-center hidden-sm hidden-xs"><span data-action="memory">--</span> / {{ $server->memory === 0 ? '&infin;' : $server->memory }} MB</td> <td class="text-center hidden-sm hidden-xs"><span data-action="memory">--</span> / {{ $server->memory === 0 ? '&infin;' : $server->memory }} MB</td>