From cd4195b390d8eb3269d77c1b1755edbfba11bd88 Mon Sep 17 00:00:00 2001 From: marina Date: Fri, 9 Aug 2024 04:51:31 +0300 Subject: [PATCH] =?utf8?q?ERP-102=20=D0=9F=D1=80=D0=B8=D1=91=D0=BC=D0=BD?= =?utf8?q?=D0=B8=D0=BA=20=D0=B4=D0=BB=D1=8F=20=D1=8D=D0=BA=D1=81=D0=B5?= =?utf8?q?=D0=BB=D1=8C=20=D1=84=D0=B0=D0=B9=D0=BB=D0=B0=20(=D0=BA=D0=BE?= =?utf8?q?=D1=80=D1=80=D0=B5=D0=BA=D1=82=D0=B8=D1=80=D0=BE=D0=B2=D0=BA?= =?utf8?q?=D0=B0)?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- erp24/actions/motivation/IndexAction.php | 2 +- erp24/web/js/motivation/index.js | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/erp24/actions/motivation/IndexAction.php b/erp24/actions/motivation/IndexAction.php index c103b8e7..82ca192b 100644 --- a/erp24/actions/motivation/IndexAction.php +++ b/erp24/actions/motivation/IndexAction.php @@ -33,7 +33,7 @@ class IndexAction extends Action $adjustment = Yii::$app->request->post('adjustment'); if ($adjustment && in_array(Admin::findOne(Yii::$app->user->id)->group_id, Motivation::getAdjustmentEditors())) { - return implode('
', ['Вы не можете вносить корректировки']); + return implode('
', ['Вы не можете вносить корректировки']); } $fileName = $adjustment ? '/template_adjustment_temp.xlsx' : '/template_plan_temp.xlsx'; diff --git a/erp24/web/js/motivation/index.js b/erp24/web/js/motivation/index.js index db6b338f..c2057655 100644 --- a/erp24/web/js/motivation/index.js +++ b/erp24/web/js/motivation/index.js @@ -73,6 +73,7 @@ function openUploadDictionary(buttonType) { body: formData, }); const text = await response.text(); + console.log(text) if (text === 'not ok') { info.innerHTML = 'Не смог загрузить файл'; } else if (text.replaceAll('
', '') === '') { -- 2.39.5