github
/
phpservermon
mirror of https://github.com/phpservermon/phpservermon
1
0
Fork 0
Code Issues Releases Wiki Activity

issue #58: fixing server ordering on users page

pull/62/merge
Pepijn Over 2014-04-10 23:29:37 +02:00
parent c5aff7d154
commit b3856d872c
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CHANGELOG.rst
View File

@ -4,8 +4,9 @@ Changelog
not yet released not yet released
---------------- ----------------
* Added Chinese translation. * #57: Added Chinese translation.
* Sphinx is now used for documentation <http://sphinx.pocoo.org/>. * Sphinx is now used for documentation <http://sphinx.pocoo.org/>.
* #58: Server order on users page now matches the order on servers page.
v3.0.0 (released April 6, 2014) v3.0.0 (released April 6, 2014)
@ -86,4 +87,4 @@ v1.0.1 (released September 18, 2008)
v1.0.0 (released July 16, 2008) v1.0.0 (released July 16, 2008)
------------------------------- -------------------------------
* Initial release * Initial release

2
src/psm/Module/User/Controller/UserController.class.php
View File

@ -55,7 +55,7 @@ class UserController extends AbstractController {
public function initialize() { public function initialize() {
$this->user_validator = new \psm\Util\User\UserValidator($this->user); $this->user_validator = new \psm\Util\User\UserValidator($this->user);
$servers = $this->db->select(PSM_DB_PREFIX.'servers', null, array('server_id', 'label')); $servers = $this->db->select(PSM_DB_PREFIX.'servers', null, array('server_id', 'label'), '', "ORDER BY `active` ASC, `status` DESC, `label` ASC");
// change the indexes to reflect their server ids // change the indexes to reflect their server ids
foreach($servers as $server) { foreach($servers as $server) {
$this->servers[$server['server_id']] = $server; $this->servers[$server['server_id']] = $server;