Merge remote-tracking branch 'origin/master'

Eugeny Galkovskiy
2 parents 6d3a9b8b 4a32b280
Showing 2 changed files with 4 additions and 2 deletions Show diff stats
frontend/controllers/SiteController.php
frontend/web/js/script.js
@@ -112,7 +112,7 @@
             if (empty(Yii::$app->request->post())) {
                 throw new BadRequestHttpException();
             } else {
-                $model = new Feedback();
+                $model = new Feedback(['scenario'=>Feedback::SCENARIO_FEEDBACK]);
                 if ($model->load(Yii::$app->request->post()) && $model->save()) {
  
                     $mailer->compose(
@@ -143,6 +143,7 @@
           </div>',
                     ];
                 } else {
+                    Yii::$app->response->setStatusCode(500);
                     return [
                         'success' => false,
                         'error'   => $model->errors,
@@ -21,6 +21,7 @@ $(
                                     .modal('hide');
                                 $('#success-modal')
                                     .modal('show');
+                                form.data("yiiActiveForm").validated = false;
                             },
                             error: function() {
                                 $('#feedback-modal')
@@ -32,7 +33,7 @@ $(
             )
             .on(
                 'submit', '#feedback-form', function(e) {
-                    e.preventDefault();
+                    return false;
                 }
             );