FIX: fix content edit

modules/ContactForm/Handlers/ContactForm.php

@@ -5,7 +5,6 @@ use App\CMS\Contracts\Content\AdvancedContentModifier;
 use App\CMS\Contracts\Content\ContentTitles;
 use App\CMS\Enumerations\ModulesHandlerToId;
 use App\CMS\Handlers\Handler;
-use App\Http\Controllers\Admin\Contents\EditContent;
 use App\Http\Requests\Request;
 use App\Models\Content\Content;
 use App\Models\User;
@@ -23,7 +22,7 @@ class ContactForm extends Handler implements ContentTitles, AdvancedContentModif
      * @param Content $content
      * @param array   $inputData
      *
-     * @return mixed
+     * @return mixed|void
      */
     public static function createNew(Content &$content, array $inputData)
     {
@@ -48,31 +47,14 @@ class ContactForm extends Handler implements ContentTitles, AdvancedContentModif
      * Reason why it is separated from createNew() method is simple - we need to save history of changes.
      *
      * @param Content $content
-     * @param Request $request
+     * @param         $request
      *
-     * @param         $revisionID string ID of revision used
-     *
-     * @return int number of edited fields
+     * @return mixed|void
      */
     public static function edit(Content $content, $request)
     {
-        $fields = [
-            'phone'        => 'phone',
-            'email'        => 'email',
-            'contactEmail' => 'contactEmail',
-            'companyName'  => 'companyName',
-            'address'      => 'address',
-            'gpsLat'       => 'gpsLat',
-            'gpsLng'       => 'gpsLng',
-            'subject'      => 'subject'
-        ];
-
-        // get data and try to save them
-        $data = EditContent::getFields($request, $fields);
-        list($revision, $changedColumns) = $content->updateWithHistory($fields, $data);
-
-        // return amount of changed columns
-        return $changedColumns;
+        self::createNew($content, $request);
+        $content->save();
     }
 
     public static function getModuleId()

modules/ContactForm/Http/Controllers/Visitor/CreateNewMessage.php

@@ -24,19 +24,17 @@ class CreateNewMessage extends Controller
         $form = Content::where('moduleHandler', config('contactform.handler'))
                        ->findOrFail($formId);
 
-        $form->moduleSettings = json_decode($form->moduleSettings);
-
         // select template
-        $template = isset($form->moduleSettings->emailTemplate) ? $form->moduleSettings->emailTemplate : 'contactform::emails.default';
+        $template = isset($form->moduleSettings['emailTemplate']) ? $form->moduleSettings['emailTemplate'] : 'contactform::emails.default';
 
         // send email
         $status = Mail::send(Template::name($template), ['data' => $request], function (Message $message) use ($request, $form) {
             $message->from($request->email, $request->name);
 
             // get message subject
-            $subject = isset($form->moduleSettings->subject) ? $form->moduleSettings->subject : trans('contactform::admin/contents.defaultSubject');
+            $subject = isset($form->moduleSettings['subject']) ? $form->moduleSettings['subject'] : trans('contactform::admin/contents.defaultSubject');
 
-            $message->to($form->moduleSettings->email)
+            $message->to($form->moduleSettings['email'])
                     ->subject($subject);
         });