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

Fix display for NULL entries created by previous model modal

Browse Source
This commit is contained in:
snipe
2015-08-12 21:09:32 -07:00
parent e91c1942f8
commit b366dec983
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/helpers.php
+2 -4
View File
@@ -9,9 +9,6 @@ function ParseFloat($floatString){
// use comma for thousands until local info is property used
$LocaleInfo = localeconv();
//$thousands = isset($LocaleInfo["mon_thousands_sep"]) ? $LocaleInfo["mon_thousands_sep"] : ",";
//$floatString = str_replace($LocaleInfo["mon_thousands_sep"] , "", $floatString);
//$floatString = str_replace($LocaleInfo["decimal_point"] , ".", $floatString);
$floatString = str_replace("," , "", $floatString);
$floatString = str_replace($LocaleInfo["decimal_point"] , ".", $floatString);
return floatval($floatString);
@@ -19,7 +16,8 @@ function ParseFloat($floatString){
function modelList() {
$model_list = array('' => Lang::get('general.select_model')) + DB::table('models')
->select(DB::raw('COALESCE(concat(name, " / ",modelno),name) as name, id'))->orderBy('name', 'asc')
//->select(DB::raw('COALESCE(concat(name, " / ",modelno),name) as name, id'))->orderBy('name', 'asc')
->select(DB::raw('IF (modelno="" OR modelno IS NULL,name,concat(name, " / ",modelno)) as name, id'))->orderBy('name', 'asc')
->orderBy('modelno', 'asc')
->whereNull('deleted_at')
->lists('name', 'id');