From 69077fa92afc9f43cc860376637e8a12cd210798 Mon Sep 17 00:00:00 2001
From: Anastasia <steska13@gmail.com>
Date: Thu, 5 Jul 2018 10:51:14 +0300
Subject: [PATCH] - bug fix

---
 backend/controllers/BookController.php  | 3 +++
 backend/views/layouts/menu_items.php    | 6 ++++--
 frontend/controllers/SiteController.php | 8 ++++++++
 frontend/widgets/MicroDataWidget.php    | 4 ++--
 4 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/backend/controllers/BookController.php b/backend/controllers/BookController.php
index e0902fa..983b1f4 100644
--- a/backend/controllers/BookController.php
+++ b/backend/controllers/BookController.php
@@ -70,6 +70,9 @@
                     'hasLanguage'      => false,
                     'enableMassDelete' => true,
                     'modelPrimaryKey'  => 'id',
+                    'defaultSort'      =>  [
+                        'created_at' => 'DESC'
+                    ],
                     'create' => true,
                 ],
             ];
diff --git a/backend/views/layouts/menu_items.php b/backend/views/layouts/menu_items.php
index 7f0686e..e9c7fd0 100755
--- a/backend/views/layouts/menu_items.php
+++ b/backend/views/layouts/menu_items.php
@@ -2,6 +2,8 @@
     use yii\web\UrlManager;
     
     $homeLink = [];
+    
+    $new = \common\models\Book::find()->where(['status' => \common\models\Book::STATUS_MODERATION])->count();
     /**
      * @var UrlManager $urlManagerFrontend
      */
@@ -33,7 +35,7 @@
             [
                 'label' => \Yii::t('core', 'Pages'),
                 'url'   => '#',
-                'template' => '<a href="#"><b class="static"></b><span>{label}</span>{badge}</a>',
+                'template' => '<a href="#"><b class="static"></b><span>{label}</span>'.(!empty($new) ? "<span class=\"badge bg-green\">". $new ."</span>" : "").'{badge}</a>',
                 'items' => [
                     [
                         'label'  => \Yii::t('core', 'Pages'),
@@ -48,7 +50,7 @@
                     [
                         'label'  => \Yii::t('app', 'Books'),
                         'url'    => [ '/book/index' ],
-
+                        'template' => '<a href="{url}"><span>{label}   </span>'.(!empty($new) ? "(". $new .")" : "")."</a>"
                     ],
                     [
                         'label'  => \Yii::t('app', 'Author'),
diff --git a/frontend/controllers/SiteController.php b/frontend/controllers/SiteController.php
index 68db74a..6fedc61 100755
--- a/frontend/controllers/SiteController.php
+++ b/frontend/controllers/SiteController.php
@@ -207,5 +207,13 @@
         public function actionView(){
             return $this->render('view');
         }
+    
+        public function actionLogout()
+        {
+            \Yii::$app->user->setReturnUrl('index');
+            \Yii::$app->user->logout();
+        
+            return $this->redirect([ 'index' ]);
+        }
         
     }
diff --git a/frontend/widgets/MicroDataWidget.php b/frontend/widgets/MicroDataWidget.php
index 1575a77..b72eac1 100644
--- a/frontend/widgets/MicroDataWidget.php
+++ b/frontend/widgets/MicroDataWidget.php
@@ -49,11 +49,11 @@
                     'dateModified'     => date('c', $this->model->updated_at),
                     'author'           => [
                         '@type' => 'Person',
-                        'name'  => '',
+                        'name'  => 'admin',
                     ],
                     'publisher'        => [
                         '@type' => 'Organization',
-                        'name'  => '',
+                        'name'  => 'admin',
                         'logo'  => [
                             '@type'  => "ImageObject",
                             'url'    => $this->logoUrl,
--
libgit2 0.21.4