Fix group detection in route, missing array key (#180)

barryvdh · Mar 4, 2017 · 4d91fce · 4d91fce
1 parent d991d53
commit 4d91fce
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 24 deletions.
diff --git a/src/Controller.php b/src/Controller.php
@@ -50,16 +50,14 @@ public function getIndex($group = null)
             ->with('deleteEnabled', $this->manager->getConfig('delete_enabled'));
     }
 
-    public function getView()
+    public function getView($group = null)
     {
-        $groups = func_get_args();
-        $group = implode('/', $groups);
         return $this->getIndex($group);
     }
 
     protected function loadLocales()
     {
-        //Set the default locale as the first one. 
+        //Set the default locale as the first one.
         $locales = Translation::groupBy('locale')
             ->select('locale')
             ->get()
@@ -72,13 +70,9 @@ protected function loadLocales()
         return array_unique($locales);
     }
 
-    public function postAdd(Request $request)
+    public function postAdd($group = null)
     {
-        $keys = explode("\n", $request->get('keys'));
-
-        $groups = func_get_args();
-        array_shift($groups); // remove the $request
-        $group = implode('/', $groups);
+        $keys = explode("\n", request()->get('keys'));
 
         foreach($keys as $key){
             $key = trim($key);
@@ -89,14 +83,11 @@ public function postAdd(Request $request)
         return redirect()->back();
     }
 
-    public function postEdit(Request $request, $group)
+    public function postEdit($group = null)
     {
         if(!in_array($group, $this->manager->getConfig('exclude_groups'))) {
-            $groups = func_get_args();
-            array_shift($groups); // remove the $request
-            $group = implode('/', $groups);
-            $name = $request->get('name');
-            $value = $request->get('value');
+            $name = request()->get('name');
+            $value = request()->get('value');
 
             list($locale, $key) = explode('|', $name, 2);
             $translation = Translation::firstOrNew([
@@ -111,11 +102,8 @@ public function postEdit(Request $request, $group)
         }
     }
 
-    public function postDelete()
+    public function postDelete($group = null)
     {
-        $groups = func_get_args();
-        $key = array_pop($groups); // the last arg is the key
-        $group = implode('/', $groups);
         if(!in_array($group, $this->manager->getConfig('exclude_groups')) && $this->manager->getConfig('delete_enabled')) {
             Translation::where('group', $group)->where('key', $key)->delete();
             return ['status' => 'ok'];
@@ -137,10 +125,8 @@ public function postFind()
         return ['status' => 'ok', 'counter' => (int) $numFound];
     }
 
-    public function postPublish()
+    public function postPublish($group = null)
     {
-        $groups = func_get_args();
-        $group = implode('/', $groups);
         $this->manager->exportTranslations($group);
 
         return ['status' => 'ok'];

diff --git a/src/Manager.php b/src/Manager.php
@@ -143,7 +143,7 @@ public function exportTranslations($group)
             if($group == '*')
                 return $this->exportAllTranslations();
 
-            $tree = $this->makeTree(Translation::ofTranslatedGroup($group)->orderByGroupKeys($this->config['sort_keys'])->get());
+            $tree = $this->makeTree(Translation::ofTranslatedGroup($group)->orderByGroupKeys(array_get($this->config, 'sort_keys', false))->get());
 
             foreach($tree as $locale => $groups){
                 if(isset($groups[$group])){