matt/opnform-host-nginx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Apply previous changes: slack webhooks, date range issue, 12h am/pm format, today preifl, api-keys

Browse Source
This commit is contained in:
JhumanJ
2022-09-21 17:23:37 +02:00
parent 341ee04268
commit 18ed28da2e
19 changed files with 305 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/Http/Requests/UserFormRequest.php
View File

@@ -40,6 +40,7 @@ abstract class UserFormRequest extends \Illuminate\Foundation\Http\FormRequest
'notifications_include_submission' => 'boolean',
'webhook_url' => 'url|nullable',
'use_captcha' => 'boolean',
'slack_webhook_url' => 'url|nullable',
// Customization
'theme' => ['required',Rule::in(Form::THEMES)],
@@ -96,7 +97,9 @@ abstract class UserFormRequest extends \Illuminate\Foundation\Http\FormRequest
// Date field
'properties.*.with_time' => 'boolean|nullable',
'properties.*.use_am_pm' => 'boolean|nullable',
'properties.*.date_range' => 'boolean|nullable',
'properties.*.prefill_today' => 'boolean|nullable',
// Select / Multi Select field
'properties.*.allow_creation' => 'boolean|nullable',

2
app/Http/Resources/FormResource.php
View File

@@ -29,6 +29,7 @@ class FormResource extends JsonResource
'views_count' => $this->when($this->workspace->is_pro, $this->views_count),
'submissions_count' => $this->when($this->workspace->is_pro, $this->submissions_count),
'notifies' => $this->notifies,
'notifies_slack' => $this->notifies_slack,
'send_submission_confirmation' => $this->send_submission_confirmation,
'webhook_url' => $this->webhook_url,
'redirect_url' => $this->redirect_url,
@@ -42,6 +43,7 @@ class FormResource extends JsonResource
'password' => $this->password,
'tags' => $this->tags,
'notification_emails' => $this->notification_emails,
'slack_webhook_url' => $this->slack_webhook_url,
] : [];
$baseData = $this->getFilteredFormData(parent::toArray($request), $userIsFormOwner);