diff --git a/common/modules/comment/widgets/CommentWidget.php b/common/modules/comment/widgets/CommentWidget.php index d1af137..2e03118 100644 --- a/common/modules/comment/widgets/CommentWidget.php +++ b/common/modules/comment/widgets/CommentWidget.php @@ -218,7 +218,7 @@ 'date_add' => SORT_DESC, ], ])), - 'pagination' => ArrayHelper::remove($this->provider_options, 'query', [ + 'pagination' => ArrayHelper::remove($this->provider_options, 'pagination', [ 'pageSize' => 10, ]), ]); diff --git a/common/modules/fileloader/controllers/FileloaderController.php b/common/modules/fileloader/controllers/FileloaderController.php index ff7875d..961c898 100644 --- a/common/modules/fileloader/controllers/FileloaderController.php +++ b/common/modules/fileloader/controllers/FileloaderController.php @@ -4,6 +4,7 @@ use common\modules\fileloader\models\Fileloader; use yii\filters\AccessControl; use yii\helpers\Html; + use yii\web\ForbiddenHttpException; use yii\web\UploadedFile; class FileloaderController extends \yii\web\Controller @@ -15,15 +16,15 @@ public function behaviors() { return [ - 'access' => [ - 'class' => AccessControl::className(), - 'rules' => [ - [ - 'allow' => true, - 'roles' => [ '@' ], - ], - ], - ], +// 'access' => [ +// 'class' => AccessControl::className(), +// 'rules' => [ +// [ +// 'allow' => true, +// 'roles' => [ '@' ], +// ], +// ], +// ], 'verbs' => [ 'class' => \yii\filters\VerbFilter::className(), 'actions' => [ @@ -80,6 +81,9 @@ /** * @var Fileloader $model */ + if(empty(\Yii::$app->user->identity)) { + throw new ForbiddenHttpException(); + } $request = \Yii::$app->request; $response = \Yii::$app->response; $response->format = $response::FORMAT_JSON; diff --git a/common/modules/fileloader/resources/handler.js b/common/modules/fileloader/resources/handler.js index d63bb5d..d4fcda7 100644 --- a/common/modules/fileloader/resources/handler.js +++ b/common/modules/fileloader/resources/handler.js @@ -17,11 +17,18 @@ $(function() { if(!data.result.error) { var id = data.result.result.id; var input = $('#'+id); + var multiple = $(input).attr('multiple') !== undefined; var wrapper = $(input).parents('.fileloader-wrapper').first(); var html = '
'+ data.result.result.input + '

'+ ''+data.result.result.file_name+'

'+''+ '
'; + if(!multiple) { + var inputs = $(wrapper).find('.fileloader-item-remove'); + $.each(inputs, function(i, v) { + $(v).trigger('click'); + }); + } $(html).appendTo($(wrapper).find('.fileloader-list')); } } diff --git a/frontend/controllers/AjaxController.php b/frontend/controllers/AjaxController.php index 238c3fc..3526ee5 100644 --- a/frontend/controllers/AjaxController.php +++ b/frontend/controllers/AjaxController.php @@ -178,7 +178,7 @@ $model = new Feedback(); if($model->load($request->post())) { if($model->save()) { - return ['result' => ['message' => 'Success']]; + return ['result' => ['message' => 'Вопрос успешно отправлен, ответ будет отправлен на Вашу почту']]; } } $form = $this->renderAjax('feedback_form', [ 'model' => $model ]); diff --git a/frontend/views/tender/view.php b/frontend/views/tender/view.php index 456653a..5c7e985 100755 --- a/frontend/views/tender/view.php +++ b/frontend/views/tender/view.php @@ -287,6 +287,11 @@ $this->title = 'My Yii Application'; 'guestComment' => false, 'status' => \common\modules\comment\models\Comment::STATUS_ACTIVE, ], + 'provider_options' => [ + 'pagination' => [ + 'pageSize' => 2, + ], + ], 'success_options' => [ 'tag' => 'div', 'content' => 'Вопрос успешно создан и появится как только будет получен ответ', diff --git a/frontend/web/css/style.css b/frontend/web/css/style.css index 7a8786b..faae2bf 100755 --- a/frontend/web/css/style.css +++ b/frontend/web/css/style.css @@ -8113,4 +8113,7 @@ li.active-menu-admin:hover a .ico_num { padding-bottom: 0; border-bottom: 0; } -.has-child .artbox_comment_container .comments-content:before {display: none} \ No newline at end of file +.has-child .artbox_comment_container .comments-content:before {display: none} +.hidden { + display: none; +} \ No newline at end of file diff --git a/frontend/web/js/forms.js b/frontend/web/js/forms.js index c033a3c..b2462e8 100755 --- a/frontend/web/js/forms.js +++ b/frontend/web/js/forms.js @@ -117,7 +117,6 @@ $(document).ready( function(e) { e.preventDefault() - console.log('dsadasdaS'); addRemoveBlocks() addContacts() } @@ -593,15 +592,18 @@ $(document).ready( // Remove error for no client validation fields $(document).on('change', '.no-client-validation', function() { - console.log('debug'); $(this).parent().find('.help-block').hide(); }); $(document).on('submit', '.feedback_form', function(e) { e.preventDefault(); - console.log('event'); $.post('/ajax/post-feedback', $(this).serialize(), function(data) { - console.log(data); + if(data.error) { + $('.forms-modal-hide').empty().append(data.result.form); + } else { + addRemoveBlocks(); + alert(data.result.message); + } }); }); -- libgit2 0.21.4