diff --git a/app/Controller/User.php b/app/Controller/User.php index 834b23790..e757fa841 100644 --- a/app/Controller/User.php +++ b/app/Controller/User.php @@ -121,16 +121,31 @@ class User extends Base */ public function index() { - $users = $this->user->getAll(); - $nb_users = count($users); + $direction = $this->request->getStringParam('direction', 'ASC'); + $order = $this->request->getStringParam('order', 'username'); + $offset = $this->request->getIntegerParam('offset', 0); + $limit = 25; + + $users = $this->user->paginate($offset, $limit, $order, $direction); + $nb_users = $this->user->count(); $this->response->html( $this->template->layout('user_index', array( 'projects' => $this->project->getList(), - 'users' => $users, 'nb_users' => $nb_users, + 'users' => $users, 'menu' => 'users', - 'title' => t('Users').' ('.$nb_users.')' + 'title' => t('Users').' ('.$nb_users.')', + 'pagination' => array( + 'controller' => 'user', + 'action' => 'index', + 'direction' => $direction, + 'order' => $order, + 'total' => $nb_users, + 'offset' => $offset, + 'limit' => $limit, + 'params' => array(), + ), ))); } diff --git a/app/Model/User.php b/app/Model/User.php index 9544f3c94..41bad0bbf 100644 --- a/app/Model/User.php +++ b/app/Model/User.php @@ -138,10 +138,64 @@ class User extends Base return $this->db ->table(self::TABLE) ->asc('username') - ->columns('id', 'username', 'name', 'email', 'is_admin', 'default_project_id', 'is_ldap_user', 'notifications_enabled', 'google_id', 'github_id') + ->columns( + 'id', + 'username', + 'name', + 'email', + 'is_admin', + 'default_project_id', + 'is_ldap_user', + 'notifications_enabled', + 'google_id', + 'github_id' + ) ->findAll(); } + /** + * Get all users with pagination + * + * @access public + * @param integer $offset Offset + * @param integer $limit Limit + * @param string $column Sorting column + * @param string $direction Sorting direction + * @return array + */ + public function paginate($offset = 0, $limit = 25, $column = 'username', $direction = 'ASC') + { + return $this->db + ->table(self::TABLE) + ->columns( + 'id', + 'username', + 'name', + 'email', + 'is_admin', + 'default_project_id', + 'is_ldap_user', + 'notifications_enabled', + 'google_id', + 'github_id' + ) + ->offset($offset) + ->limit($limit) + ->orderBy($column, $direction) + ->findAll(); + } + + /** + * Get the number of users + * + * @access public + * @return integer + */ + public function count() + { + return $this->db->table(self::TABLE)->count(); + } + /** * List all users (key-value pairs with id/username) * diff --git a/app/Template/user_index.php b/app/Template/user_index.php index d4e1bbf9b..fc2b6307f 100644 --- a/app/Template/user_index.php +++ b/app/Template/user_index.php @@ -3,7 +3,7 @@
| = t('Id') ?> | -= t('Username') ?> | -= t('Name') ?> | -= t('Email') ?> | -= t('Administrator') ?> | -= t('Default project') ?> | -= t('Notifications') ?> | += Helper\order(t('Id'), 'id', $pagination) ?> | += Helper\order(t('Username'), 'username', $pagination) ?> | += Helper\order(t('Name'), 'name', $pagination) ?> | += Helper\order(t('Email'), 'email', $pagination) ?> | += Helper\order(t('Administrator'), 'is_admin', $pagination) ?> | += Helper\order(t('Default project'), 'default_project_id', $pagination) ?> | += Helper\order(t('Notifications'), 'notifications_enabled', $pagination) ?> | = t('External accounts') ?> | -= t('Account type') ?> | += Helper\order(t('Account type'), 'is_ldap_user', $pagination) ?> |
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| - #= $user['id'] ?> + = Helper\a('#'.$user['id'], 'user', 'show', array('user_id' => $user['id'])) ?> | - = Helper\escape($user['username']) ?> + = Helper\a(Helper\escape($user['username']), 'user', 'show', array('user_id' => $user['id'])) ?> | = Helper\escape($user['name']) ?> | - = Helper\escape($user['email']) ?> + = Helper\escape($user['email']) ?> | = $user['is_admin'] ? t('Yes') : t('No') ?> @@ -66,6 +66,8 @@ |