From d7b9b4f65e70b09eda03211f1b28c51a2f14d709 Mon Sep 17 00:00:00 2001
From: Samuel Georges <sam@daftspunk.com>
Date: Sat, 13 Aug 2016 10:48:52 +1000
Subject: [PATCH] Fixes vague error when attribute is not fillable Previously
 an error was being thrown with just the attribute name, not helpful at all.
 Fixes #2302

---
 .../backend/behaviors/ImportExportController.php    | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/modules/backend/behaviors/ImportExportController.php b/modules/backend/behaviors/ImportExportController.php
index 0829a4c4f..be0fc6fb6 100644
--- a/modules/backend/behaviors/ImportExportController.php
+++ b/modules/backend/behaviors/ImportExportController.php
@@ -8,6 +8,7 @@ use Backend;
 use BackendAuth;
 use Backend\Classes\ControllerBehavior;
 use Backend\Behaviors\ImportExportController\TranscodeFilter;
+use Illuminate\Database\Eloquent\MassAssignmentException;
 use League\Csv\Reader as CsvReader;
 use League\Csv\Writer as CsvWriter;
 use ApplicationException;
@@ -189,6 +190,12 @@ class ImportExportController extends ControllerBehavior
             $this->vars['importResults'] = $model->getResultStats();
             $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) {
             $this->controller->handleError($ex);
         }
@@ -411,6 +418,12 @@ class ImportExportController extends ControllerBehavior
             $this->vars['fileUrl'] = $fileUrl;
             $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) {
             $this->controller->handleError($ex);
         }