From d0fbce13fb056210d65e003cdb2e1f0052c96c15 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20Kv=C3=A1=C4=8Dek?= Date: Wed, 23 Nov 2016 03:21:23 +0100 Subject: [PATCH] REFACTORING #1880 @15m: remove custom fields --- app/CMS/CustomFields/BaseField.php | 6 - app/CMS/CustomFields/Date.php | 6 - app/CMS/CustomFields/Number.php | 6 - app/CMS/CustomFields/SelectboxList.php | 6 - app/CMS/CustomFields/String.php | 6 - app/CMS/Enumerations/CustomFieldResources.php | 20 ---- app/CMS/Enumerations/CustomFieldTypes.php | 21 ---- app/Events/CreateNewCustomField.php | 27 ----- app/Events/DeleteCustomField.php | 27 ----- app/Events/EditCustomField.php | 27 ----- .../CustomFields/CreateNewCustomField.php | 72 ------------ .../CustomFields/CustomFieldsOverview.php | 24 ---- .../Admin/CustomFields/EditCustomField.php | 105 ------------------ app/Http/Requests/EditCustomFieldRequest.php | 20 ---- app/Http/Requests/NewCustomFieldRequest.php | 22 ---- .../Loggers/LogCreateCustomField.php | 37 ------ app/Listeners/Loggers/LogDeleteField.php | 36 ------ app/Listeners/Loggers/LogEditCustomField.php | 36 ------ .../CustomFields/ContentHasCustomField.php | 24 ---- app/Models/CustomFields/CustomField.php | 45 -------- .../CustomFields/CustomFieldResource.php | 22 ---- app/Models/CustomFields/CustomFieldType.php | 23 ---- .../CustomFields/ModuleHasCustomField.php | 23 ---- .../CustomFields/UserHasCustomField.php | 24 ---- app/Providers/EventServiceProvider.php | 10 +- database/seeds/DatabaseSeeder.php | 2 - database/seeds/SeedCustomFieldResources.php | 24 ---- database/seeds/SeedCustomFieldTypes.php | 27 ----- 28 files changed, 1 insertion(+), 727 deletions(-) delete mode 100644 app/CMS/CustomFields/BaseField.php delete mode 100644 app/CMS/CustomFields/Date.php delete mode 100644 app/CMS/CustomFields/Number.php delete mode 100644 app/CMS/CustomFields/SelectboxList.php delete mode 100644 app/CMS/CustomFields/String.php delete mode 100644 app/CMS/Enumerations/CustomFieldResources.php delete mode 100644 app/CMS/Enumerations/CustomFieldTypes.php delete mode 100644 app/Events/CreateNewCustomField.php delete mode 100644 app/Events/DeleteCustomField.php delete mode 100644 app/Events/EditCustomField.php delete mode 100644 app/Http/Controllers/Admin/CustomFields/CreateNewCustomField.php delete mode 100644 app/Http/Controllers/Admin/CustomFields/CustomFieldsOverview.php delete mode 100644 app/Http/Controllers/Admin/CustomFields/EditCustomField.php delete mode 100644 app/Http/Requests/EditCustomFieldRequest.php delete mode 100644 app/Http/Requests/NewCustomFieldRequest.php delete mode 100644 app/Listeners/Loggers/LogCreateCustomField.php delete mode 100644 app/Listeners/Loggers/LogDeleteField.php delete mode 100644 app/Listeners/Loggers/LogEditCustomField.php delete mode 100644 app/Models/CustomFields/ContentHasCustomField.php delete mode 100644 app/Models/CustomFields/CustomField.php delete mode 100644 app/Models/CustomFields/CustomFieldResource.php delete mode 100644 app/Models/CustomFields/CustomFieldType.php delete mode 100644 app/Models/CustomFields/ModuleHasCustomField.php delete mode 100644 app/Models/CustomFields/UserHasCustomField.php delete mode 100644 database/seeds/SeedCustomFieldResources.php delete mode 100644 database/seeds/SeedCustomFieldTypes.php diff --git a/app/CMS/CustomFields/BaseField.php b/app/CMS/CustomFields/BaseField.php deleted file mode 100644 index 88a174fe..00000000 --- a/app/CMS/CustomFields/BaseField.php +++ /dev/null @@ -1,6 +0,0 @@ -id, $type->name); - } - } -} \ No newline at end of file diff --git a/app/CMS/Enumerations/CustomFieldTypes.php b/app/CMS/Enumerations/CustomFieldTypes.php deleted file mode 100644 index a2761761..00000000 --- a/app/CMS/Enumerations/CustomFieldTypes.php +++ /dev/null @@ -1,21 +0,0 @@ -id, $type->name); - } - } -} \ No newline at end of file diff --git a/app/Events/CreateNewCustomField.php b/app/Events/CreateNewCustomField.php deleted file mode 100644 index b1bbf9bd..00000000 --- a/app/Events/CreateNewCustomField.php +++ /dev/null @@ -1,27 +0,0 @@ -customField = $customField; - } -} diff --git a/app/Events/DeleteCustomField.php b/app/Events/DeleteCustomField.php deleted file mode 100644 index 38d22fa3..00000000 --- a/app/Events/DeleteCustomField.php +++ /dev/null @@ -1,27 +0,0 @@ -customField = $customField; - } -} diff --git a/app/Events/EditCustomField.php b/app/Events/EditCustomField.php deleted file mode 100644 index 9bb15320..00000000 --- a/app/Events/EditCustomField.php +++ /dev/null @@ -1,27 +0,0 @@ -customField = $customField; - } -} diff --git a/app/Http/Controllers/Admin/CustomFields/CreateNewCustomField.php b/app/Http/Controllers/Admin/CustomFields/CreateNewCustomField.php deleted file mode 100644 index c7d142be..00000000 --- a/app/Http/Controllers/Admin/CustomFields/CreateNewCustomField.php +++ /dev/null @@ -1,72 +0,0 @@ - $types, - 'resources' => $resources - ]); - } - - public function postNew(NewCustomFieldRequest $request) - { - $customField = new CustomField(); - - // set mandatory fields - - $customField->name = $request->name; - $customField->type_id = $request->type; - $customField->resource_id = $request->resource; - $customField->required = $request->has('required'); - - // set non-mandatory fields - - if ($request->description) { - $customField->description = $request->description; - } - - if ($request->possibleValues) { - $customField->possible_values = trim(preg_replace('~[\r\n]+~', '|', $request->possibleValues)); - } - - if ($request->defaultValue) { - $customField->default_value = $request->defaultValue; - } - - if ($request->regExp) { - $customField->regexp = $request->regExp; - } - - if ($request->minLength) { - $customField->min_length = $request->minLength; - } - - if ($request->maxLength) { - $customField->max_length = $request->maxLength; - } - - $customField->save(); - - // fire event about creating new custom field - Event::fire(new CreateNewCustomFieldEvent($customField)); - - return redirect() - ->route('customfields.new') - ->with('success', trans('admin/customFields.successfullyCreated')); - } -} diff --git a/app/Http/Controllers/Admin/CustomFields/CustomFieldsOverview.php b/app/Http/Controllers/Admin/CustomFields/CustomFieldsOverview.php deleted file mode 100644 index 9ff19ed3..00000000 --- a/app/Http/Controllers/Admin/CustomFields/CustomFieldsOverview.php +++ /dev/null @@ -1,24 +0,0 @@ -getIndexedByResource(); - - return view('admin.customFields.overview', [ - 'customFields' => $fields, - 'usedResources' => array_keys($fields), - 'resources' => CustomFieldResources::getWithTranslations(), - 'types' => CustomFieldTypes::getWithTranslations() - ]); - } -} \ No newline at end of file diff --git a/app/Http/Controllers/Admin/CustomFields/EditCustomField.php b/app/Http/Controllers/Admin/CustomFields/EditCustomField.php deleted file mode 100644 index d0aabbf7..00000000 --- a/app/Http/Controllers/Admin/CustomFields/EditCustomField.php +++ /dev/null @@ -1,105 +0,0 @@ - $field, - 'types' => CustomFieldTypes::getWithTranslations(), - 'resources' => CustomFieldResources::getWithTranslations() - ]); - } - - public function postEditCustomField(EditCustomFieldRequest $request, $id) - { - $customField = CustomField::findOrFail($id); - - // setup fields - - $customField->name = $request->name; - $customField->required = $request->has('required'); - - // set non-mandatory fields - - if ($request->description) { - $customField->description = $request->description; - } - - if ($request->possibleValues) { - $customField->possible_values = trim(preg_replace('~[\r\n]+~', '|', $request->possibleValues)); - } - - if ($request->defaultValue) { - $customField->default_value = $request->defaultValue; - } - - if ($request->regExp) { - $customField->regexp = $request->regExp; - } - - if ($request->minLength) { - $customField->min_length = $request->minLength; - } - - if ($request->maxLength) { - $customField->max_length = $request->maxLength; - } - - // save changes into database - $customField->save(); - - // fire event about editing custom field - Event::fire(new EditCustomFieldEvent($customField)); - - return redirect() - ->route('customfields.edit', ['id' => $id]) - ->with('success', trans('admin/customFields.successfullyEdited')); - } - - /** - * Deletes custom field given by id. - * - * This method deletes given custom field. It is in this method because deleting is somehow editing the item. - * - * @param $id - * - * @return \Illuminate\Http\RedirectResponse - */ - public function deleteCustomField($id) - { - // find and delete field - try { - $field = CustomField::findOrFail($id); - } catch (\Exception $e) { - // field does not exist, redirect to overview and inform user - return redirect() - ->route('customfields.overview') - ->with('error', trans('admin/customFields.fieldNotExist')); - } - - // delete item - $field->delete(); - - // fire event about editing custom field - Event::fire(new DeleteCustomField($field)); - - // redirect back to overview - return redirect() - ->route('customfields.overview') - ->with('success', trans('admin/customFields.successfullyDeleted')); - } -} \ No newline at end of file diff --git a/app/Http/Requests/EditCustomFieldRequest.php b/app/Http/Requests/EditCustomFieldRequest.php deleted file mode 100644 index a02917d6..00000000 --- a/app/Http/Requests/EditCustomFieldRequest.php +++ /dev/null @@ -1,20 +0,0 @@ - 'required', - 'minLength' => 'numeric|min:0', - 'maxLength' => 'numeric|min:0', - ]; - } -} diff --git a/app/Http/Requests/NewCustomFieldRequest.php b/app/Http/Requests/NewCustomFieldRequest.php deleted file mode 100644 index 562d68f9..00000000 --- a/app/Http/Requests/NewCustomFieldRequest.php +++ /dev/null @@ -1,22 +0,0 @@ - 'required', - 'type' => 'required|exists:custom_field_types,id', - 'resource' => 'required|exists:custom_field_resources,id', - 'minLength' => 'numeric|min:0', - 'maxLength' => 'numeric|min:0', - ]; - } -} diff --git a/app/Listeners/Loggers/LogCreateCustomField.php b/app/Listeners/Loggers/LogCreateCustomField.php deleted file mode 100644 index 6edcdcff..00000000 --- a/app/Listeners/Loggers/LogCreateCustomField.php +++ /dev/null @@ -1,37 +0,0 @@ - $event->customField->id, - 'name' => $event->customField->name - ]; - - $this->saveLog($parameters); - } - - /** - * Getter for action name. Used only internally - * - * @return mixed - */ - protected function getName() - { - return 'newCustomField'; - } -} diff --git a/app/Listeners/Loggers/LogDeleteField.php b/app/Listeners/Loggers/LogDeleteField.php deleted file mode 100644 index c03f6853..00000000 --- a/app/Listeners/Loggers/LogDeleteField.php +++ /dev/null @@ -1,36 +0,0 @@ - $event->customField->id, - 'name' => $event->customField->name - ]; - - $this->saveLog($parameters); - } - - /** - * Getter for action name. Used only internally - * - * @return mixed - */ - protected function getName() - { - return 'deleteCustomField'; - } -} diff --git a/app/Listeners/Loggers/LogEditCustomField.php b/app/Listeners/Loggers/LogEditCustomField.php deleted file mode 100644 index db62c517..00000000 --- a/app/Listeners/Loggers/LogEditCustomField.php +++ /dev/null @@ -1,36 +0,0 @@ - $event->customField->id, - 'name' => $event->customField->name - ]; - - $this->saveLog($parameters); - } - - /** - * Getter for action name. Used only internally - * - * @return mixed - */ - protected function getName() - { - return 'editCustomField'; - } -} diff --git a/app/Models/CustomFields/ContentHasCustomField.php b/app/Models/CustomFields/ContentHasCustomField.php deleted file mode 100644 index faab0bce..00000000 --- a/app/Models/CustomFields/ContentHasCustomField.php +++ /dev/null @@ -1,24 +0,0 @@ -resource_id][] = $field; - } - - return $customFields; - } -} \ No newline at end of file diff --git a/app/Models/CustomFields/CustomFieldResource.php b/app/Models/CustomFields/CustomFieldResource.php deleted file mode 100644 index 7701a257..00000000 --- a/app/Models/CustomFields/CustomFieldResource.php +++ /dev/null @@ -1,22 +0,0 @@ - [ 'App\Listeners\Loggers\LogDeleteContent' ], - 'App\Events\CreateNewCustomField' => [ - 'App\Listeners\Loggers\LogCreateCustomField', - ], - 'App\Events\EditCustomField' => [ - 'App\Listeners\Loggers\LogEditCustomField', - ], - 'App\Events\DeleteCustomField' => [ - 'App\Listeners\Loggers\LogDeleteField', - ], + 'App\Events\ChangeSettings' => [ 'App\Listeners\Loggers\LogChangeSettings', ], diff --git a/database/seeds/DatabaseSeeder.php b/database/seeds/DatabaseSeeder.php index 15606e81..743fd45a 100644 --- a/database/seeds/DatabaseSeeder.php +++ b/database/seeds/DatabaseSeeder.php @@ -12,8 +12,6 @@ class DatabaseSeeder extends Seeder public function run() { // fill up custom field types - $this->call(SeedCustomFieldTypes::class); - $this->call(SeedCustomFieldResources::class); $this->call(SeedActionLogTypes::class); $this->call(SeedSettings::class); } diff --git a/database/seeds/SeedCustomFieldResources.php b/database/seeds/SeedCustomFieldResources.php deleted file mode 100644 index 001fc4ad..00000000 --- a/database/seeds/SeedCustomFieldResources.php +++ /dev/null @@ -1,24 +0,0 @@ - 'admin/customFields.resource_user'], - ['name' => 'admin/customFields.resource_content'] - ]; - - foreach ($types as $type) { - \DB::table('custom_field_resource') - ->insert($type); - } - } -} diff --git a/database/seeds/SeedCustomFieldTypes.php b/database/seeds/SeedCustomFieldTypes.php deleted file mode 100644 index f2d11873..00000000 --- a/database/seeds/SeedCustomFieldTypes.php +++ /dev/null @@ -1,27 +0,0 @@ - 'admin/customFields.date', 'handler' => '\\App\\CustomFields\\Date'], - ['name' => 'admin/customFields.number', 'handler' => '\\App\\CustomFields\\Number'], - ['name' => 'admin/customFields.selectboxList', 'handler' => '\\App\\CustomFields\\SelectboxList'], - ['name' => 'admin/customFields.string', 'handler' => '\\App\\CustomFields\\String'] - ]; - - foreach ($types as $type) { - \DB::table('custom_field_types') - ->insert($type); - } - } -}