Merge branch 'hotfixes/eol' into develop

# Conflicts: # app/Http/Controllers/AssetModelsController.php
2016-09-27 07:04:45 -07:00
parent c42dfadd17 a92bfe8ade
commit 1e3244b2b3
2 changed files with 11 additions and 9 deletions
@@ -141,7 +141,7 @@ class AssetModelsController extends Controller
        $model = new AssetModel;

        $settings=Input::all();
-        $settings['eol']=0;
+        $settings['eol']= null;

        $model->name=e(Input::get('name'));
        $model->manufacturer_id = e(Input::get('manufacturer_id'));
@@ -149,7 +149,7 @@ class AssetModelsController extends Controller
        $model->modelno = e(Input::get('modelno'));
        $model->user_id = Auth::user()->id;
        $model->note            = e(Input::get('note'));
-        $model->eol=0;
+        $model->eol= null;

        if (Input::get('fieldset_id')=='') {
            $model->fieldset_id = null;
@@ -217,7 +217,7 @@ class AssetModelsController extends Controller
        }

        if (e(Input::get('eol')) == '') {
-            $model->eol =  0;
+            $model->eol =  null;
        } else {
            $model->eol = e(Input::get('eol'));
        }