jqh 4 роки тому
батько
коміт
d3b26e1d3d
2 змінених файлів з 11 додано та 13 видалено
  1. 10 12
      src/Grid.php
  2. 1 1
      src/Grid/Actions/Show.php

+ 10 - 12
src/Grid.php

@@ -565,17 +565,7 @@ class Grid
      */
     public function getCreateUrl()
     {
-        $queryString = '';
-
-        if ($constraints = $this->model()->getConstraints()) {
-            $queryString = http_build_query($constraints);
-        }
-
-        return sprintf(
-            '%s/create%s',
-            $this->resource(),
-            $queryString ? ('?'.$queryString) : ''
-        );
+        return $this->urlWithConstraints($this->resource().'/create');
     }
 
     /**
@@ -585,8 +575,16 @@ class Grid
      */
     public function getEditUrl($key)
     {
-        $url = "{$this->resource()}/{$key}/edit";
+        return $this->urlWithConstraints("{$this->resource()}/{$key}/edit");
+    }
 
+    /**
+     * @param string $url
+     *
+     * @return string
+     */
+    public function urlWithConstraints(?string $url)
+    {
         $queryString = '';
 
         if ($constraints = $this->model()->getConstraints()) {

+ 1 - 1
src/Grid/Actions/Show.php

@@ -23,6 +23,6 @@ class Show extends RowAction
      */
     public function href()
     {
-        return "{$this->resource()}/{$this->getKey()}";
+        return $this->parent->urlWithConstraints("{$this->resource()}/{$this->getKey()}");
     }
 }