ouyang/snipe-it
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Order consumable assignments by most recent

Browse Source
This commit is contained in:
snipe
2015-11-24 22:18:28 -08:00
parent 0428d21c5e
commit d34e7178b3
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/config/version.php
View File

@@ -1,5 +1,5 @@
<?php
return array (
'app_version' => 'v2.0.5-pre',
'hash_version' => 'v2.0.5-pre-177-gb39c53a',
'hash_version' => 'v2.0.5-pre-178-gd8b4321',
);

12
app/controllers/admin/ConsumablesController.php
View File

@@ -472,11 +472,15 @@ class ConsumablesController extends AdminController
public function getDataView($consumableID)
{
//$consumable = Consumable::find($consumableID);
$consumable = Consumable::with(array('consumableAssigments'=> function($query) {
$query->orderBy('created_at','DESC');
}))->find($consumableID);
$consumable = Consumable::with(array('consumableAssigments'=>
function($query) {
$query->orderBy('created_at','DESC');
},
'consumableAssigments.admin'=> function($query) {},
'consumableAssigments.user'=> function($query) {},
))->find($consumableID);
$consumable->load('consumableAssigments.admin','consumableAssigments.user');
// $consumable->load('consumableAssigments.admin','consumableAssigments.user');
if (!Company::isCurrentUserHasAccess($consumable)) {
return ['total' => 0, 'rows' => []];