DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-01-12 06:17:28 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fix #6910: Add logic to manipulate the eloquent query. (#7006)

Browse source 
* Added company_id to consumables_users table

* Added logic to manage when a pivot table doesn't have the column company_id trough a join with users

* Remove a migration that tries to fix this problem, but is not longer necessary
This commit is contained in:
Ivan Nieto 2019-07-15 15:02:44 -05:00 committed by snipe
parent e1b33f3087
commit d409be6d43
2 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/Http/Controllers/Api/ConsumablesController.php
View file

@ -165,7 +165,7 @@ class ConsumablesController extends Controller
{ {
$consumable = Consumable::with(array('consumableAssignments'=> $consumable = Consumable::with(array('consumableAssignments'=>
function ($query) { function ($query) {
$query->orderBy('created_at', 'DESC'); $query->orderBy($query->getModel()->getTable().'.created_at', 'DESC');
}, },
'consumableAssignments.admin'=> function ($query) { 'consumableAssignments.admin'=> function ($query) {
}, },

6
app/Models/Company.php
View file

@ -80,7 +80,13 @@ final class Company extends SnipeModel
} }
$table = ($table_name) ? DB::getTablePrefix().$table_name."." : ''; $table = ($table_name) ? DB::getTablePrefix().$table_name."." : '';
if(\Schema::hasColumn($query->getModel()->getTable(), $column)){
return $query->where($table.$column, '=', $company_id); return $query->where($table.$column, '=', $company_id);
} else {
return $query->join('users as users_comp', 'users_comp.id', 'user_id')->where('users_comp.company_id', '=', $company_id);
}
} }
public static function getIdFromInput($unescaped_input) public static function getIdFromInput($unescaped_input)