diff options
Diffstat (limited to 'app/Model')
| -rw-r--r-- | app/Model/Category.php | 32 | ||||
| -rw-r--r-- | app/Model/TaskFinder.php | 1 |
2 files changed, 1 insertions, 32 deletions
diff --git a/app/Model/Category.php b/app/Model/Category.php index dcc0f88e..f50c0f48 100644 --- a/app/Model/Category.php +++ b/app/Model/Category.php @@ -74,38 +74,6 @@ class Category extends Base } /** - * Prepare categories to be displayed on the board - * - * @access public - * @param integer $project_id - * @return array - */ - public function getBoardCategories($project_id) - { - $descriptions = array(); - - $listing = array( - -1 => t('All categories'), - 0 => t('No category'), - ); - - $categories = $this->db->table(self::TABLE) - ->eq('project_id', $project_id) - ->asc('name') - ->findAll(); - - foreach ($categories as $category) { - $listing[$category['id']] = $category['name']; - $descriptions[$category['id']] = $category['description']; - } - - return array( - $listing, - $descriptions, - ); - } - - /** * Return the list of all categories * * @access public diff --git a/app/Model/TaskFinder.php b/app/Model/TaskFinder.php index 181ff360..f061cef0 100644 --- a/app/Model/TaskFinder.php +++ b/app/Model/TaskFinder.php @@ -100,6 +100,7 @@ class TaskFinder extends Base User::TABLE.'.username AS assignee_username', User::TABLE.'.name AS assignee_name', Category::TABLE.'.name AS category_name', + Category::TABLE.'.description AS category_description', Board::TABLE.'.title AS column_name', Project::TABLE.'.name AS project_name' ) |