dvkei/Pterodactyl-Panel
1
0
Fork 0
forked from Alex/Pterodactyl-Panel
Code Issues Pull Requests Projects Releases Wiki Activity

closes #344

Browse Source
This commit is contained in:
Dane Everitt 2017-03-16 19:54:31 -04:00
parent 955d89c0c6
commit 1aa191210a
No known key found for this signature in database
GPG Key ID: EEA66103B3D71F53
4 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -19,6 +19,7 @@ This project follows [Semantic Versioning](http://semver.org) guidelines.
* Fixes potential bug with invalid CIDR notation (ex: `192.168.1.1/z`) when adding allocations that could cause over 4 million records to be created at once. * Fixes potential bug with invalid CIDR notation (ex: `192.168.1.1/z`) when adding allocations that could cause over 4 million records to be created at once.
* `[pre.4]` — Fixes bug preventing server updates from occurring by the system due to undefined `Auth::user()` in the event listener. * `[pre.4]` — Fixes bug preventing server updates from occurring by the system due to undefined `Auth::user()` in the event listener.
* `[pre.4]` — Fixes `Server::byUuid()` caching to actually clear the cache for *all* users, rather than the logged in user by using cache tags. * `[pre.4]` — Fixes `Server::byUuid()` caching to actually clear the cache for *all* users, rather than the logged in user by using cache tags.
* `[pre.4]` — Fixes server listing on frontend not displaying a page selector when more than 10 servers exist.
### Added ### Added
* Ability to assign multiple allocations at once when creating a new server. * Ability to assign multiple allocations at once when creating a new server.

2
app/Http/Controllers/Base/IndexController.php
View File

@ -47,7 +47,7 @@ class IndexController extends Controller
public function getIndex(Request $request) public function getIndex(Request $request)
{ {
return view('base.index', [ return view('base.index', [
'servers' => $request->user()->serverAccessCollection(10), 'servers' => $request->user()->serverAccessCollection(config('pterodactyl.paginate.frontend.servers')),
]); ]);
} }

14
config/pterodactyl.php
View File

@ -16,4 +16,18 @@ return [
'author' => env('SERVICE_AUTHOR'), 'author' => env('SERVICE_AUTHOR'),
], ],
/*
|--------------------------------------------------------------------------
| Pagination
|--------------------------------------------------------------------------
|
| Certain pagination result counts can be configured here and will take
| effect globally.
*/
'paginate' => [
'frontend' => [
'servers' => 15,
],
],
]; ];

5
resources/themes/pterodactyl/base/index.blade.php
View File

@ -78,6 +78,11 @@
</tbody> </tbody>
</table> </table>
</div> </div>
@if($servers->hasPages())
<div class="box-footer">
<div class="col-md-12 text-center">{!! $servers->render() !!}</div>
</div>
@endif
</div> </div>
</div> </div>
</div> </div>