lunax/snipe_it
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity Actions

Merge branch 'develop'

Browse source 
# Conflicts:
#	config/version.php
This commit is contained in:
snipe 2017-12-15 18:57:21 -08:00
commit 6220f0d8a5
3 changed files with 10 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/Http/Controllers/Api/CompaniesController.php
View file

@ -35,10 +35,7 @@ class CompaniesController extends Controller
'components_count', 'components_count',
]; ];
$companies = Company::withCount('assets','licenses','accessories','consumables','components','users') $companies = Company::withCount('assets','licenses','accessories','consumables','components','users');
->withCount('users')->withCount('assets')
->withCount('licenses')->withCount('accessories')
->withCount('consumables')->withCount('components');
if ($request->has('search')) { if ($request->has('search')) {
$companies->TextSearch($request->input('search')); $companies->TextSearch($request->input('search'));

12
app/Models/Company.php
View file

@ -166,31 +166,31 @@ final class Company extends SnipeModel
public function users() public function users()
{ {
return $this->hasMany(User::class, 'users.company_id'); return $this->hasMany(User::class, 'company_id');
} }
public function assets() public function assets()
{ {
return $this->hasMany(Asset::class, 'assets.company_id'); return $this->hasMany(Asset::class, 'company_id');
} }
public function licenses() public function licenses()
{ {
return $this->hasMany(License::class, 'licenses.company_id'); return $this->hasMany(License::class, 'company_id');
} }
public function accessories() public function accessories()
{ {
return $this->hasMany(Accessory::class, 'accessories.company_id'); return $this->hasMany(Accessory::class, 'company_id');
} }
public function consumables() public function consumables()
{ {
return $this->hasMany(Consumable::class, 'consumables.company_id'); return $this->hasMany(Consumable::class, 'company_id');
} }
public function components() public function components()
{ {
return $this->hasMany(Component::class, 'components.company_id'); return $this->hasMany(Component::class, 'company_id');
} }
/** /**

6
config/version.php
View file

@ -1,8 +1,8 @@
<?php <?php
return array ( return array (
'app_version' => 'v4.1.8', 'app_version' => 'v4.1.9-pre',
'full_app_version' => 'v4.1.8-pre - build 3106-geb827cd', 'full_app_version' => 'v4.1.9-pre - build 3117-',
'build_version' => '3106', 'build_version' => '3117',
'prerelease_version' => '', 'prerelease_version' => '',
'hash_version' => 'geb827cd', 'hash_version' => 'geb827cd',
'full_hash' => 'v4.1.7-69-geb827cd', 'full_hash' => 'v4.1.7-69-geb827cd',