Super janky miulti-level menu on create - TODO: Fix this ish.

snipe · May 5, 2015 · 139dd13 · 139dd13
1 parent 2f52369
commit 139dd13
Show file tree

Hide file tree

Showing 3 changed files with 53 additions and 6 deletions.
diff --git a/app/config/version.php b/app/config/version.php
@@ -1,5 +1,5 @@
 <?php
 return array (
-  'app_version' => 'v1.2.7-10',
-  'hash_version' => 'v1.2.7-10-g71febc1',
+  'app_version' => 'v1.2.7-11',
+  'hash_version' => 'v1.2.7-11-gaab52d0',
 );
diff --git a/app/controllers/admin/LocationsController.php b/app/controllers/admin/LocationsController.php
@@ -37,9 +37,29 @@ public function getIndex()
      */
     public function getCreate()
     {
-        // Show the page
-        $location_options = array('' => 'Top Level') + Location::lists('name', 'id');
-        return View::make('backend/locations/edit')->with('location_options',$location_options)->with('location',new Location);
+        $location_options = array();
+        $location_options_array = Location::getLocationHierarchy();
+
+        foreach ($location_options_array as $id => $value) {
+            $location_options[$id] = $value['name'];
+            foreach ($value as $child_id => $children) {
+                if (is_array($children)) {
+                    foreach ($children as $child_id => $child_locations) {
+                        $location_options[$child_id] = '-- '.$child_locations['name'];
+                    }
+                }
+            }
+
+        }
+
+        /*echo '<pre>Location options:';
+        print_r($location_options);
+        echo '</pre>';
+        */
+
+        return View::make('backend/locations/edit')
+        ->with('location_options',$location_options)
+        ->with('location',new Location);
     }
 
 
@@ -65,7 +85,7 @@ public function postCreate()
             if (Input::get('parent_id')=='') {
                 $location->parent_id		= null;
             } else {
-                $location->parent_id		= e(Input::get('parent_id',''));
+                $location->parent_id		= e(Input::get('parent_id'));
             }
             $location->address			= e(Input::get('address'));
             $location->address2			= e(Input::get('address2'));

diff --git a/app/models/Location.php b/app/models/Location.php
@@ -30,4 +30,31 @@ public function parent() {
     public function childLocations() {
         return $this->hasMany('Location')->where('parent_id','=',$this->id);
     }
+
+    public static function getLocationHierarchy($parent_id = null) {
+
+        $locations = Location::orderBy('name','ASC')->where('parent_id','=',$parent_id)->get();
+        $op = array();
+
+        foreach($locations as $location) {
+
+            if ($location['parent_id'] == $parent_id) {
+                $op[$location['id']] = array(
+                    'name' => $location['name'],
+                    'parent_id' => $location['parent_id']
+                );
+
+                // using recursion
+                $children =  Location::getLocationHierarchy($location['id']);
+                if ($children) {
+                    $op[$location['id']]['children'] = $children;
+                    //echo '<li>'.$location['id'].'has children';
+                }
+            }
+
+        }
+        return $op;
+    }
+
+
 }