Merge remote-tracking branch 'origin/develop' into develop

This commit is contained in:
2021-03-31 15:50:55 +01:00
8 changed files with 20 additions and 3 deletions

View File

@@ -71,7 +71,7 @@ class ContextAwareValidator
$validator = [];
if ($includeFormName) {
$validator['formName'] = 'required|string|max:100';
$validator['formName'] = 'required|string';
}
foreach ($fields as $fieldName => $field) {

View File

@@ -36,6 +36,8 @@ use Illuminate\Support\Facades\Log;
class ApplicationController extends Controller
{
private function canVote($votes): bool
{
$allvotes = collect([]);

View File

@@ -82,6 +82,7 @@ class FormController extends Controller
public function destroy(Request $request, Form $form)
{
$this->authorize('delete', $form);
$deletable = true;
if (! is_null($form) && ! is_null($form->vacancies) && $form->vacancies->count() !== 0 || ! is_null($form->responses)) {
@@ -97,6 +98,7 @@ class FormController extends Controller
}
return redirect()->back();
}
public function preview(Request $request, Form $form)