Fixes

common/modules/rbac/models/AuthItem.php

@@ -183,7 +183,6 @@ class AuthItem extends \common\components\ActiveRecordModel
 	public function getRoles()
 	{
 		static $roles;
-
 		if(!$roles)
 		{
 			$roles = $this->findAllByAttributes(array(

common/modules/school/assets/css/school.css

@@ -75,3 +75,14 @@ img.play_img{
 .ytb_video img {
     cursor: pointer;
 }
+.lessons-block:before, .lessons-block:after {
+    display: table;
+    content: " ";
+}
+a.ls_block_title {
+    overflow: hidden;
+    height: 105px;
+} 
+.ls_block_btn {
+    margin-top:10px;
+}
\ No newline at end of file

common/modules/school/forms/LessonForm.php

@@ -21,9 +21,10 @@ if ($model->files){
                     </a>
                 </div>';
     }
+    $docsLesson = implode("", $docsLesson);
 }
 
-$docsLesson = implode("", $docsLesson);
+
 $newDoc = 'Добавить документ<span><a class="btn" id="add-doc-projs" href="javascript:void(0);" title="Новый документ">
             <i class="icon-plus"></i></a>
         </span>

common/modules/school/models/Lessons.php

@@ -19,7 +19,7 @@ use common\modules\school\models\LessonImage;
  */
 class Lessons extends \common\components\ActiveRecordModel
 {
-    const PAGE_SIZE = 10;
+    const PAGE_SIZE = 100;
 
     const IMAGES_FOLDER = '/uploads/lessons_docs/';
 

common/modules/school/models/SearchLessons.php

@@ -66,6 +66,8 @@ class SearchLessons extends Lessons
         
         $dataProvider = new ActiveDataProvider([
             'query' => $query,
+            'pagination'=>array(
+            'pageSize'=>Lessons::PAGE_SIZE ),
         ]);
 
         return $dataProvider;

common/modules/school/views/course/item-view-lesson.php

@@ -5,7 +5,7 @@
     WidgetAssetBundle::register($this);
 ?>
 
-<div class="col-md-3 col-xs-6 col-sm-12">
+
     <div class="ls_block_item">
         <div class="line_ls">Урок <?php echo $model->number;?></div>
         <a href="<?php echo Url::toRoute(['/school/lesson/view', 'id' => $model->id]);?>" class="ls_block_title">
@@ -15,5 +15,4 @@
             Смотреть
         </a>
     </div>
-</div>
 

common/modules/school/views/course/item-view.php

@@ -13,6 +13,9 @@
     <div class="kurs_over">
         <h1 class="kurs_title"><span><?php echo $model->title;?></span></h1><br>
         <span class="kurs_sub-title"><?php echo $model->description;?></span>
+        <?php if($model->type == Courses::TYPE_DV):?>
+            <div class="kurs_lock"></div>
+        <?php endif;?>   
         <?php if($model->spec_proposition):?>
             <div class="blip_kurs">За просмотр этих курсов<br> мы заплатим 15 000 руб.</div>
         <?php endif;?>

common/modules/school/views/course/view.php

@@ -10,7 +10,7 @@
         <div class="row">
             <div class="col-md-5 col-xs-7 col-sm-12">
                 <div class="ball-block">Накоплено баллов: 
-                    <span class="col-ball">99 999</span>
+                    <span class="col-ball">0</span>
                     <a href="#" class="ball-link">Как увеличить?</a>
                     <div class="ball_hover">Текст как увеличить,<br> текст как увеличить,</div>
                 </div>
@@ -47,23 +47,21 @@
             <?php echo \yii\widgets\ListView::widget( [
                     'dataProvider' => $dataProvider,
                     'itemView' => 'item-view-lesson',
-                    'itemOptions' => ['tag' => 'div'],
-                    'options' => ['tag' => 'div'],
+                    'itemOptions' => ['tag' => 'div class="col-md-3 col-xs-6 col-sm-12"'],
+                    'options' => ['tag' => 'div class="lessons-block"'],
                     'emptyTextOptions' => [ 'tag' => 'div', 'class' => 'empty-text' ],
-                    'layout' => '{items}<li><nav class="pages">{pager}</nav></li>',
+                    'layout' => '{items}<div class="clear"></div><li><nav class="pages">{pager}</nav></li>',
                     'pager' => [
                         'class' => 'common\components\zii\FrontLinkPager',
                         'activePageCssClass' => 'is-active',
-                        'prevPageLabel' => '<span class="glyphicon glyphicon-chevron-left"></span>Предыдущая',
-                        'nextPageLabel' => 'Следующая<span class="glyphicon glyphicon-chevron-right"></span>',
+                        'prevPageLabel' => '<span class="glyphicon glyphicon-chevron-left"></span>',
+                        'nextPageLabel' => '<span class="glyphicon glyphicon-chevron-right"></span>',
                         'options' => [
                             'class' => 'pages-list',
                         ],
                     ],
                 ] );
                 ?>      
-
-        <div class="row">
             <div class="col-md-3 col-xs-6 col-sm-12">
                 <div class="ls_likes">
                     <div class="ls_likes_title">Нравится курс?</div>
@@ -71,7 +69,7 @@
                     <a href="" class="ls_likes_n">Нет</a>
                 </div>
             </div>
-        </div>
+            
     </div>
 </section>
 <footer>

common/modules/school/views/lesson/view.php

@@ -13,7 +13,7 @@ WidgetAssetBundle::register($this);
         <div class="row">
             <div class="col-md-5 col-xs-7 col-sm-12">
                 <div class="ball-block">Накоплено баллов: 
-                    <span class="col-ball">99 999</span>
+                    <span class="col-ball">0</span>
                     <a href="#" class="ball-link">Как увеличить?</a>
                     <div class="ball_hover">Текст как увеличить,<br> текст как увеличить,</div>
                 </div>

common/modules/users/models/User.php

@@ -440,8 +440,7 @@ class User extends \common\components\ActiveRecordModel implements IdentityInter
 	
 	public function getRoleName()
 	{
-		$assigment = AuthAssignment::find(['user_id' => $this->id])->one();
-
+		$assigment = AuthAssignment::findAll(['user_id' => $this->id]);
 		if (!$assigment)
 		{
 			$assigment           = new AuthAssignment();
@@ -449,7 +448,7 @@ class User extends \common\components\ActiveRecordModel implements IdentityInter
 			$assigment->user_id   = $this->id;
 			$assigment->save(false);
 		}
-		$roles = \Yii::$app->authManager->getRoles($this->id);
+		$roles = \Yii::$app->authManager->getRolesByUser($this->id);
 		$out = '';
 		foreach($roles as $key=>$role) {
 			$out .= $role->description . ', ';

frontend/config/main.php

@@ -202,9 +202,9 @@ return [
         ],
         'authManager' => [
             'class' => 'yii\rbac\DbManager',
-            'connectionID' => 'db',
-            'itemTable' => 'auth_items',
-            'assignmentTable' => 'auth_assignments',
+            /*'connectionID' => 'db',*/
+            'itemTable' => 'auth_item',
+            'assignmentTable' => 'auth_assignment',
             'itemChildTable' => 'auth_item_child',
             'defaultRoles' => [
                 'user',