DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-24 13:14:07 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Added todos, fixed ID casing

Browse source
This commit is contained in:
snipe 2016-04-07 17:23:52 -07:00
parent 40aac1bf89
commit b6fa3a2a89
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/Http/Controllers/CategoriesController.php
View file

@ -235,6 +235,7 @@ class CategoriesController extends Controller
* Returns a JSON response with the data to populate the bootstrap table on the
* cateory listing page.
*
* @todo Refactor this nastiness. Assets do not behave the same as accessories, etc.
* @author [A. Gianotto] [<snipe@snipe.net>]
* @see CategoriesController::getIndex() method that generates the view
* @since [v1.8]
@ -302,16 +303,19 @@ class CategoriesController extends Controller
/**
* Returns JSON response that contains the data for the category detail page.
*
* @todo Refactor this nastiness. Assets do not behave
* the same as accessories, etc. Need to figure out if I should
* make separate controllers, or what. Too much copypasta if I try to work it in here.
* @author [A. Gianotto] [<snipe@snipe.net>]
* @see CategoriesController::getView() method that generates the view
* @param int $categoryId
* @since [v1.8]
* @return String JSON
*/
public function getDataView($categoryID)
public function getDataView($categoryId)
{
$category = Category::find($categoryID);
$category = Category::find($categoryId);
if ($category->category_type =='asset') {
$category_assets = $category->assets;