DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-03-05 20:52:15 -08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Fixes #1944 - add manufacturer to model list

Browse source
This commit is contained in:
snipe 2016-04-23 03:34:49 -07:00
parent 3eb09871cf
commit 96911b9e57
2 changed files with 17 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
app/Helpers/Helper.php
View file

@ -4,6 +4,7 @@ namespace App\Helpers;
use DB; use DB;
use App\Models\Statuslabel; use App\Models\Statuslabel;
use App\Models\Location; use App\Models\Location;
use App\Models\AssetModel;
use App\Models\Company; use App\Models\Company;
use App\Models\User; use App\Models\User;
use App\Models\Manufacturer; use App\Models\Manufacturer;
@ -38,6 +39,7 @@ class Helper
return trim($value); return trim($value);
} }
public static function ParseFloat($floatString) public static function ParseFloat($floatString)
{ {
// use comma for thousands until local info is property used // use comma for thousands until local info is property used
@ -50,12 +52,12 @@ class Helper
public static function modelList() public static function modelList()
{ {
$model_list = array('' => trans('general.select_model')) + DB::table('models') $models = AssetModel::with('manufacturer')->get();
->select(DB::raw('IF (modelno="" OR modelno IS NULL,name,concat(name, " / ",modelno)) as name, id')) $model_array[''] = trans('general.select_model');
->orderBy('name', 'asc') foreach ($models as $model) {
->whereNull('deleted_at') $model_array[$model->id] = $model->displayModelName();
->pluck('name', 'id'); }
return $model_list; return $model_array;
} }
public static function companyList() public static function companyList()

9
app/Models/AssetModel.php
View file

@ -87,6 +87,15 @@ class AssetModel extends Model
} }
public function displayModelName()
{
$name = $this->manufacturer->name.' '.$this->name;
if ($this->modelno) {
$name .=" / ".$this->modelno;
}
return $name;
}
/** /**
* ----------------------------------------------- * -----------------------------------------------
* BEGIN QUERY SCOPES * BEGIN QUERY SCOPES