mirror_php/winter
1
0
Fork 0
mirror of https://github.com/wintercms/winter.git synced 2024-06-28 05:33:29 +02:00
Code Issues Projects Releases Wiki Activity

Fixes vague error when attribute is not fillable

Browse Source 
Previously an error was being thrown with just the attribute name, not helpful at all.
Fixes #2302
This commit is contained in:
Samuel Georges 2016-08-13 10:48:52 +10:00
parent 6070d2f6bd
commit d7b9b4f65e
1 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
modules/backend/behaviors/ImportExportController.php
View File

@ -8,6 +8,7 @@ use Backend;
use BackendAuth; use BackendAuth;
use Backend\Classes\ControllerBehavior; use Backend\Classes\ControllerBehavior;
use Backend\Behaviors\ImportExportController\TranscodeFilter; use Backend\Behaviors\ImportExportController\TranscodeFilter;
use Illuminate\Database\Eloquent\MassAssignmentException;
use League\Csv\Reader as CsvReader; use League\Csv\Reader as CsvReader;
use League\Csv\Writer as CsvWriter; use League\Csv\Writer as CsvWriter;
use ApplicationException; use ApplicationException;
@ -189,6 +190,12 @@ class ImportExportController extends ControllerBehavior
$this->vars['importResults'] = $model->getResultStats(); $this->vars['importResults'] = $model->getResultStats();
$this->vars['returnUrl'] = $this->getRedirectUrlForType('import'); $this->vars['returnUrl'] = $this->getRedirectUrlForType('import');
} }
catch (MassAssignmentException $ex) {
$this->controller->handleError(new ApplicationException(Lang::get(
'backend::lang.model.mass_assignment_failed',
['attribute' => $ex->getMessage()]
)));
}
catch (Exception $ex) { catch (Exception $ex) {
$this->controller->handleError($ex); $this->controller->handleError($ex);
} }
@ -411,6 +418,12 @@ class ImportExportController extends ControllerBehavior
$this->vars['fileUrl'] = $fileUrl; $this->vars['fileUrl'] = $fileUrl;
$this->vars['returnUrl'] = $this->getRedirectUrlForType('export'); $this->vars['returnUrl'] = $this->getRedirectUrlForType('export');
} }
catch (MassAssignmentException $ex) {
$this->controller->handleError(new ApplicationException(Lang::get(
'backend::lang.model.mass_assignment_failed',
['attribute' => $ex->getMessage()]
)));
}
catch (Exception $ex) { catch (Exception $ex) {
$this->controller->handleError($ex); $this->controller->handleError($ex);
} }