Merge branch 'master' of git.task-on.com:ktask/task-on.com

common/modules/school/controllers/CoursesAdminController.php

@@ -108,7 +108,6 @@ class CoursesAdminController extends AdminController
         if($model->load(Yii::$app->request->post()) && $model->validate()){
             //Try to get file info
             $model->upload_image = \yii\web\UploadedFile::getInstance($model, 'upload_image');
-
             //If received, then I get the file name and asign it to $model->image in order to store it in db
             if(!empty($model->upload_image)){
                 $image_name = $model->upload_image->name;

common/modules/school/controllers/LessonsAdminController.php

@@ -43,7 +43,7 @@ class LessonsAdminController extends AdminController
         Yii::$app->controller->page_title  = 'Просмотр урока';
 
         Yii::$app->controller->breadcrumbs = [
-            ['Список уроков' => '/school/courses-admin/manage'],
+            ['Список уроков' => '/school/lessons-admin/manage'],
             'Добавить урок'
         ];
 
@@ -58,13 +58,12 @@ class LessonsAdminController extends AdminController
 
         Yii::$app->controller->page_title = 'Добавить урок';
         Yii::$app->controller->breadcrumbs = [
-            ['Список курсов' => '/school/courses-admin/manage'],
+            ['Список курсов' => '/school/lessons-admin/manage'],
             'Добавить урок'
         ];
 
         $model->load(Yii::$app->request->post());
         $model->filesUpload = UploadedFile::getInstances($model, 'filesUpload');
-
         if (Yii::$app->request->isPost && $model->validate()) 
         {
             if($model->filesUpload)
@@ -91,14 +90,13 @@ class LessonsAdminController extends AdminController
     {
         Yii::$app->controller->page_title = 'Редактировать урок';
         Yii::$app->controller->breadcrumbs = [
-            ['Список уроков' => '/school/courses-admin/manage'],
+            ['Список уроков' => '/school/lessons-admin/manage'],
             'Редактировать урок'
         ];
         $model = $this->findModel($id);
 
        $model->load(Yii::$app->request->post());
        $model->filesUpload = UploadedFile::getInstances($model, 'filesUpload');
-
        if (Yii::$app->request->isPost && $model->validate()) 
        {
             if($model->filesUpload) 
@@ -107,7 +105,6 @@ class LessonsAdminController extends AdminController
                 {
                     $model->deleteFiles();
                 }
-
                 $model->upload();
                 $model->filesUpload = null;
             }

common/modules/school/forms/LessonForm.php

@@ -9,9 +9,8 @@ use common\modules\testings\models\Test;
         'model' => $model,
         'attribute' => 'filesUpload[]',
         'language' => 'en',
-        'options' => ['multiple' => true],
-        'pluginOptions' => ['showUpload' => false,
-            'overwriteInitial'=>true]
+        'options' => ['multiple' => true, 'overwriteInitial'=>false],
+        'pluginOptions' => ['showUpload' => false]
     ])."</div>";
  
 $elements = [
@@ -30,6 +29,9 @@ $elements = [
 return [
     'activeForm'=>[
         'id' => 'lesson-form',
+        'options' => [
+            'enctype' => 'multipart/form-data'
+        ],
     ],
     'elements'       => $elements,
     'buttons' => [

common/modules/school/models/Lessons.php

@@ -2,6 +2,7 @@
 
 namespace common\modules\school\models;
 
+use Yii;
 use common\modules\school\components\Utilities;
 use common\modules\school\models\Courses;
 use common\modules\testings\models\Test;
@@ -45,7 +46,7 @@ class Lessons extends \common\components\ActiveRecordModel
             [['video_id'], 'string', 'max' => 100],
             [['course_id', 'number', 'test_id'], 'integer'],
             [['text'], 'safe'],
-            [['filesUpload'], 'file', 'skipOnEmpty' => true, 'extensions' => 'png, jpg, jpeg, gif, rar, ai, ppt, doc, docx'],
+            [['filesUpload'], 'file', 'skipOnEmpty' => true, 'extensions' => 'png, jpg, jpeg, gif, rar, ai, ppt, doc, docx', 'maxFiles' => 10],
         ];
     }