Добавление документации и изменение экшена обработки

diff --git a/erp24/controllers/WikiController.php b/erp24/controllers/WikiController.php
index e38e3bba2a8e7299b65ed302523a7614391c4d8d..f23c98a2efd49d01d06b933a1ad4adfeeaed6c59 100644 (file)
--- a/erp24/controllers/WikiController.php
+++ b/erp24/controllers/WikiController.php
@@ -77,12 +77,18 @@ class WikiController extends Controller
         $returnUrl = Yii::$app->request->get('returnUrl');
 
         if (!empty($returnUrl)) {
-            $resourceLink = explode('/', $returnUrl);
-            $resourceLink = $resourceLink[1];
+            $cleanUrl = explode('?', $returnUrl)[0];
+
+            $segments = explode('/', $cleanUrl);
+
+            $segments = array_filter($segments);
+
+            $resourceLink = implode('/', $segments);
+
             $wikiArticle = WikiArticle::findOne(['resource_link' => $resourceLink]);
-            if($wikiArticle) {
+            if ($wikiArticle) {
                 $category = WikiCategory::findOne(['id' => $wikiArticle->category_id]);
-                return $this->redirect('/wiki/'. $category->slug . '/' . $wikiArticle->slug);
+                return $this->redirect('/wiki/' . $category->slug . '/' . $wikiArticle->slug);
             }
         }
 

diff --git a/erp24/views/bouquet/_form.php b/erp24/views/bouquet/_form.php
index 9531f34708f9f0b8d3a77385461cb59f25e54270..211d62eb45a801179ab92d895d28de4043f58bc4 100644 (file)
--- a/erp24/views/bouquet/_form.php
+++ b/erp24/views/bouquet/_form.php
@@ -39,8 +39,15 @@ $form = ActiveForm::begin([
 ?>
     <h1 class="ms-3 mb-0"><?= $model ? Html::encode("Редактирование букета") : Html::encode("Создание букета") ?></h1>
     <div class="row d-flex align-items-center">
-        <div class="col-md-2">
-            <?= Html::a('Назад', ['index'], ['class' => 'btn btn-primary ms-3 mt-4 w-75']) ?>
+        <div class="col-md-2 mt-4">
+            <?= Html::a(
+                '📖 Документация',
+                Url::to(
+                    ['wiki/show-doc', 'returnUrl' => Yii::$app->request->url]
+                ),
+                ['class' => 'ms-3', 'target' => '_blank', 'title' => 'Открыть документацию']
+            ) ?>
+            <?= Html::a('Назад', ['index'], ['class' => 'btn btn-primary ms-3 mt-4 w-50']) ?>
         </div>
         <div class="col-md-10 flash-column">
             <?php