summaryrefslogtreecommitdiff
path: root/app/Model/User.php
diff options
context:
space:
mode:
Diffstat (limited to 'app/Model/User.php')
-rw-r--r--app/Model/User.php73
1 files changed, 25 insertions, 48 deletions
diff --git a/app/Model/User.php b/app/Model/User.php
index 1bcc82b5..01be8597 100644
--- a/app/Model/User.php
+++ b/app/Model/User.php
@@ -29,6 +29,30 @@ class User extends Base
const EVERYBODY_ID = -1;
/**
+ * Get query to fetch all users
+ *
+ * @access public
+ * @return \PicoDb\Table
+ */
+ public function getQuery()
+ {
+ 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'
+ );
+ }
+
+ /**
* Return the full name
*
* @param array $user User properties
@@ -112,54 +136,7 @@ class User extends Base
*/
public function getAll()
{
- 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'
- )
- ->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();
+ return $this->getQuery()->asc('username')->findAll();
}
/**