Fix for strict mode with location parent

snipe · May 4, 2015 · aab52d0 · aab52d0
1 parent 71febc1
commit aab52d0
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 6 deletions.
diff --git a/.gitignore b/.gitignore
@@ -22,3 +22,4 @@ public/uploads/logo.gif
 public/uploads/logo.png
 .siteflow
 public/assets/.siteflow
+.settings/settings.json
diff --git a/app/config/version.php b/app/config/version.php
@@ -1,5 +1,5 @@
 <?php
 return array (
-  'app_version' => 'v1.2.7-8',
-  'hash_version' => 'v1.2.7-8-g0d23332',
+  'app_version' => 'v1.2.7-9',
+  'hash_version' => 'v1.2.7-9-g68d8b10',
 );
diff --git a/app/controllers/admin/LocationsController.php b/app/controllers/admin/LocationsController.php
@@ -38,7 +38,7 @@ public function getIndex()
     public function getCreate()
     {
         // Show the page
-        $location_options = array('' => '') + Location::lists('name', 'id');
+        $location_options = array('' => 'Top Level') + Location::lists('name', 'id');
         return View::make('backend/locations/edit')->with('location_options',$location_options)->with('location',new Location);
     }
 
@@ -62,7 +62,11 @@ public function postCreate()
 
             // Save the location data
             $location->name            	= e(Input::get('name'));
-            $location->parent_id		= e(Input::get('parent_id'));
+            if (Input::get('parent_id')=='') {
+                $location->parent_id		= null;
+            } else {
+                $location->parent_id		= e(Input::get('parent_id',''));
+            }
             $location->address			= e(Input::get('address'));
             $location->address2			= e(Input::get('address2'));
             $location->city    			= e(Input::get('city'));
@@ -105,7 +109,7 @@ public function getEdit($locationId = null)
         // Show the page
         //$location_options = array('' => 'Top Level') + Location::lists('name', 'id');
 
-        $location_options = array('' => '') + DB::table('locations')->where('id', '!=', $locationId)->lists('name', 'id');
+        $location_options = array('' => 'Top Level') + DB::table('locations')->where('id', '!=', $locationId)->lists('name', 'id');
         return View::make('backend/locations/edit', compact('location'))->with('location_options',$location_options);
     }
 
@@ -137,7 +141,12 @@ public function postEdit($locationId = null)
 
             // Update the location data
             $location->name         = e(Input::get('name'));
-            $location->parent_id		= e(Input::get('parent_id'));
+            if (Input::get('parent_id')=='') {
+                $location->parent_id		= null;
+            } else {
+                $location->parent_id		= e(Input::get('parent_id',''));
+            }
+
             $location->address			= e(Input::get('address'));
             $location->address2			= e(Input::get('address2'));
             $location->city    			= e(Input::get('city'));