Replace URL parameters dynamically without needing a list in advance …

…(#3361) Fixes #3358. Credit to @jimcottrell
wintercms · Dec 18, 2018 · 34da618 · 34da618
1 parent 54a67ca
commit 34da618
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 9 deletions.
diff --git a/modules/backend/behaviors/FormController.php b/modules/backend/behaviors/FormController.php
@@ -463,7 +463,7 @@ public function makeRedirect($context = null, $model = null)
         }
 
         if ($model && $redirectUrl) {
-            $redirectUrl = RouterHelper::parseValues($model, array_keys($model->getAttributes()), $redirectUrl);
+            $redirectUrl = RouterHelper::replaceParameters($model, $redirectUrl);
         }
 
         if (starts_with($redirectUrl, 'http://') || starts_with($redirectUrl, 'https://')) {

diff --git a/modules/backend/widgets/Lists.php b/modules/backend/widgets/Lists.php
@@ -631,12 +631,7 @@ public function getRecordUrl($record)
             return null;
         }
 
-        $data = $record->toArray();
-        $data += [$record->getKeyName() => $record->getKey()];
-
-        $columns = array_keys($data);
-
-        $url = RouterHelper::parseValues($data, $columns, $this->recordUrl);
+        $url = RouterHelper::replaceParameters($record, $this->recordUrl);
         return Backend::url($url);
     }
 
@@ -651,8 +646,7 @@ public function getRecordOnClick($record)
             return null;
         }
 
-        $columns = array_keys($record->getAttributes());
-        $recordOnClick = RouterHelper::parseValues($record, $columns, $this->recordOnClick);
+        $recordOnClick = RouterHelper::replaceParameters($record, $this->recordOnClick);
         return Html::attributes(['onclick' => $recordOnClick]);
     }