From cf77cbae6972024b85b4ba026457b67ed2f03333 Mon Sep 17 00:00:00 2001
From: Vitaliy <dockdep@gmail.com>
Date: Thu, 29 Sep 2016 16:25:18 +0300
Subject: [PATCH] 14.09.16

---
 frontend/config/main.php                    |  4 ++--
 frontend/controllers/ArticlesController.php | 24 +++++++++++++++++-------
 frontend/views/articles/index.php           |  7 ++-----
 frontend/views/event/_objects.php           |  4 ++--
 4 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/frontend/config/main.php b/frontend/config/main.php
index 82d9287..21e835c 100755
--- a/frontend/config/main.php
+++ b/frontend/config/main.php
@@ -138,9 +138,9 @@ return [
                 'brands'                                                           => 'catalog/brands',
                 'brands/<brand:[\w\-]+>'                                           => 'catalog/brand',
                 'blog'                                                             => 'articles/index',
-                'blog/<translit:[\w\-]+>-<id:\d+>'                                 => 'articles/show',
+                'blog/<translit:[\w\-\_]+>'                                 => 'articles/show',
                 'event'                                                             => 'event/index',
-                'event/<alias:[\w\-]+>-<id:\d+>'                                   => 'event/show',
+                'event/<alias:[\w\-]+>'                                   => 'event/show',
                 '<language:(ru|ua|en)>/<module:\w+>/<controller:\w+>/<action:\w+>' => '<module>/<controller>/<action>',
                 '<language:(ru|ua|en)>/<controller:\w+>/<action:\w+>'              => '<controller>/<action>',
                 '<language:(ru|ua|en)>/admin'                                      => 'admin/default/index',
diff --git a/frontend/controllers/ArticlesController.php b/frontend/controllers/ArticlesController.php
index c6645bf..010169e 100755
--- a/frontend/controllers/ArticlesController.php
+++ b/frontend/controllers/ArticlesController.php
@@ -7,7 +7,7 @@ use yii\web\Controller;
 use common\models\Articles;
 use yii\web\HttpException;
 use yii\data\Pagination;
-
+use yii\web\NotFoundHttpException;
 class ArticlesController extends Controller
 {
 
@@ -30,13 +30,23 @@ class ArticlesController extends Controller
             ]);
     }
     
-    public function actionShow(){
-        if(!$news = Articles::find()->where(['id'=>$_GET['id']])->one())
-                    throw new HttpException(404, 'Данной странице не существует!');        
+    public function actionShow($translit){
+        $news = $this->findModel($translit);
+
     
-            return $this->render('show', [
-                'news'=>$news,
-            ]);
+        return $this->render('show', [
+            'news'=>$news,
+        ]);
+    }
+
+
+    protected function findModel($translit)
+    {
+        if (($model = Articles::findOne(["translit"=>$translit])) !== null) {
+            return $model;
+        } else {
+            throw new NotFoundHttpException('The requested page does not exist.');
+        }
     }
     
 }
\ No newline at end of file
diff --git a/frontend/views/articles/index.php b/frontend/views/articles/index.php
index 9a8b535..090dc6a 100755
--- a/frontend/views/articles/index.php
+++ b/frontend/views/articles/index.php
@@ -39,15 +39,13 @@
             <div class="news_item">
                 <a href="<?= Url::to([
                     'articles/show',
-                    'translit' => $item->translit,
-                    'id'       => $item->id,
+                    'translit' => $item->translit
                 ]) ?>">
                     <?= Html::img(\common\components\artboximage\ArtboxImageHelper::getImageSrc($item->imageUrl, 'list'), [ 'class' => 'float-left' ]) ?>
                 </a>
                 <a href="<?= Url::to([
                     'articles/show',
-                    'translit' => $item->translit,
-                    'id'       => $item->id,
+                    'translit' => $item->translit
                 ]) ?>" class="name"><?= $item->title ?></a><br/>
                 <div class="comment_display_block article_list_comment">
                     <?php
@@ -63,7 +61,6 @@
                             echo Html::a(( $comment_count ? 'Отзывов: ' . count($item->comments) : "Оставить отзыв" ), [
                                 'articles/show',
                                 'translit' => $item->translit,
-                                'id'       => $item->id,
                                 '#'        => 'artbox-comment',
                             ]);
                         ?>
diff --git a/frontend/views/event/_objects.php b/frontend/views/event/_objects.php
index 3312857..93ff0a1 100755
--- a/frontend/views/event/_objects.php
+++ b/frontend/views/event/_objects.php
@@ -9,11 +9,11 @@ FlipclockAsset::register($this);
 <div class="news_item">
     <div>
         <div>
-            <a href="<?=Url::to(['event/show','alias'=>$model->alias,'id'=>$model->primaryKey])?>" class="name"><?=$model->name?></a>
+            <a href="<?=Url::to(['event/show','alias'=>$model->alias])?>" class="name"><?=$model->name?></a>
         </div>
 
         <div style="position: relative">
-            <a href="<?=Url::to(['event/show','alias'=>$model->alias,'id'=>$model->primaryKey])?>">
+            <a href="<?=Url::to(['event/show','alias'=>$model->alias])?>">
                 <?= \common\components\artboximage\ArtboxImageHelper::getImage($model->imageUrl, 'event_left', ['align' => 'left'])?>
             </a>
 
--
libgit2 0.21.4