minicms/core
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

FIX: lots of bugfixes, sorry for ugly commit

Browse Source
This commit is contained in:
Michal Kváček
2017-02-09 23:10:11 +01:00
parent 99ed8806da
commit b7d4ab9515
47 changed files with 180 additions and 199 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/ContactForm/Handlers/ContactForm.php
+11 -12
View File
@@ -21,26 +21,25 @@ class ContactForm extends Handler implements ContentTitles, AdvancedContentModif
* Save module-specific values into database
*
* @param Content $content
* @param Request $request
* @param array $inputData
*
* @return mixed
* @internal param Widget $widget
*/
public static function createNew(Content &$content, Request $request)
public static function createNew(Content &$content, array $inputData)
{
$settings = [
'phone' => $request->phone,
'email' => $request->email,
'contactEmail' => $request->contactEmail,
'subject' => $request->subject,
'companyName' => $request->companyName,
'address' => $request->address,
'gpsLat' => $request->gpsLat,
'gpsLng' => $request->gpsLng,
'phone' => $inputData['phone'],
'email' => $inputData['email'],
'contactEmail' => $inputData['contactEmail'],
'subject' => $inputData['subject'],
'companyName' => $inputData['companyName'],
'address' => $inputData['address'],
'gpsLat' => $inputData['gpsLat'],
'gpsLng' => $inputData['gpsLng'],
];
// save settings
$content->moduleSettings = json_encode($settings);
$content->moduleSettings = $settings;
}
/**
modules/ContactForm/Widgets/Address/Address.php
+3 -4
View File
@@ -2,6 +2,7 @@
namespace Modules\ContactForm\Widgets\Address;
use App\CMS\Contracts\Widgets\PublicWidget;
use App\Http\Requests\Request;
use App\Models\Widgets\Widget;
use App\CMS\Contracts\Widgets\WidgetRenderer;
@@ -43,10 +44,8 @@ class Address implements PublicWidget
*
* @return mixed
*/
public static function save(Widget $widget, \stdClass $data)
public static function save(Request $data)
{
$widget->settings = json_encode(['contactFormId' => $data->contactFormId,]);
return $widget;
return ['contactFormId' => $data->contactFormId];
}
}
modules/ContactForm/Widgets/Form/Form.php
+3 -4
View File
@@ -3,6 +3,7 @@ namespace Modules\ContactForm\Widgets\Form;
use App\CMS\Contracts\Widgets\PublicWidget;
use App\CMS\Contracts\Widgets\WidgetRenderer;
use App\Http\Requests\Request;
use App\Models\Widgets\Widget;
class Form implements PublicWidget
@@ -43,10 +44,8 @@ class Form implements PublicWidget
*
* @return mixed
*/
public static function save(Widget $widget, \stdClass $data)
public static function save(Request $data)
{
$widget->settings = json_encode(['contactFormId' => $data->contactFormId,]);
return $widget;
return ['contactFormId' => $data->contactFormId];
}
}