[6.x] Forms 2: Permissions#14957

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jasonvarga merged 15 commits into from
Jul 10, 2026
Merged

[6.x] Forms 2: Permissions #14957

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
a0ea00d
Add superseding permissions concept
duncanmcclean Jul 8, 2026
f4dcc93
Rework form permissions
duncanmcclean Jul 8, 2026
fff7c7d
Gate form pages by the new permissions
duncanmcclean Jul 8, 2026
3586efc
Avoid showing forms nav when only one page is accessible
duncanmcclean Jul 8, 2026
55c6513
Merge remote-tracking branch 'origin/forms-2' into forms-2-permissions
jasonvarga Jul 9, 2026
ed41e99
fail closed
jasonvarga Jul 9, 2026
825d3d4
Merge remote-tracking branch 'origin/forms-2' into forms-2-permissions
jasonvarga Jul 9, 2026
d3eefd7
configure forms should hide all the others
jasonvarga Jul 9, 2026
87fb51b
Don't leak submission counts to users who can't view submissions
jasonvarga Jul 10, 2026
895a1b7
Hide mobile nav popover trigger when only one form section is available
jasonvarga Jul 10, 2026
3d255bd
Add authorization test coverage for FormConnectController and FormExp…
jasonvarga Jul 10, 2026
cc58e64
Merge remote-tracking branch 'origin/forms-2' into forms-2-permissions
jasonvarga Jul 10, 2026
9754809
Gate fake submission generator behind configure forms permission
jasonvarga Jul 10, 2026
7579532
Drop redundant super-user test for fake submission generation
jasonvarga Jul 10, 2026
25eea7f
Drop redundant super-user test from FormConnectTest
jasonvarga Jul 10, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions lang/en/permissions.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -72,8 +72,14 @@
'group_forms' => 'Forms',
'configure_forms' => 'Configure forms',
'configure_forms_desc' => 'Grants access to all form related permissions',
'configure_form_fields' => 'Configure Form Fields',
'configure_form_fields_desc' => 'Ability to edit form blueprints, fieldsets, and their fields.',
'edit_forms' => 'Edit forms',
'edit_forms_desc' => 'Grants access to all forms, except their submissions',
'create_forms' => 'Create forms',
'delete_forms' => 'Delete forms',
'view_form_submissions' => 'View submissions',
'view_form_submissions_desc' => 'Grants access to submissions across all forms',
'delete_form_submissions' => 'Delete submissions',
'edit_{form}_form' => 'Edit :form form',
'view_{form}_form_submissions' => 'View :form submissions',
'delete_{form}_form_submissions' => 'Delete :form submissions',

Expand Down
1 change: 1 addition & 0 deletions resources/js/pages/forms/Index.vue
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -73,6 +73,7 @@ const reloadPage = () => router.reload();
</template>
<template #cell-submissions="{ row: form, value: submissions }">
<Badge
v-if="form.can_view_submissions"
:href="form.submissions_url"
:append="String(submissions)"
:text="__('Results')"
Expand Down
24 changes: 14 additions & 10 deletions resources/js/pages/forms/Layout.vue
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,19 +6,23 @@ import { Button } from '@ui';
const page = usePage();
const form = computed(() => page.props.form);

const navItems = [
{ label: __('Edit'), href: cp_url(`forms/${form.value.handle}/builder`) },
{ label: __('Logic'), href: cp_url(`forms/${form.value.handle}/logic`) },
{ label: __('Connect'), href: cp_url(`forms/${form.value.handle}/connect`) },
{ label: __('Results'), href: cp_url(`forms/${form.value.handle}/submissions`) },
{ label: __('Configure'), href: cp_url(`forms/${form.value.handle}/edit`) },
];
const can = (ability) => page.props.can?.[ability] ?? false;

const navItems = computed(() =>
[
can('editFields') && { label: __('Edit'), href: cp_url(`forms/${form.value.handle}/builder`) },
can('editFields') && { label: __('Logic'), href: cp_url(`forms/${form.value.handle}/logic`) },
can('edit') && { label: __('Connect'), href: cp_url(`forms/${form.value.handle}/connect`) },
can('viewSubmissions') && { label: __('Results'), href: cp_url(`forms/${form.value.handle}/submissions`) },
can('edit') && { label: __('Configure'), href: cp_url(`forms/${form.value.handle}/edit`) },
].filter(Boolean),
);

const currentPath = computed(() => new URL(page.url, window.location.origin).pathname);
const isActive = (href) => currentPath.value.includes(new URL(href, window.location.origin).pathname);

const activeSectionLabel = computed(() => {
return navItems.find((item) => isActive(item.href))?.label ?? navItems[0]?.label ?? '';
return navItems.value.find((item) => isActive(item.href))?.label ?? navItems.value[0]?.label ?? '';
});

const closeMobileNavPopover = () => {
Expand All@@ -30,7 +34,7 @@ const closeMobileNavPopover = () => {
<template>
<Teleport to="#global-header-slot">
<div class="flex items-center justify-center">
<div class="global-header-nav-popover lg:hidden">
<div v-if="navItems.length > 1" class="global-header-nav-popover lg:hidden">
<Button
id="anchor-global-header-nav"
variant="ghost"
Expand All@@ -55,7 +59,7 @@ const closeMobileNavPopover = () => {
</nav>
</div>

<nav class="global-header-nav hidden lg:block" :aria-label="__('form_navigation')">
<nav v-if="navItems.length > 1" class="global-header-nav hidden lg:block" :aria-label="__('form_navigation')">
<ul>
<li v-for="navItem in navItems" :key="navItem.href">
<Link
Expand Down
9 changes: 5 additions & 4 deletions resources/js/pages/forms/Submissions.vue
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,7 @@ defineOptions({ layout: [Layout, PanelLayout, FormsLayout] });

const props = defineProps([
'form',
'can',
'columns',
'filters',
'actionUrl',
Expand DownExpand Up@@ -127,11 +128,11 @@ function exportSubmissions() {
{{ __(form.title) }}
</template>

<Dropdown v-if="form.canEdit || form.canDelete" placement="left-start" class="me-2">
<Dropdown v-if="can.edit || can.delete" placement="left-start" class="me-2">
<DropdownMenu>
<DropdownItem v-if="form.canEdit" :text="__('Configure Form')" icon="cog" :href="form.editUrl" />
<DropdownItem v-if="can.edit" :text="__('Configure Form')" icon="cog" :href="form.editUrl" />
<DropdownItem
v-if="form.canDelete"
v-if="can.delete"
:text="__('Delete Form')"
icon="trash"
variant="destructive"
Expand All@@ -155,7 +156,7 @@ function exportSubmissions() {
/>

<ResourceDeleter
v-if="form.canDelete"
v-if="can.delete"
ref="deleter"
:resource-title="form.title"
:route="form.deleteUrl"
Expand Down
11 changes: 5 additions & 6 deletions src/Actions/DeleteFakeSubmissions.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -27,7 +27,7 @@ public function visibleTo($item)

public function authorize($user, $item)
{
return $user->can('delete', $item);
return $user->can('generateFakeSubmissions', $item->form());
}

public function run($items, $values)
Expand All@@ -41,12 +41,11 @@ public function run($items, $values)

$fakeSubmissions = $form->submissions()->filter(fn ($submission) => (bool) $submission->get('_fake'));
$currentUser = request()->user() ? User::fromUser(request()->user()) : null;
$requiredPermission = "delete {$form->handle()} form submissions";
$isSuper = $currentUser && method_exists($currentUser, 'isSuper') && $currentUser->isSuper();
$canConfigureForms = $currentUser && method_exists($currentUser, 'hasPermission') && $currentUser->hasPermission('configure forms');
$canDeleteSubmissions = $currentUser && method_exists($currentUser, 'hasPermission') && $currentUser->hasPermission($requiredPermission);

if (! $isSuper && ! $canConfigureForms && ! $canDeleteSubmissions) {
// The UI always posts the `_all_fake_submissions_` sentinel, which resolves to an
// empty $items collection in ActionController, so authorize() never actually runs
// for this flow. This check is the real enforcement point for the UI-driven request.
if (! $currentUser || $currentUser->cant('generateFakeSubmissions', $form)) {
throw new Exception(__('You are not authorized to run this action.'));
}

Expand Down
24 changes: 22 additions & 2 deletions src/Auth/CorePermissions.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,6 @@ public function boot()
$this->register('access cp');
$this->register('configure sites');
$this->register('configure fields');
$this->register('configure form fields');
$this->register('manage preferences');
});

Expand DownExpand Up@@ -209,8 +208,29 @@ protected function registerForms()
{
$this->register('configure forms');

$this->register('view {form} form submissions', function ($permission) {
$this->register('edit forms', function ($permission) {
$this->permission($permission)->hiddenBy('configure forms')->children([
$this->permission('create forms'),
$this->permission('delete forms'),
]);
});

$this->register('view form submissions', function ($permission) {
$this->permission($permission)->hiddenBy('configure forms')->children([
$this->permission('delete form submissions'),
]);
});

$this->register('edit {form} form', function ($permission) {
$this->permission($permission)->hiddenBy(['configure forms', 'edit forms'])->replacements('form', function () {
return Form::all()->map(function ($form) {
return ['value' => $form->handle(), 'label' => __($form->title())];
});
});
});

$this->register('view {form} form submissions', function ($permission) {
$this->permission($permission)->hiddenBy(['configure forms', 'view form submissions'])->children([
$this->permission('delete {form} form submissions'),
])->replacements('form', function () {
return Form::all()->map(function ($form) {
Expand Down
2 changes: 1 addition & 1 deletion src/Forms/Widget.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -21,7 +21,7 @@ public function component()
]);
}

if (! User::current()->can('view', $form)) {
if (! User::current()->can('viewSubmissions', $form)) {
return;
}

Expand Down
22 changes: 22 additions & 0 deletions src/Http/Controllers/CP/Forms/Concerns/ProvidesFormAbilities.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
<?php

namespace Statamic\Http\Controllers\CP\Forms\Concerns;

use Statamic\Contracts\Forms\Form;
use Statamic\Facades\User;

trait ProvidesFormAbilities
{
private function formAbilities(Form $form): array
{
$user = User::current();

return [
'edit' => $user->can('edit', $form),
'delete' => $user->can('delete', $form),
'editFields' => $user->can('editFields', $form),
'viewSubmissions' => $user->can('viewSubmissions', $form),
'generateFakeSubmissions' => $user->can('generateFakeSubmissions', $form),
];
}
}
8 changes: 5 additions & 3 deletions src/Http/Controllers/CP/Forms/FormBuilderController.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,22 +13,24 @@
use Statamic\Forms\Fields\FormFieldtype;
use Statamic\Forms\Fieldtypes\Fallback;
use Statamic\Http\Controllers\CP\CpController;
use Statamic\Http\Controllers\CP\Forms\Concerns\ProvidesFormAbilities;
use Statamic\Statamic;
use Statamic\Support\Arr;

use function Statamic\trans as __;

class FormBuilderController extends CpController
{
use ManagesFormFields;
use ManagesFormFields, ProvidesFormAbilities;

public function edit($form)
{
$this->authorize('edit', $form);
$this->authorize('editFields', $form);

return Inertia::render('forms/Builder', [
...$this->fieldProps(),
'form' => $form,
'can' => $this->formAbilities($form),
'initialFormFields' => $this->toVueObject($form->formFields()),
'formsProInstalled' => Statamic::formsProInstalled(),
'fieldtypes' => $this->fieldtypes()->map(fn (FormFieldtype $fieldtype): array => [
Expand All@@ -42,7 +44,7 @@ public function edit($form)

public function update(Request $request, $form)
{
$this->authorize('edit', $form);
$this->authorize('editFields', $form);

$request->validate([
'pages' => ['required', 'array', 'min:1'],
Expand Down
4 changes: 4 additions & 0 deletions src/Http/Controllers/CP/Forms/FormConnectController.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,15 +4,19 @@

use Inertia\Inertia;
use Statamic\Http\Controllers\CP\CpController;
use Statamic\Http\Controllers\CP\Forms\Concerns\ProvidesFormAbilities;

class FormConnectController extends CpController
{
use ProvidesFormAbilities;

public function __invoke($form)
{
$this->authorize('edit', $form);

return Inertia::render('forms/Connect', [
'form' => $form,
'can' => $this->formAbilities($form),
]);
}
}
2 changes: 1 addition & 1 deletion src/Http/Controllers/CP/Forms/FormExportController.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,7 @@ class FormExportController extends CpController

public function export(FilteredRequest $request, $form, $type)
{
$this->authorize('view', $form);
$this->authorize('viewSubmissions', $form);

if (! $exporter = $form->exporter($type)) {
throw new NotFoundHttpException;
Expand Down
8 changes: 4 additions & 4 deletions src/Http/Controllers/CP/Forms/FormFieldsController.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,9 +15,9 @@

class FormFieldsController extends CpController
{
public function edit(Request $request)
public function edit(Request $request, $form)
{
// todo: add authorization
$this->authorize('editFields', $form);

$request->validate([
'type' => 'required',
Expand DownExpand Up@@ -56,9 +56,9 @@ public function edit(Request $request)
];
}

public function update(Request $request)
public function update(Request $request, $form)
{
// todo: add authorization
$this->authorize('editFields', $form);

$request->validate([
'type' => 'required',
Expand Down
4 changes: 2 additions & 2 deletions src/Http/Controllers/CP/Forms/FormFieldsetPreviewsController.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,9 +9,9 @@

class FormFieldsetPreviewsController extends CpController
{
public function __invoke(Request $request)
public function __invoke(Request $request, $form)
{
// todo: add authorization
$this->authorize('editFields', $form);

$request->validate([
'fieldset' => 'required|string',
Expand Down
8 changes: 5 additions & 3 deletions src/Http/Controllers/CP/Forms/FormLogicController.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,26 +5,28 @@
use Illuminate\Http\Request;
use Inertia\Inertia;
use Statamic\Http\Controllers\CP\CpController;
use Statamic\Http\Controllers\CP\Forms\Concerns\ProvidesFormAbilities;

class FormLogicController extends CpController
{
use ManagesFormFields;
use ManagesFormFields, ProvidesFormAbilities;

public function edit($form)
{
$this->authorize('edit', $form);
$this->authorize('editFields', $form);

return Inertia::render('forms/Logic', [
...$this->fieldProps(),
'form' => $form,
'can' => $this->formAbilities($form),
'formFields' => $this->toVueObject($form->formFields()),
'action' => cp_route('forms.logic.update', $form->handle()),
]);
}

public function update(Request $request, $form)
{
$this->authorize('edit', $form);
$this->authorize('editFields', $form);

$this->setFormFields($request, $form);

Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
[6.x] Forms 2: Permissions#14957

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

jasonvarga
merged 15 commits into

from

Jul 10, 2026
 Merged


[6.x] Forms 2: Permissions
#14957
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


15 commits


Select commit
Hold shift + click to select a range
a0ea00d

Add superseding permissions concept


duncanmcclean Jul 8, 2026
f4dcc93

Rework form permissions


duncanmcclean Jul 8, 2026
fff7c7d

Gate form pages by the new permissions


duncanmcclean Jul 8, 2026
3586efc

Avoid showing forms nav when only one page is accessible


duncanmcclean Jul 8, 2026
55c6513

Merge remote-tracking branch 'origin/forms-2' into forms-2-permissions


jasonvarga Jul 9, 2026
ed41e99

fail closed


jasonvarga Jul 9, 2026
825d3d4

Merge remote-tracking branch 'origin/forms-2' into forms-2-permissions


jasonvarga Jul 9, 2026
d3eefd7

configure forms should hide all the others


jasonvarga Jul 9, 2026
87fb51b

Don't leak submission counts to users who can't view submissions


jasonvarga Jul 10, 2026
895a1b7

Hide mobile nav popover trigger when only one form section is available


jasonvarga Jul 10, 2026
3d255bd

Add authorization test coverage for FormConnectController and FormExp…


jasonvarga Jul 10, 2026
cc58e64

Merge remote-tracking branch 'origin/forms-2' into forms-2-permissions


jasonvarga Jul 10, 2026
9754809

Gate fake submission generator behind configure forms permission


jasonvarga Jul 10, 2026
7579532

Drop redundant super-user test for fake submission generation


jasonvarga Jul 10, 2026
25eea7f

Drop redundant super-user test from FormConnectTest


jasonvarga Jul 10, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


10 changes: 8 additions & 2 deletions
lang/en/permissions.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -72,8 +72,14 @@
 'group_forms' => 'Forms',
 'configure_forms' => 'Configure forms',
 'configure_forms_desc' => 'Grants access to all form related permissions',
 'configure_form_fields' => 'Configure Form Fields',
 'configure_form_fields_desc' => 'Ability to edit form blueprints, fieldsets, and their fields.',
 'edit_forms' => 'Edit forms',
 'edit_forms_desc' => 'Grants access to all forms, except their submissions',
 'create_forms' => 'Create forms',
 'delete_forms' => 'Delete forms',
 'view_form_submissions' => 'View submissions',
 'view_form_submissions_desc' => 'Grants access to submissions across all forms',
 'delete_form_submissions' => 'Delete submissions',
 'edit_{form}_form' => 'Edit :form form',
 'view_{form}_form_submissions' => 'View :form submissions',
 'delete_{form}_form_submissions' => 'Delete :form submissions',

Expand Down

1 change: 1 addition & 0 deletions
resources/js/pages/forms/Index.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -73,6 +73,7 @@ const reloadPage = () => router.reload();
 </template>
 <template #cell-submissions="{ row: form, value: submissions }">
 <Badge
 v-if="form.can_view_submissions"
 :href="form.submissions_url"
 :append="String(submissions)"
 :text="__('Results')"
Expand Down

24 changes: 14 additions & 10 deletions
resources/js/pages/forms/Layout.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,19 +6,23 @@ import { Button } from '@ui';
const page = usePage();
const form = computed(() => page.props.form);

const navItems = [
 { label: __('Edit'), href: cp_url(`forms/${form.value.handle}/builder`) },
 { label: __('Logic'), href: cp_url(`forms/${form.value.handle}/logic`) },
 { label: __('Connect'), href: cp_url(`forms/${form.value.handle}/connect`) },
 { label: __('Results'), href: cp_url(`forms/${form.value.handle}/submissions`) },
 { label: __('Configure'), href: cp_url(`forms/${form.value.handle}/edit`) },
];
const can = (ability) => page.props.can?.[ability] ?? false;

const navItems = computed(() =>
 [
 can('editFields') && { label: __('Edit'), href: cp_url(`forms/${form.value.handle}/builder`) },
 can('editFields') && { label: __('Logic'), href: cp_url(`forms/${form.value.handle}/logic`) },
 can('edit') && { label: __('Connect'), href: cp_url(`forms/${form.value.handle}/connect`) },
 can('viewSubmissions') && { label: __('Results'), href: cp_url(`forms/${form.value.handle}/submissions`) },
 can('edit') && { label: __('Configure'), href: cp_url(`forms/${form.value.handle}/edit`) },
 ].filter(Boolean),
);

const currentPath = computed(() => new URL(page.url, window.location.origin).pathname);
const isActive = (href) => currentPath.value.includes(new URL(href, window.location.origin).pathname);

const activeSectionLabel = computed(() => {
 return navItems.find((item) => isActive(item.href))?.label ?? navItems[0]?.label ?? '';
 return navItems.value.find((item) => isActive(item.href))?.label ?? navItems.value[0]?.label ?? '';
});

const closeMobileNavPopover = () => {
Expand All@@ -30,7 +34,7 @@ const closeMobileNavPopover = () => {
<template>
 <Teleport to="#global-header-slot">
 <div class="flex items-center justify-center">
 <div class="global-header-nav-popover lg:hidden">
 <div v-if="navItems.length > 1" class="global-header-nav-popover lg:hidden">
 <Button
 id="anchor-global-header-nav"
 variant="ghost"
Expand All@@ -55,7 +59,7 @@ const closeMobileNavPopover = () => {
 </nav>
 </div>

 <nav class="global-header-nav hidden lg:block" :aria-label="__('form_navigation')">
 <nav v-if="navItems.length > 1" class="global-header-nav hidden lg:block" :aria-label="__('form_navigation')">
 <ul>
 <li v-for="navItem in navItems" :key="navItem.href">
 <Link
Expand Down

9 changes: 5 additions & 4 deletions
resources/js/pages/forms/Submissions.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,7 @@ defineOptions({ layout: [Layout, PanelLayout, FormsLayout] });

const props = defineProps([
 'form',
 'can',
 'columns',
 'filters',
 'actionUrl',
Expand DownExpand Up@@ -127,11 +128,11 @@ function exportSubmissions() {
 {{ __(form.title) }}
 </template>

 <Dropdown v-if="form.canEdit || form.canDelete" placement="left-start" class="me-2">
 <Dropdown v-if="can.edit || can.delete" placement="left-start" class="me-2">
 <DropdownMenu>
 <DropdownItem v-if="form.canEdit" :text="__('Configure Form')" icon="cog" :href="form.editUrl" />
 <DropdownItem v-if="can.edit" :text="__('Configure Form')" icon="cog" :href="form.editUrl" />
 <DropdownItem
 v-if="form.canDelete"
 v-if="can.delete"
 :text="__('Delete Form')"
 icon="trash"
 variant="destructive"
Expand All@@ -155,7 +156,7 @@ function exportSubmissions() {
 />

 <ResourceDeleter
 v-if="form.canDelete"
 v-if="can.delete"
 ref="deleter"
 :resource-title="form.title"
 :route="form.deleteUrl"
Expand Down

11 changes: 5 additions & 6 deletions
src/Actions/DeleteFakeSubmissions.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,7 +27,7 @@ public function visibleTo($item)

 public function authorize($user, $item)
 {
 return $user->can('delete', $item);
 return $user->can('generateFakeSubmissions', $item->form());
 }

 public function run($items, $values)
Expand All@@ -41,12 +41,11 @@ public function run($items, $values)

 $fakeSubmissions = $form->submissions()->filter(fn ($submission) => (bool) $submission->get('_fake'));
 $currentUser = request()->user() ? User::fromUser(request()->user()) : null;
 $requiredPermission = "delete {$form->handle()} form submissions";
 $isSuper = $currentUser && method_exists($currentUser, 'isSuper') && $currentUser->isSuper();
 $canConfigureForms = $currentUser && method_exists($currentUser, 'hasPermission') && $currentUser->hasPermission('configure forms');
 $canDeleteSubmissions = $currentUser && method_exists($currentUser, 'hasPermission') && $currentUser->hasPermission($requiredPermission);

 if (! $isSuper && ! $canConfigureForms && ! $canDeleteSubmissions) {
 // The UI always posts the `_all_fake_submissions_` sentinel, which resolves to an
 // empty $items collection in ActionController, so authorize() never actually runs
 // for this flow. This check is the real enforcement point for the UI-driven request.
 if (! $currentUser || $currentUser->cant('generateFakeSubmissions', $form)) {
 throw new Exception(__('You are not authorized to run this action.'));
 }

Expand Down

24 changes: 22 additions & 2 deletions
src/Auth/CorePermissions.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,6 @@ public function boot()
 $this->register('access cp');
 $this->register('configure sites');
 $this->register('configure fields');
 $this->register('configure form fields');
 $this->register('manage preferences');
 });

Expand DownExpand Up@@ -209,8 +208,29 @@ protected function registerForms()
 {
 $this->register('configure forms');

 $this->register('view {form} form submissions', function ($permission) {
 $this->register('edit forms', function ($permission) {
 $this->permission($permission)->hiddenBy('configure forms')->children([
 $this->permission('create forms'),
 $this->permission('delete forms'),
 ]);
 });

 $this->register('view form submissions', function ($permission) {
 $this->permission($permission)->hiddenBy('configure forms')->children([
 $this->permission('delete form submissions'),
 ]);
 });

 $this->register('edit {form} form', function ($permission) {
 $this->permission($permission)->hiddenBy(['configure forms', 'edit forms'])->replacements('form', function () {
 return Form::all()->map(function ($form) {
 return ['value' => $form->handle(), 'label' => __($form->title())];
 });
 });
 });

 $this->register('view {form} form submissions', function ($permission) {
 $this->permission($permission)->hiddenBy(['configure forms', 'view form submissions'])->children([
 $this->permission('delete {form} form submissions'),
 ])->replacements('form', function () {
 return Form::all()->map(function ($form) {
Expand Down

2 changes: 1 addition & 1 deletion
src/Forms/Widget.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,7 +21,7 @@ public function component()
 ]);
 }

 if (! User::current()->can('view', $form)) {
 if (! User::current()->can('viewSubmissions', $form)) {
 return;
 }

Expand Down

22 changes: 22 additions & 0 deletions
src/Http/Controllers/CP/Forms/Concerns/ProvidesFormAbilities.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
<?php

namespace Statamic\Http\Controllers\CP\Forms\Concerns;

use Statamic\Contracts\Forms\Form;
use Statamic\Facades\User;

trait ProvidesFormAbilities
{
 private function formAbilities(Form $form): array
 {
 $user = User::current();

 return [
 'edit' => $user->can('edit', $form),
 'delete' => $user->can('delete', $form),
 'editFields' => $user->can('editFields', $form),
 'viewSubmissions' => $user->can('viewSubmissions', $form),
 'generateFakeSubmissions' => $user->can('generateFakeSubmissions', $form),
 ];
 }
}

8 changes: 5 additions & 3 deletions
src/Http/Controllers/CP/Forms/FormBuilderController.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,22 +13,24 @@
use Statamic\Forms\Fields\FormFieldtype;
use Statamic\Forms\Fieldtypes\Fallback;
use Statamic\Http\Controllers\CP\CpController;
use Statamic\Http\Controllers\CP\Forms\Concerns\ProvidesFormAbilities;
use Statamic\Statamic;
use Statamic\Support\Arr;

use function Statamic\trans as __;

class FormBuilderController extends CpController
{
 use ManagesFormFields;
 use ManagesFormFields, ProvidesFormAbilities;

 public function edit($form)
 {
 $this->authorize('edit', $form);
 $this->authorize('editFields', $form);

 return Inertia::render('forms/Builder', [
 ...$this->fieldProps(),
 'form' => $form,
 'can' => $this->formAbilities($form),
 'initialFormFields' => $this->toVueObject($form->formFields()),
 'formsProInstalled' => Statamic::formsProInstalled(),
 'fieldtypes' => $this->fieldtypes()->map(fn (FormFieldtype $fieldtype): array => [
Expand All@@ -42,7 +44,7 @@ public function edit($form)

 public function update(Request $request, $form)
 {
 $this->authorize('edit', $form);
 $this->authorize('editFields', $form);

 $request->validate([
 'pages' => ['required', 'array', 'min:1'],
Expand Down

4 changes: 4 additions & 0 deletions
src/Http/Controllers/CP/Forms/FormConnectController.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,15 +4,19 @@

use Inertia\Inertia;
use Statamic\Http\Controllers\CP\CpController;
use Statamic\Http\Controllers\CP\Forms\Concerns\ProvidesFormAbilities;

class FormConnectController extends CpController
{
 use ProvidesFormAbilities;

 public function __invoke($form)
 {
 $this->authorize('edit', $form);

 return Inertia::render('forms/Connect', [
 'form' => $form,
 'can' => $this->formAbilities($form),
 ]);
 }
}

2 changes: 1 addition & 1 deletion
src/Http/Controllers/CP/Forms/FormExportController.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,7 @@ class FormExportController extends CpController

 public function export(FilteredRequest $request, $form, $type)
 {
 $this->authorize('view', $form);
 $this->authorize('viewSubmissions', $form);

 if (! $exporter = $form->exporter($type)) {
 throw new NotFoundHttpException;
Expand Down

8 changes: 4 additions & 4 deletions
src/Http/Controllers/CP/Forms/FormFieldsController.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,9 +15,9 @@

class FormFieldsController extends CpController
{
 public function edit(Request $request)
 public function edit(Request $request, $form)
 {
// todo: add authorization
$this->authorize('editFields', $form);

 $request->validate([
 'type' => 'required',
Expand DownExpand Up@@ -56,9 +56,9 @@ public function edit(Request $request)
 ];
 }

 public function update(Request $request)
 public function update(Request $request, $form)
 {
// todo: add authorization
$this->authorize('editFields', $form);

 $request->validate([
 'type' => 'required',
Expand Down

4 changes: 2 additions & 2 deletions
src/Http/Controllers/CP/Forms/FormFieldsetPreviewsController.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,9 +9,9 @@

class FormFieldsetPreviewsController extends CpController
{
 public function __invoke(Request $request)
 public function __invoke(Request $request, $form)
 {
// todo: add authorization
$this->authorize('editFields', $form);

 $request->validate([
 'fieldset' => 'required|string',
Expand Down

8 changes: 5 additions & 3 deletions
src/Http/Controllers/CP/Forms/FormLogicController.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,26 +5,28 @@
use Illuminate\Http\Request;
use Inertia\Inertia;
use Statamic\Http\Controllers\CP\CpController;
use Statamic\Http\Controllers\CP\Forms\Concerns\ProvidesFormAbilities;

class FormLogicController extends CpController
{
 use ManagesFormFields;
 use ManagesFormFields, ProvidesFormAbilities;

 public function edit($form)
 {
 $this->authorize('edit', $form);
 $this->authorize('editFields', $form);

 return Inertia::render('forms/Logic', [
 ...$this->fieldProps(),
 'form' => $form,
 'can' => $this->formAbilities($form),
 'formFields' => $this->toVueObject($form->formFields()),
 'action' => cp_route('forms.logic.update', $form->handle()),
 ]);
 }

 public function update(Request $request, $form)
 {
 $this->authorize('edit', $form);
 $this->authorize('editFields', $form);

 $this->setFormFields($request, $form);

Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[6.x] Forms 2: Permissions#14957

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

jasonvarga
merged 15 commits into

from

Jul 10, 2026
 Merged


[6.x] Forms 2: Permissions
#14957
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


15 commits


Select commit
Hold shift + click to select a range
a0ea00d

Add superseding permissions concept


duncanmcclean Jul 8, 2026
f4dcc93

Rework form permissions


duncanmcclean Jul 8, 2026
fff7c7d

Gate form pages by the new permissions


duncanmcclean Jul 8, 2026
3586efc

Avoid showing forms nav when only one page is accessible


duncanmcclean Jul 8, 2026
55c6513

Merge remote-tracking branch 'origin/forms-2' into forms-2-permissions


jasonvarga Jul 9, 2026
ed41e99

fail closed


jasonvarga Jul 9, 2026
825d3d4

Merge remote-tracking branch 'origin/forms-2' into forms-2-permissions


jasonvarga Jul 9, 2026
d3eefd7

configure forms should hide all the others


jasonvarga Jul 9, 2026
87fb51b

Don't leak submission counts to users who can't view submissions


jasonvarga Jul 10, 2026
895a1b7

Hide mobile nav popover trigger when only one form section is available


jasonvarga Jul 10, 2026
3d255bd

Add authorization test coverage for FormConnectController and FormExp…


jasonvarga Jul 10, 2026
cc58e64

Merge remote-tracking branch 'origin/forms-2' into forms-2-permissions


jasonvarga Jul 10, 2026
9754809

Gate fake submission generator behind configure forms permission


jasonvarga Jul 10, 2026
7579532

Drop redundant super-user test for fake submission generation


jasonvarga Jul 10, 2026
25eea7f

Drop redundant super-user test from FormConnectTest


jasonvarga Jul 10, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


10 changes: 8 additions & 2 deletions
lang/en/permissions.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -72,8 +72,14 @@
 'group_forms' => 'Forms',
 'configure_forms' => 'Configure forms',
 'configure_forms_desc' => 'Grants access to all form related permissions',
 'configure_form_fields' => 'Configure Form Fields',
 'configure_form_fields_desc' => 'Ability to edit form blueprints, fieldsets, and their fields.',
 'edit_forms' => 'Edit forms',
 'edit_forms_desc' => 'Grants access to all forms, except their submissions',
 'create_forms' => 'Create forms',
 'delete_forms' => 'Delete forms',
 'view_form_submissions' => 'View submissions',
 'view_form_submissions_desc' => 'Grants access to submissions across all forms',
 'delete_form_submissions' => 'Delete submissions',
 'edit_{form}_form' => 'Edit :form form',
 'view_{form}_form_submissions' => 'View :form submissions',
 'delete_{form}_form_submissions' => 'Delete :form submissions',

Expand Down

1 change: 1 addition & 0 deletions
resources/js/pages/forms/Index.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -73,6 +73,7 @@ const reloadPage = () => router.reload();
 </template>
 <template #cell-submissions="{ row: form, value: submissions }">
 <Badge
 v-if="form.can_view_submissions"
 :href="form.submissions_url"
 :append="String(submissions)"
 :text="__('Results')"
Expand Down

24 changes: 14 additions & 10 deletions
resources/js/pages/forms/Layout.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,19 +6,23 @@ import { Button } from '@ui';
const page = usePage();
const form = computed(() => page.props.form);

const navItems = [
 { label: __('Edit'), href: cp_url(`forms/${form.value.handle}/builder`) },
 { label: __('Logic'), href: cp_url(`forms/${form.value.handle}/logic`) },
 { label: __('Connect'), href: cp_url(`forms/${form.value.handle}/connect`) },
 { label: __('Results'), href: cp_url(`forms/${form.value.handle}/submissions`) },
 { label: __('Configure'), href: cp_url(`forms/${form.value.handle}/edit`) },
];
const can = (ability) => page.props.can?.[ability] ?? false;

const navItems = computed(() =>
 [
 can('editFields') && { label: __('Edit'), href: cp_url(`forms/${form.value.handle}/builder`) },
 can('editFields') && { label: __('Logic'), href: cp_url(`forms/${form.value.handle}/logic`) },
 can('edit') && { label: __('Connect'), href: cp_url(`forms/${form.value.handle}/connect`) },
 can('viewSubmissions') && { label: __('Results'), href: cp_url(`forms/${form.value.handle}/submissions`) },
 can('edit') && { label: __('Configure'), href: cp_url(`forms/${form.value.handle}/edit`) },
 ].filter(Boolean),
);

const currentPath = computed(() => new URL(page.url, window.location.origin).pathname);
const isActive = (href) => currentPath.value.includes(new URL(href, window.location.origin).pathname);

const activeSectionLabel = computed(() => {
 return navItems.find((item) => isActive(item.href))?.label ?? navItems[0]?.label ?? '';
 return navItems.value.find((item) => isActive(item.href))?.label ?? navItems.value[0]?.label ?? '';
});

const closeMobileNavPopover = () => {
Expand All@@ -30,7 +34,7 @@ const closeMobileNavPopover = () => {
<template>
 <Teleport to="#global-header-slot">
 <div class="flex items-center justify-center">
 <div class="global-header-nav-popover lg:hidden">
 <div v-if="navItems.length > 1" class="global-header-nav-popover lg:hidden">
 <Button
 id="anchor-global-header-nav"
 variant="ghost"
Expand All@@ -55,7 +59,7 @@ const closeMobileNavPopover = () => {
 </nav>
 </div>

 <nav class="global-header-nav hidden lg:block" :aria-label="__('form_navigation')">
 <nav v-if="navItems.length > 1" class="global-header-nav hidden lg:block" :aria-label="__('form_navigation')">
 <ul>
 <li v-for="navItem in navItems" :key="navItem.href">
 <Link
Expand Down

9 changes: 5 additions & 4 deletions
resources/js/pages/forms/Submissions.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,7 @@ defineOptions({ layout: [Layout, PanelLayout, FormsLayout] });

const props = defineProps([
 'form',
 'can',
 'columns',
 'filters',
 'actionUrl',
Expand DownExpand Up@@ -127,11 +128,11 @@ function exportSubmissions() {
 {{ __(form.title) }}
 </template>

 <Dropdown v-if="form.canEdit || form.canDelete" placement="left-start" class="me-2">
 <Dropdown v-if="can.edit || can.delete" placement="left-start" class="me-2">
 <DropdownMenu>
 <DropdownItem v-if="form.canEdit" :text="__('Configure Form')" icon="cog" :href="form.editUrl" />
 <DropdownItem v-if="can.edit" :text="__('Configure Form')" icon="cog" :href="form.editUrl" />
 <DropdownItem
 v-if="form.canDelete"
 v-if="can.delete"
 :text="__('Delete Form')"
 icon="trash"
 variant="destructive"
Expand All@@ -155,7 +156,7 @@ function exportSubmissions() {
 />

 <ResourceDeleter
 v-if="form.canDelete"
 v-if="can.delete"
 ref="deleter"
 :resource-title="form.title"
 :route="form.deleteUrl"
Expand Down

11 changes: 5 additions & 6 deletions
src/Actions/DeleteFakeSubmissions.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,7 +27,7 @@ public function visibleTo($item)

 public function authorize($user, $item)
 {
 return $user->can('delete', $item);
 return $user->can('generateFakeSubmissions', $item->form());
 }

 public function run($items, $values)
Expand All@@ -41,12 +41,11 @@ public function run($items, $values)

 $fakeSubmissions = $form->submissions()->filter(fn ($submission) => (bool) $submission->get('_fake'));
 $currentUser = request()->user() ? User::fromUser(request()->user()) : null;
 $requiredPermission = "delete {$form->handle()} form submissions";
 $isSuper = $currentUser && method_exists($currentUser, 'isSuper') && $currentUser->isSuper();
 $canConfigureForms = $currentUser && method_exists($currentUser, 'hasPermission') && $currentUser->hasPermission('configure forms');
 $canDeleteSubmissions = $currentUser && method_exists($currentUser, 'hasPermission') && $currentUser->hasPermission($requiredPermission);

 if (! $isSuper && ! $canConfigureForms && ! $canDeleteSubmissions) {
 // The UI always posts the `_all_fake_submissions_` sentinel, which resolves to an
 // empty $items collection in ActionController, so authorize() never actually runs
 // for this flow. This check is the real enforcement point for the UI-driven request.
 if (! $currentUser || $currentUser->cant('generateFakeSubmissions', $form)) {
 throw new Exception(__('You are not authorized to run this action.'));
 }

Expand Down

24 changes: 22 additions & 2 deletions
src/Auth/CorePermissions.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,6 @@ public function boot()
 $this->register('access cp');
 $this->register('configure sites');
 $this->register('configure fields');
 $this->register('configure form fields');
 $this->register('manage preferences');
 });

Expand DownExpand Up@@ -209,8 +208,29 @@ protected function registerForms()
 {
 $this->register('configure forms');

 $this->register('view {form} form submissions', function ($permission) {
 $this->register('edit forms', function ($permission) {
 $this->permission($permission)->hiddenBy('configure forms')->children([
 $this->permission('create forms'),
 $this->permission('delete forms'),
 ]);
 });

 $this->register('view form submissions', function ($permission) {
 $this->permission($permission)->hiddenBy('configure forms')->children([
 $this->permission('delete form submissions'),
 ]);
 });

 $this->register('edit {form} form', function ($permission) {
 $this->permission($permission)->hiddenBy(['configure forms', 'edit forms'])->replacements('form', function () {
 return Form::all()->map(function ($form) {
 return ['value' => $form->handle(), 'label' => __($form->title())];
 });
 });
 });

 $this->register('view {form} form submissions', function ($permission) {
 $this->permission($permission)->hiddenBy(['configure forms', 'view form submissions'])->children([
 $this->permission('delete {form} form submissions'),
 ])->replacements('form', function () {
 return Form::all()->map(function ($form) {
Expand Down

2 changes: 1 addition & 1 deletion
src/Forms/Widget.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,7 +21,7 @@ public function component()
 ]);
 }

 if (! User::current()->can('view', $form)) {
 if (! User::current()->can('viewSubmissions', $form)) {
 return;
 }

Expand Down

22 changes: 22 additions & 0 deletions
src/Http/Controllers/CP/Forms/Concerns/ProvidesFormAbilities.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
<?php

namespace Statamic\Http\Controllers\CP\Forms\Concerns;

use Statamic\Contracts\Forms\Form;
use Statamic\Facades\User;

trait ProvidesFormAbilities
{
 private function formAbilities(Form $form): array
 {
 $user = User::current();

 return [
 'edit' => $user->can('edit', $form),
 'delete' => $user->can('delete', $form),
 'editFields' => $user->can('editFields', $form),
 'viewSubmissions' => $user->can('viewSubmissions', $form),
 'generateFakeSubmissions' => $user->can('generateFakeSubmissions', $form),
 ];
 }
}

8 changes: 5 additions & 3 deletions
src/Http/Controllers/CP/Forms/FormBuilderController.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,22 +13,24 @@
use Statamic\Forms\Fields\FormFieldtype;
use Statamic\Forms\Fieldtypes\Fallback;
use Statamic\Http\Controllers\CP\CpController;
use Statamic\Http\Controllers\CP\Forms\Concerns\ProvidesFormAbilities;
use Statamic\Statamic;
use Statamic\Support\Arr;

use function Statamic\trans as __;

class FormBuilderController extends CpController
{
 use ManagesFormFields;
 use ManagesFormFields, ProvidesFormAbilities;

 public function edit($form)
 {
 $this->authorize('edit', $form);
 $this->authorize('editFields', $form);

 return Inertia::render('forms/Builder', [
 ...$this->fieldProps(),
 'form' => $form,
 'can' => $this->formAbilities($form),
 'initialFormFields' => $this->toVueObject($form->formFields()),
 'formsProInstalled' => Statamic::formsProInstalled(),
 'fieldtypes' => $this->fieldtypes()->map(fn (FormFieldtype $fieldtype): array => [
Expand All@@ -42,7 +44,7 @@ public function edit($form)

 public function update(Request $request, $form)
 {
 $this->authorize('edit', $form);
 $this->authorize('editFields', $form);

 $request->validate([
 'pages' => ['required', 'array', 'min:1'],
Expand Down

4 changes: 4 additions & 0 deletions
src/Http/Controllers/CP/Forms/FormConnectController.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,15 +4,19 @@

use Inertia\Inertia;
use Statamic\Http\Controllers\CP\CpController;
use Statamic\Http\Controllers\CP\Forms\Concerns\ProvidesFormAbilities;

class FormConnectController extends CpController
{
 use ProvidesFormAbilities;

 public function __invoke($form)
 {
 $this->authorize('edit', $form);

 return Inertia::render('forms/Connect', [
 'form' => $form,
 'can' => $this->formAbilities($form),
 ]);
 }
}

2 changes: 1 addition & 1 deletion
src/Http/Controllers/CP/Forms/FormExportController.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,7 @@ class FormExportController extends CpController

 public function export(FilteredRequest $request, $form, $type)
 {
 $this->authorize('view', $form);
 $this->authorize('viewSubmissions', $form);

 if (! $exporter = $form->exporter($type)) {
 throw new NotFoundHttpException;
Expand Down

8 changes: 4 additions & 4 deletions
src/Http/Controllers/CP/Forms/FormFieldsController.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,9 +15,9 @@

class FormFieldsController extends CpController
{
 public function edit(Request $request)
 public function edit(Request $request, $form)
 {
// todo: add authorization
$this->authorize('editFields', $form);

 $request->validate([
 'type' => 'required',
Expand DownExpand Up@@ -56,9 +56,9 @@ public function edit(Request $request)
 ];
 }

 public function update(Request $request)
 public function update(Request $request, $form)
 {
// todo: add authorization
$this->authorize('editFields', $form);

 $request->validate([
 'type' => 'required',
Expand Down

4 changes: 2 additions & 2 deletions
src/Http/Controllers/CP/Forms/FormFieldsetPreviewsController.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,9 +9,9 @@

class FormFieldsetPreviewsController extends CpController
{
 public function __invoke(Request $request)
 public function __invoke(Request $request, $form)
 {
// todo: add authorization
$this->authorize('editFields', $form);

 $request->validate([
 'fieldset' => 'required|string',
Expand Down

8 changes: 5 additions & 3 deletions
src/Http/Controllers/CP/Forms/FormLogicController.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,26 +5,28 @@
use Illuminate\Http\Request;
use Inertia\Inertia;
use Statamic\Http\Controllers\CP\CpController;
use Statamic\Http\Controllers\CP\Forms\Concerns\ProvidesFormAbilities;

class FormLogicController extends CpController
{
 use ManagesFormFields;
 use ManagesFormFields, ProvidesFormAbilities;

 public function edit($form)
 {
 $this->authorize('edit', $form);
 $this->authorize('editFields', $form);

 return Inertia::render('forms/Logic', [
 ...$this->fieldProps(),
 'form' => $form,
 'can' => $this->formAbilities($form),
 'formFields' => $this->toVueObject($form->formFields()),
 'action' => cp_route('forms.logic.update', $form->handle()),
 ]);
 }

 public function update(Request $request, $form)
 {
 $this->authorize('edit', $form);
 $this->authorize('editFields', $form);

 $this->setFormFields($request, $form);

Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[6.x] Forms 2: Permissions#14957

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

jasonvarga
merged 15 commits into

from

Jul 10, 2026
 Merged


[6.x] Forms 2: Permissions
#14957
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


15 commits


Select commit
Hold shift + click to select a range
a0ea00d

Add superseding permissions concept


duncanmcclean Jul 8, 2026
f4dcc93

Rework form permissions


duncanmcclean Jul 8, 2026
fff7c7d

Gate form pages by the new permissions


duncanmcclean Jul 8, 2026
3586efc

Avoid showing forms nav when only one page is accessible


duncanmcclean Jul 8, 2026
55c6513

Merge remote-tracking branch 'origin/forms-2' into forms-2-permissions


jasonvarga Jul 9, 2026
ed41e99

fail closed


jasonvarga Jul 9, 2026
825d3d4

Merge remote-tracking branch 'origin/forms-2' into forms-2-permissions


jasonvarga Jul 9, 2026
d3eefd7

configure forms should hide all the others


jasonvarga Jul 9, 2026
87fb51b

Don't leak submission counts to users who can't view submissions


jasonvarga Jul 10, 2026
895a1b7

Hide mobile nav popover trigger when only one form section is available


jasonvarga Jul 10, 2026
3d255bd

Add authorization test coverage for FormConnectController and FormExp…


jasonvarga Jul 10, 2026
cc58e64

Merge remote-tracking branch 'origin/forms-2' into forms-2-permissions


jasonvarga Jul 10, 2026
9754809

Gate fake submission generator behind configure forms permission


jasonvarga Jul 10, 2026
7579532

Drop redundant super-user test for fake submission generation


jasonvarga Jul 10, 2026
25eea7f

Drop redundant super-user test from FormConnectTest


jasonvarga Jul 10, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


10 changes: 8 additions & 2 deletions
lang/en/permissions.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -72,8 +72,14 @@
 'group_forms' => 'Forms',
 'configure_forms' => 'Configure forms',
 'configure_forms_desc' => 'Grants access to all form related permissions',
 'configure_form_fields' => 'Configure Form Fields',
 'configure_form_fields_desc' => 'Ability to edit form blueprints, fieldsets, and their fields.',
 'edit_forms' => 'Edit forms',
 'edit_forms_desc' => 'Grants access to all forms, except their submissions',
 'create_forms' => 'Create forms',
 'delete_forms' => 'Delete forms',
 'view_form_submissions' => 'View submissions',
 'view_form_submissions_desc' => 'Grants access to submissions across all forms',
 'delete_form_submissions' => 'Delete submissions',
 'edit_{form}_form' => 'Edit :form form',
 'view_{form}_form_submissions' => 'View :form submissions',
 'delete_{form}_form_submissions' => 'Delete :form submissions',

Expand Down

1 change: 1 addition & 0 deletions
resources/js/pages/forms/Index.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -73,6 +73,7 @@ const reloadPage = () => router.reload();
 </template>
 <template #cell-submissions="{ row: form, value: submissions }">
 <Badge
 v-if="form.can_view_submissions"
 :href="form.submissions_url"
 :append="String(submissions)"
 :text="__('Results')"
Expand Down

24 changes: 14 additions & 10 deletions
resources/js/pages/forms/Layout.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,19 +6,23 @@ import { Button } from '@ui';
const page = usePage();
const form = computed(() => page.props.form);

const navItems = [
 { label: __('Edit'), href: cp_url(`forms/${form.value.handle}/builder`) },
 { label: __('Logic'), href: cp_url(`forms/${form.value.handle}/logic`) },
 { label: __('Connect'), href: cp_url(`forms/${form.value.handle}/connect`) },
 { label: __('Results'), href: cp_url(`forms/${form.value.handle}/submissions`) },
 { label: __('Configure'), href: cp_url(`forms/${form.value.handle}/edit`) },
];
const can = (ability) => page.props.can?.[ability] ?? false;

const navItems = computed(() =>
 [
 can('editFields') && { label: __('Edit'), href: cp_url(`forms/${form.value.handle}/builder`) },
 can('editFields') && { label: __('Logic'), href: cp_url(`forms/${form.value.handle}/logic`) },
 can('edit') && { label: __('Connect'), href: cp_url(`forms/${form.value.handle}/connect`) },
 can('viewSubmissions') && { label: __('Results'), href: cp_url(`forms/${form.value.handle}/submissions`) },
 can('edit') && { label: __('Configure'), href: cp_url(`forms/${form.value.handle}/edit`) },
 ].filter(Boolean),
);

const currentPath = computed(() => new URL(page.url, window.location.origin).pathname);
const isActive = (href) => currentPath.value.includes(new URL(href, window.location.origin).pathname);

const activeSectionLabel = computed(() => {
 return navItems.find((item) => isActive(item.href))?.label ?? navItems[0]?.label ?? '';
 return navItems.value.find((item) => isActive(item.href))?.label ?? navItems.value[0]?.label ?? '';
});

const closeMobileNavPopover = () => {
Expand All@@ -30,7 +34,7 @@ const closeMobileNavPopover = () => {
<template>
 <Teleport to="#global-header-slot">
 <div class="flex items-center justify-center">
 <div class="global-header-nav-popover lg:hidden">
 <div v-if="navItems.length > 1" class="global-header-nav-popover lg:hidden">
 <Button
 id="anchor-global-header-nav"
 variant="ghost"
Expand All@@ -55,7 +59,7 @@ const closeMobileNavPopover = () => {
 </nav>
 </div>

 <nav class="global-header-nav hidden lg:block" :aria-label="__('form_navigation')">
 <nav v-if="navItems.length > 1" class="global-header-nav hidden lg:block" :aria-label="__('form_navigation')">
 <ul>
 <li v-for="navItem in navItems" :key="navItem.href">
 <Link
Expand Down

9 changes: 5 additions & 4 deletions
resources/js/pages/forms/Submissions.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,7 @@ defineOptions({ layout: [Layout, PanelLayout, FormsLayout] });

const props = defineProps([
 'form',
 'can',
 'columns',
 'filters',
 'actionUrl',
Expand DownExpand Up@@ -127,11 +128,11 @@ function exportSubmissions() {
 {{ __(form.title) }}
 </template>

 <Dropdown v-if="form.canEdit || form.canDelete" placement="left-start" class="me-2">
 <Dropdown v-if="can.edit || can.delete" placement="left-start" class="me-2">
 <DropdownMenu>
 <DropdownItem v-if="form.canEdit" :text="__('Configure Form')" icon="cog" :href="form.editUrl" />
 <DropdownItem v-if="can.edit" :text="__('Configure Form')" icon="cog" :href="form.editUrl" />
 <DropdownItem
 v-if="form.canDelete"
 v-if="can.delete"
 :text="__('Delete Form')"
 icon="trash"
 variant="destructive"
Expand All@@ -155,7 +156,7 @@ function exportSubmissions() {
 />

 <ResourceDeleter
 v-if="form.canDelete"
 v-if="can.delete"
 ref="deleter"
 :resource-title="form.title"
 :route="form.deleteUrl"
Expand Down

11 changes: 5 additions & 6 deletions
src/Actions/DeleteFakeSubmissions.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,7 +27,7 @@ public function visibleTo($item)

 public function authorize($user, $item)
 {
 return $user->can('delete', $item);
 return $user->can('generateFakeSubmissions', $item->form());
 }

 public function run($items, $values)
Expand All@@ -41,12 +41,11 @@ public function run($items, $values)

 $fakeSubmissions = $form->submissions()->filter(fn ($submission) => (bool) $submission->get('_fake'));
 $currentUser = request()->user() ? User::fromUser(request()->user()) : null;
 $requiredPermission = "delete {$form->handle()} form submissions";
 $isSuper = $currentUser && method_exists($currentUser, 'isSuper') && $currentUser->isSuper();
 $canConfigureForms = $currentUser && method_exists($currentUser, 'hasPermission') && $currentUser->hasPermission('configure forms');
 $canDeleteSubmissions = $currentUser && method_exists($currentUser, 'hasPermission') && $currentUser->hasPermission($requiredPermission);

 if (! $isSuper && ! $canConfigureForms && ! $canDeleteSubmissions) {
 // The UI always posts the `_all_fake_submissions_` sentinel, which resolves to an
 // empty $items collection in ActionController, so authorize() never actually runs
 // for this flow. This check is the real enforcement point for the UI-driven request.
 if (! $currentUser || $currentUser->cant('generateFakeSubmissions', $form)) {
 throw new Exception(__('You are not authorized to run this action.'));
 }

Expand Down

24 changes: 22 additions & 2 deletions
src/Auth/CorePermissions.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,6 @@ public function boot()
 $this->register('access cp');
 $this->register('configure sites');
 $this->register('configure fields');
 $this->register('configure form fields');
 $this->register('manage preferences');
 });

Expand DownExpand Up@@ -209,8 +208,29 @@ protected function registerForms()
 {
 $this->register('configure forms');

 $this->register('view {form} form submissions', function ($permission) {
 $this->register('edit forms', function ($permission) {
 $this->permission($permission)->hiddenBy('configure forms')->children([
 $this->permission('create forms'),
 $this->permission('delete forms'),
 ]);
 });

 $this->register('view form submissions', function ($permission) {
 $this->permission($permission)->hiddenBy('configure forms')->children([
 $this->permission('delete form submissions'),
 ]);
 });

 $this->register('edit {form} form', function ($permission) {
 $this->permission($permission)->hiddenBy(['configure forms', 'edit forms'])->replacements('form', function () {
 return Form::all()->map(function ($form) {
 return ['value' => $form->handle(), 'label' => __($form->title())];
 });
 });
 });

 $this->register('view {form} form submissions', function ($permission) {
 $this->permission($permission)->hiddenBy(['configure forms', 'view form submissions'])->children([
 $this->permission('delete {form} form submissions'),
 ])->replacements('form', function () {
 return Form::all()->map(function ($form) {
Expand Down

2 changes: 1 addition & 1 deletion
src/Forms/Widget.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,7 +21,7 @@ public function component()
 ]);
 }

 if (! User::current()->can('view', $form)) {
 if (! User::current()->can('viewSubmissions', $form)) {
 return;
 }

Expand Down

22 changes: 22 additions & 0 deletions
src/Http/Controllers/CP/Forms/Concerns/ProvidesFormAbilities.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
<?php

namespace Statamic\Http\Controllers\CP\Forms\Concerns;

use Statamic\Contracts\Forms\Form;
use Statamic\Facades\User;

trait ProvidesFormAbilities
{
 private function formAbilities(Form $form): array
 {
 $user = User::current();

 return [
 'edit' => $user->can('edit', $form),
 'delete' => $user->can('delete', $form),
 'editFields' => $user->can('editFields', $form),
 'viewSubmissions' => $user->can('viewSubmissions', $form),
 'generateFakeSubmissions' => $user->can('generateFakeSubmissions', $form),
 ];
 }
}

8 changes: 5 additions & 3 deletions
src/Http/Controllers/CP/Forms/FormBuilderController.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,22 +13,24 @@
use Statamic\Forms\Fields\FormFieldtype;
use Statamic\Forms\Fieldtypes\Fallback;
use Statamic\Http\Controllers\CP\CpController;
use Statamic\Http\Controllers\CP\Forms\Concerns\ProvidesFormAbilities;
use Statamic\Statamic;
use Statamic\Support\Arr;

use function Statamic\trans as __;

class FormBuilderController extends CpController
{
 use ManagesFormFields;
 use ManagesFormFields, ProvidesFormAbilities;

 public function edit($form)
 {
 $this->authorize('edit', $form);
 $this->authorize('editFields', $form);

 return Inertia::render('forms/Builder', [
 ...$this->fieldProps(),
 'form' => $form,
 'can' => $this->formAbilities($form),
 'initialFormFields' => $this->toVueObject($form->formFields()),
 'formsProInstalled' => Statamic::formsProInstalled(),
 'fieldtypes' => $this->fieldtypes()->map(fn (FormFieldtype $fieldtype): array => [
Expand All@@ -42,7 +44,7 @@ public function edit($form)

 public function update(Request $request, $form)
 {
 $this->authorize('edit', $form);
 $this->authorize('editFields', $form);

 $request->validate([
 'pages' => ['required', 'array', 'min:1'],
Expand Down

4 changes: 4 additions & 0 deletions
src/Http/Controllers/CP/Forms/FormConnectController.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,15 +4,19 @@

use Inertia\Inertia;
use Statamic\Http\Controllers\CP\CpController;
use Statamic\Http\Controllers\CP\Forms\Concerns\ProvidesFormAbilities;

class FormConnectController extends CpController
{
 use ProvidesFormAbilities;

 public function __invoke($form)
 {
 $this->authorize('edit', $form);

 return Inertia::render('forms/Connect', [
 'form' => $form,
 'can' => $this->formAbilities($form),
 ]);
 }
}

2 changes: 1 addition & 1 deletion
src/Http/Controllers/CP/Forms/FormExportController.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,7 @@ class FormExportController extends CpController

 public function export(FilteredRequest $request, $form, $type)
 {
 $this->authorize('view', $form);
 $this->authorize('viewSubmissions', $form);

 if (! $exporter = $form->exporter($type)) {
 throw new NotFoundHttpException;
Expand Down

8 changes: 4 additions & 4 deletions
src/Http/Controllers/CP/Forms/FormFieldsController.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,9 +15,9 @@

class FormFieldsController extends CpController
{
 public function edit(Request $request)
 public function edit(Request $request, $form)
 {
// todo: add authorization
$this->authorize('editFields', $form);

 $request->validate([
 'type' => 'required',
Expand DownExpand Up@@ -56,9 +56,9 @@ public function edit(Request $request)
 ];
 }

 public function update(Request $request)
 public function update(Request $request, $form)
 {
// todo: add authorization
$this->authorize('editFields', $form);

 $request->validate([
 'type' => 'required',
Expand Down

4 changes: 2 additions & 2 deletions
src/Http/Controllers/CP/Forms/FormFieldsetPreviewsController.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,9 +9,9 @@

class FormFieldsetPreviewsController extends CpController
{
 public function __invoke(Request $request)
 public function __invoke(Request $request, $form)
 {
// todo: add authorization
$this->authorize('editFields', $form);

 $request->validate([
 'fieldset' => 'required|string',
Expand Down

8 changes: 5 additions & 3 deletions
src/Http/Controllers/CP/Forms/FormLogicController.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,26 +5,28 @@
use Illuminate\Http\Request;
use Inertia\Inertia;
use Statamic\Http\Controllers\CP\CpController;
use Statamic\Http\Controllers\CP\Forms\Concerns\ProvidesFormAbilities;

class FormLogicController extends CpController
{
 use ManagesFormFields;
 use ManagesFormFields, ProvidesFormAbilities;

 public function edit($form)
 {
 $this->authorize('edit', $form);
 $this->authorize('editFields', $form);

 return Inertia::render('forms/Logic', [
 ...$this->fieldProps(),
 'form' => $form,
 'can' => $this->formAbilities($form),
 'formFields' => $this->toVueObject($form->formFields()),
 'action' => cp_route('forms.logic.update', $form->handle()),
 ]);
 }

 public function update(Request $request, $form)
 {
 $this->authorize('edit', $form);
 $this->authorize('editFields', $form);

 $this->setFormFields($request, $form);

Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
[6.x] Forms 2: Permissions#14957

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

jasonvarga
merged 15 commits into

from

Jul 10, 2026
 Merged


[6.x] Forms 2: Permissions
#14957
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


15 commits


Select commit
Hold shift + click to select a range
a0ea00d

Add superseding permissions concept


duncanmcclean Jul 8, 2026
f4dcc93

Rework form permissions


duncanmcclean Jul 8, 2026
fff7c7d

Gate form pages by the new permissions


duncanmcclean Jul 8, 2026
3586efc

Avoid showing forms nav when only one page is accessible


duncanmcclean Jul 8, 2026
55c6513

Merge remote-tracking branch 'origin/forms-2' into forms-2-permissions


jasonvarga Jul 9, 2026
ed41e99

fail closed


jasonvarga Jul 9, 2026
825d3d4

Merge remote-tracking branch 'origin/forms-2' into forms-2-permissions


jasonvarga Jul 9, 2026
d3eefd7

configure forms should hide all the others


jasonvarga Jul 9, 2026
87fb51b

Don't leak submission counts to users who can't view submissions


jasonvarga Jul 10, 2026
895a1b7

Hide mobile nav popover trigger when only one form section is available


jasonvarga Jul 10, 2026
3d255bd

Add authorization test coverage for FormConnectController and FormExp…


jasonvarga Jul 10, 2026
cc58e64

Merge remote-tracking branch 'origin/forms-2' into forms-2-permissions


jasonvarga Jul 10, 2026
9754809

Gate fake submission generator behind configure forms permission


jasonvarga Jul 10, 2026
7579532

Drop redundant super-user test for fake submission generation


jasonvarga Jul 10, 2026
25eea7f

Drop redundant super-user test from FormConnectTest


jasonvarga Jul 10, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


10 changes: 8 additions & 2 deletions
lang/en/permissions.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -72,8 +72,14 @@
 'group_forms' => 'Forms',
 'configure_forms' => 'Configure forms',
 'configure_forms_desc' => 'Grants access to all form related permissions',
 'configure_form_fields' => 'Configure Form Fields',
 'configure_form_fields_desc' => 'Ability to edit form blueprints, fieldsets, and their fields.',
 'edit_forms' => 'Edit forms',
 'edit_forms_desc' => 'Grants access to all forms, except their submissions',
 'create_forms' => 'Create forms',
 'delete_forms' => 'Delete forms',
 'view_form_submissions' => 'View submissions',
 'view_form_submissions_desc' => 'Grants access to submissions across all forms',
 'delete_form_submissions' => 'Delete submissions',
 'edit_{form}_form' => 'Edit :form form',
 'view_{form}_form_submissions' => 'View :form submissions',
 'delete_{form}_form_submissions' => 'Delete :form submissions',

Expand Down

1 change: 1 addition & 0 deletions
resources/js/pages/forms/Index.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -73,6 +73,7 @@ const reloadPage = () => router.reload();
 </template>
 <template #cell-submissions="{ row: form, value: submissions }">
 <Badge
 v-if="form.can_view_submissions"
 :href="form.submissions_url"
 :append="String(submissions)"
 :text="__('Results')"
Expand Down

24 changes: 14 additions & 10 deletions
resources/js/pages/forms/Layout.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,19 +6,23 @@ import { Button } from '@ui';
const page = usePage();
const form = computed(() => page.props.form);

const navItems = [
 { label: __('Edit'), href: cp_url(`forms/${form.value.handle}/builder`) },
 { label: __('Logic'), href: cp_url(`forms/${form.value.handle}/logic`) },
 { label: __('Connect'), href: cp_url(`forms/${form.value.handle}/connect`) },
 { label: __('Results'), href: cp_url(`forms/${form.value.handle}/submissions`) },
 { label: __('Configure'), href: cp_url(`forms/${form.value.handle}/edit`) },
];
const can = (ability) => page.props.can?.[ability] ?? false;

const navItems = computed(() =>
 [
 can('editFields') && { label: __('Edit'), href: cp_url(`forms/${form.value.handle}/builder`) },
 can('editFields') && { label: __('Logic'), href: cp_url(`forms/${form.value.handle}/logic`) },
 can('edit') && { label: __('Connect'), href: cp_url(`forms/${form.value.handle}/connect`) },
 can('viewSubmissions') && { label: __('Results'), href: cp_url(`forms/${form.value.handle}/submissions`) },
 can('edit') && { label: __('Configure'), href: cp_url(`forms/${form.value.handle}/edit`) },
 ].filter(Boolean),
);

const currentPath = computed(() => new URL(page.url, window.location.origin).pathname);
const isActive = (href) => currentPath.value.includes(new URL(href, window.location.origin).pathname);

const activeSectionLabel = computed(() => {
 return navItems.find((item) => isActive(item.href))?.label ?? navItems[0]?.label ?? '';
 return navItems.value.find((item) => isActive(item.href))?.label ?? navItems.value[0]?.label ?? '';
});

const closeMobileNavPopover = () => {
Expand All@@ -30,7 +34,7 @@ const closeMobileNavPopover = () => {
<template>
 <Teleport to="#global-header-slot">
 <div class="flex items-center justify-center">
 <div class="global-header-nav-popover lg:hidden">
 <div v-if="navItems.length > 1" class="global-header-nav-popover lg:hidden">
 <Button
 id="anchor-global-header-nav"
 variant="ghost"
Expand All@@ -55,7 +59,7 @@ const closeMobileNavPopover = () => {
 </nav>
 </div>

 <nav class="global-header-nav hidden lg:block" :aria-label="__('form_navigation')">
 <nav v-if="navItems.length > 1" class="global-header-nav hidden lg:block" :aria-label="__('form_navigation')">
 <ul>
 <li v-for="navItem in navItems" :key="navItem.href">
 <Link
Expand Down

9 changes: 5 additions & 4 deletions
resources/js/pages/forms/Submissions.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,7 @@ defineOptions({ layout: [Layout, PanelLayout, FormsLayout] });

const props = defineProps([
 'form',
 'can',
 'columns',
 'filters',
 'actionUrl',
Expand DownExpand Up@@ -127,11 +128,11 @@ function exportSubmissions() {
 {{ __(form.title) }}
 </template>

 <Dropdown v-if="form.canEdit || form.canDelete" placement="left-start" class="me-2">
 <Dropdown v-if="can.edit || can.delete" placement="left-start" class="me-2">
 <DropdownMenu>
 <DropdownItem v-if="form.canEdit" :text="__('Configure Form')" icon="cog" :href="form.editUrl" />
 <DropdownItem v-if="can.edit" :text="__('Configure Form')" icon="cog" :href="form.editUrl" />
 <DropdownItem
 v-if="form.canDelete"
 v-if="can.delete"
 :text="__('Delete Form')"
 icon="trash"
 variant="destructive"
Expand All@@ -155,7 +156,7 @@ function exportSubmissions() {
 />

 <ResourceDeleter
 v-if="form.canDelete"
 v-if="can.delete"
 ref="deleter"
 :resource-title="form.title"
 :route="form.deleteUrl"
Expand Down

11 changes: 5 additions & 6 deletions
src/Actions/DeleteFakeSubmissions.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,7 +27,7 @@ public function visibleTo($item)

 public function authorize($user, $item)
 {
 return $user->can('delete', $item);
 return $user->can('generateFakeSubmissions', $item->form());
 }

 public function run($items, $values)
Expand All@@ -41,12 +41,11 @@ public function run($items, $values)

 $fakeSubmissions = $form->submissions()->filter(fn ($submission) => (bool) $submission->get('_fake'));
 $currentUser = request()->user() ? User::fromUser(request()->user()) : null;
 $requiredPermission = "delete {$form->handle()} form submissions";
 $isSuper = $currentUser && method_exists($currentUser, 'isSuper') && $currentUser->isSuper();
 $canConfigureForms = $currentUser && method_exists($currentUser, 'hasPermission') && $currentUser->hasPermission('configure forms');
 $canDeleteSubmissions = $currentUser && method_exists($currentUser, 'hasPermission') && $currentUser->hasPermission($requiredPermission);

 if (! $isSuper && ! $canConfigureForms && ! $canDeleteSubmissions) {
 // The UI always posts the `_all_fake_submissions_` sentinel, which resolves to an
 // empty $items collection in ActionController, so authorize() never actually runs
 // for this flow. This check is the real enforcement point for the UI-driven request.
 if (! $currentUser || $currentUser->cant('generateFakeSubmissions', $form)) {
 throw new Exception(__('You are not authorized to run this action.'));
 }

Expand Down

24 changes: 22 additions & 2 deletions
src/Auth/CorePermissions.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,6 @@ public function boot()
 $this->register('access cp');
 $this->register('configure sites');
 $this->register('configure fields');
 $this->register('configure form fields');
 $this->register('manage preferences');
 });

Expand DownExpand Up@@ -209,8 +208,29 @@ protected function registerForms()
 {
 $this->register('configure forms');

 $this->register('view {form} form submissions', function ($permission) {
 $this->register('edit forms', function ($permission) {
 $this->permission($permission)->hiddenBy('configure forms')->children([
 $this->permission('create forms'),
 $this->permission('delete forms'),
 ]);
 });

 $this->register('view form submissions', function ($permission) {
 $this->permission($permission)->hiddenBy('configure forms')->children([
 $this->permission('delete form submissions'),
 ]);
 });

 $this->register('edit {form} form', function ($permission) {
 $this->permission($permission)->hiddenBy(['configure forms', 'edit forms'])->replacements('form', function () {
 return Form::all()->map(function ($form) {
 return ['value' => $form->handle(), 'label' => __($form->title())];
 });
 });
 });

 $this->register('view {form} form submissions', function ($permission) {
 $this->permission($permission)->hiddenBy(['configure forms', 'view form submissions'])->children([
 $this->permission('delete {form} form submissions'),
 ])->replacements('form', function () {
 return Form::all()->map(function ($form) {
Expand Down

2 changes: 1 addition & 1 deletion
src/Forms/Widget.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,7 +21,7 @@ public function component()
 ]);
 }

 if (! User::current()->can('view', $form)) {
 if (! User::current()->can('viewSubmissions', $form)) {
 return;
 }

Expand Down

22 changes: 22 additions & 0 deletions
src/Http/Controllers/CP/Forms/Concerns/ProvidesFormAbilities.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
<?php

namespace Statamic\Http\Controllers\CP\Forms\Concerns;

use Statamic\Contracts\Forms\Form;
use Statamic\Facades\User;

trait ProvidesFormAbilities
{
 private function formAbilities(Form $form): array
 {
 $user = User::current();

 return [
 'edit' => $user->can('edit', $form),
 'delete' => $user->can('delete', $form),
 'editFields' => $user->can('editFields', $form),
 'viewSubmissions' => $user->can('viewSubmissions', $form),
 'generateFakeSubmissions' => $user->can('generateFakeSubmissions', $form),
 ];
 }
}

8 changes: 5 additions & 3 deletions
src/Http/Controllers/CP/Forms/FormBuilderController.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,22 +13,24 @@
use Statamic\Forms\Fields\FormFieldtype;
use Statamic\Forms\Fieldtypes\Fallback;
use Statamic\Http\Controllers\CP\CpController;
use Statamic\Http\Controllers\CP\Forms\Concerns\ProvidesFormAbilities;
use Statamic\Statamic;
use Statamic\Support\Arr;

use function Statamic\trans as __;

class FormBuilderController extends CpController
{
 use ManagesFormFields;
 use ManagesFormFields, ProvidesFormAbilities;

 public function edit($form)
 {
 $this->authorize('edit', $form);
 $this->authorize('editFields', $form);

 return Inertia::render('forms/Builder', [
 ...$this->fieldProps(),
 'form' => $form,
 'can' => $this->formAbilities($form),
 'initialFormFields' => $this->toVueObject($form->formFields()),
 'formsProInstalled' => Statamic::formsProInstalled(),
 'fieldtypes' => $this->fieldtypes()->map(fn (FormFieldtype $fieldtype): array => [
Expand All@@ -42,7 +44,7 @@ public function edit($form)

 public function update(Request $request, $form)
 {
 $this->authorize('edit', $form);
 $this->authorize('editFields', $form);

 $request->validate([
 'pages' => ['required', 'array', 'min:1'],
Expand Down

4 changes: 4 additions & 0 deletions
src/Http/Controllers/CP/Forms/FormConnectController.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,15 +4,19 @@

use Inertia\Inertia;
use Statamic\Http\Controllers\CP\CpController;
use Statamic\Http\Controllers\CP\Forms\Concerns\ProvidesFormAbilities;

class FormConnectController extends CpController
{
 use ProvidesFormAbilities;

 public function __invoke($form)
 {
 $this->authorize('edit', $form);

 return Inertia::render('forms/Connect', [
 'form' => $form,
 'can' => $this->formAbilities($form),
 ]);
 }
}

2 changes: 1 addition & 1 deletion
src/Http/Controllers/CP/Forms/FormExportController.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,7 @@ class FormExportController extends CpController

 public function export(FilteredRequest $request, $form, $type)
 {
 $this->authorize('view', $form);
 $this->authorize('viewSubmissions', $form);

 if (! $exporter = $form->exporter($type)) {
 throw new NotFoundHttpException;
Expand Down

8 changes: 4 additions & 4 deletions
src/Http/Controllers/CP/Forms/FormFieldsController.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,9 +15,9 @@

class FormFieldsController extends CpController
{
 public function edit(Request $request)
 public function edit(Request $request, $form)
 {
// todo: add authorization
$this->authorize('editFields', $form);

 $request->validate([
 'type' => 'required',
Expand DownExpand Up@@ -56,9 +56,9 @@ public function edit(Request $request)
 ];
 }

 public function update(Request $request)
 public function update(Request $request, $form)
 {
// todo: add authorization
$this->authorize('editFields', $form);

 $request->validate([
 'type' => 'required',
Expand Down

4 changes: 2 additions & 2 deletions
src/Http/Controllers/CP/Forms/FormFieldsetPreviewsController.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,9 +9,9 @@

class FormFieldsetPreviewsController extends CpController
{
 public function __invoke(Request $request)
 public function __invoke(Request $request, $form)
 {
// todo: add authorization
$this->authorize('editFields', $form);

 $request->validate([
 'fieldset' => 'required|string',
Expand Down

8 changes: 5 additions & 3 deletions
src/Http/Controllers/CP/Forms/FormLogicController.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,26 +5,28 @@
use Illuminate\Http\Request;
use Inertia\Inertia;
use Statamic\Http\Controllers\CP\CpController;
use Statamic\Http\Controllers\CP\Forms\Concerns\ProvidesFormAbilities;

class FormLogicController extends CpController
{
 use ManagesFormFields;
 use ManagesFormFields, ProvidesFormAbilities;

 public function edit($form)
 {
 $this->authorize('edit', $form);
 $this->authorize('editFields', $form);

 return Inertia::render('forms/Logic', [
 ...$this->fieldProps(),
 'form' => $form,
 'can' => $this->formAbilities($form),
 'formFields' => $this->toVueObject($form->formFields()),
 'action' => cp_route('forms.logic.update', $form->handle()),
 ]);
 }

 public function update(Request $request, $form)
 {
 $this->authorize('edit', $form);
 $this->authorize('editFields', $form);

 $this->setFormFields($request, $form);

Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[6.x] Forms 2: Permissions#14957

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

jasonvarga
merged 15 commits into

from

Jul 10, 2026
 Merged


[6.x] Forms 2: Permissions
#14957
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


15 commits


Select commit
Hold shift + click to select a range
a0ea00d

Add superseding permissions concept


duncanmcclean Jul 8, 2026
f4dcc93

Rework form permissions


duncanmcclean Jul 8, 2026
fff7c7d

Gate form pages by the new permissions


duncanmcclean Jul 8, 2026
3586efc

Avoid showing forms nav when only one page is accessible


duncanmcclean Jul 8, 2026
55c6513

Merge remote-tracking branch 'origin/forms-2' into forms-2-permissions


jasonvarga Jul 9, 2026
ed41e99

fail closed


jasonvarga Jul 9, 2026
825d3d4

Merge remote-tracking branch 'origin/forms-2' into forms-2-permissions


jasonvarga Jul 9, 2026
d3eefd7

configure forms should hide all the others


jasonvarga Jul 9, 2026
87fb51b

Don't leak submission counts to users who can't view submissions


jasonvarga Jul 10, 2026
895a1b7

Hide mobile nav popover trigger when only one form section is available


jasonvarga Jul 10, 2026
3d255bd

Add authorization test coverage for FormConnectController and FormExp…


jasonvarga Jul 10, 2026
cc58e64

Merge remote-tracking branch 'origin/forms-2' into forms-2-permissions


jasonvarga Jul 10, 2026
9754809

Gate fake submission generator behind configure forms permission


jasonvarga Jul 10, 2026
7579532

Drop redundant super-user test for fake submission generation


jasonvarga Jul 10, 2026
25eea7f

Drop redundant super-user test from FormConnectTest


jasonvarga Jul 10, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


10 changes: 8 additions & 2 deletions
lang/en/permissions.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -72,8 +72,14 @@
 'group_forms' => 'Forms',
 'configure_forms' => 'Configure forms',
 'configure_forms_desc' => 'Grants access to all form related permissions',
 'configure_form_fields' => 'Configure Form Fields',
 'configure_form_fields_desc' => 'Ability to edit form blueprints, fieldsets, and their fields.',
 'edit_forms' => 'Edit forms',
 'edit_forms_desc' => 'Grants access to all forms, except their submissions',
 'create_forms' => 'Create forms',
 'delete_forms' => 'Delete forms',
 'view_form_submissions' => 'View submissions',
 'view_form_submissions_desc' => 'Grants access to submissions across all forms',
 'delete_form_submissions' => 'Delete submissions',
 'edit_{form}_form' => 'Edit :form form',
 'view_{form}_form_submissions' => 'View :form submissions',
 'delete_{form}_form_submissions' => 'Delete :form submissions',

Expand Down

1 change: 1 addition & 0 deletions
resources/js/pages/forms/Index.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -73,6 +73,7 @@ const reloadPage = () => router.reload();
 </template>
 <template #cell-submissions="{ row: form, value: submissions }">
 <Badge
 v-if="form.can_view_submissions"
 :href="form.submissions_url"
 :append="String(submissions)"
 :text="__('Results')"
Expand Down

24 changes: 14 additions & 10 deletions
resources/js/pages/forms/Layout.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,19 +6,23 @@ import { Button } from '@ui';
const page = usePage();
const form = computed(() => page.props.form);

const navItems = [
 { label: __('Edit'), href: cp_url(`forms/${form.value.handle}/builder`) },
 { label: __('Logic'), href: cp_url(`forms/${form.value.handle}/logic`) },
 { label: __('Connect'), href: cp_url(`forms/${form.value.handle}/connect`) },
 { label: __('Results'), href: cp_url(`forms/${form.value.handle}/submissions`) },
 { label: __('Configure'), href: cp_url(`forms/${form.value.handle}/edit`) },
];
const can = (ability) => page.props.can?.[ability] ?? false;

const navItems = computed(() =>
 [
 can('editFields') && { label: __('Edit'), href: cp_url(`forms/${form.value.handle}/builder`) },
 can('editFields') && { label: __('Logic'), href: cp_url(`forms/${form.value.handle}/logic`) },
 can('edit') && { label: __('Connect'), href: cp_url(`forms/${form.value.handle}/connect`) },
 can('viewSubmissions') && { label: __('Results'), href: cp_url(`forms/${form.value.handle}/submissions`) },
 can('edit') && { label: __('Configure'), href: cp_url(`forms/${form.value.handle}/edit`) },
 ].filter(Boolean),
);

const currentPath = computed(() => new URL(page.url, window.location.origin).pathname);
const isActive = (href) => currentPath.value.includes(new URL(href, window.location.origin).pathname);

const activeSectionLabel = computed(() => {
 return navItems.find((item) => isActive(item.href))?.label ?? navItems[0]?.label ?? '';
 return navItems.value.find((item) => isActive(item.href))?.label ?? navItems.value[0]?.label ?? '';
});

const closeMobileNavPopover = () => {
Expand All@@ -30,7 +34,7 @@ const closeMobileNavPopover = () => {
<template>
 <Teleport to="#global-header-slot">
 <div class="flex items-center justify-center">
 <div class="global-header-nav-popover lg:hidden">
 <div v-if="navItems.length > 1" class="global-header-nav-popover lg:hidden">
 <Button
 id="anchor-global-header-nav"
 variant="ghost"
Expand All@@ -55,7 +59,7 @@ const closeMobileNavPopover = () => {
 </nav>
 </div>

 <nav class="global-header-nav hidden lg:block" :aria-label="__('form_navigation')">
 <nav v-if="navItems.length > 1" class="global-header-nav hidden lg:block" :aria-label="__('form_navigation')">
 <ul>
 <li v-for="navItem in navItems" :key="navItem.href">
 <Link
Expand Down

9 changes: 5 additions & 4 deletions
resources/js/pages/forms/Submissions.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,7 @@ defineOptions({ layout: [Layout, PanelLayout, FormsLayout] });

const props = defineProps([
 'form',
 'can',
 'columns',
 'filters',
 'actionUrl',
Expand DownExpand Up@@ -127,11 +128,11 @@ function exportSubmissions() {
 {{ __(form.title) }}
 </template>

 <Dropdown v-if="form.canEdit || form.canDelete" placement="left-start" class="me-2">
 <Dropdown v-if="can.edit || can.delete" placement="left-start" class="me-2">
 <DropdownMenu>
 <DropdownItem v-if="form.canEdit" :text="__('Configure Form')" icon="cog" :href="form.editUrl" />
 <DropdownItem v-if="can.edit" :text="__('Configure Form')" icon="cog" :href="form.editUrl" />
 <DropdownItem
 v-if="form.canDelete"
 v-if="can.delete"
 :text="__('Delete Form')"
 icon="trash"
 variant="destructive"
Expand All@@ -155,7 +156,7 @@ function exportSubmissions() {
 />

 <ResourceDeleter
 v-if="form.canDelete"
 v-if="can.delete"
 ref="deleter"
 :resource-title="form.title"
 :route="form.deleteUrl"
Expand Down

11 changes: 5 additions & 6 deletions
src/Actions/DeleteFakeSubmissions.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,7 +27,7 @@ public function visibleTo($item)

 public function authorize($user, $item)
 {
 return $user->can('delete', $item);
 return $user->can('generateFakeSubmissions', $item->form());
 }

 public function run($items, $values)
Expand All@@ -41,12 +41,11 @@ public function run($items, $values)

 $fakeSubmissions = $form->submissions()->filter(fn ($submission) => (bool) $submission->get('_fake'));
 $currentUser = request()->user() ? User::fromUser(request()->user()) : null;
 $requiredPermission = "delete {$form->handle()} form submissions";
 $isSuper = $currentUser && method_exists($currentUser, 'isSuper') && $currentUser->isSuper();
 $canConfigureForms = $currentUser && method_exists($currentUser, 'hasPermission') && $currentUser->hasPermission('configure forms');
 $canDeleteSubmissions = $currentUser && method_exists($currentUser, 'hasPermission') && $currentUser->hasPermission($requiredPermission);

 if (! $isSuper && ! $canConfigureForms && ! $canDeleteSubmissions) {
 // The UI always posts the `_all_fake_submissions_` sentinel, which resolves to an
 // empty $items collection in ActionController, so authorize() never actually runs
 // for this flow. This check is the real enforcement point for the UI-driven request.
 if (! $currentUser || $currentUser->cant('generateFakeSubmissions', $form)) {
 throw new Exception(__('You are not authorized to run this action.'));
 }

Expand Down

24 changes: 22 additions & 2 deletions
src/Auth/CorePermissions.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,6 @@ public function boot()
 $this->register('access cp');
 $this->register('configure sites');
 $this->register('configure fields');
 $this->register('configure form fields');
 $this->register('manage preferences');
 });

Expand DownExpand Up@@ -209,8 +208,29 @@ protected function registerForms()
 {
 $this->register('configure forms');

 $this->register('view {form} form submissions', function ($permission) {
 $this->register('edit forms', function ($permission) {
 $this->permission($permission)->hiddenBy('configure forms')->children([
 $this->permission('create forms'),
 $this->permission('delete forms'),
 ]);
 });

 $this->register('view form submissions', function ($permission) {
 $this->permission($permission)->hiddenBy('configure forms')->children([
 $this->permission('delete form submissions'),
 ]);
 });

 $this->register('edit {form} form', function ($permission) {
 $this->permission($permission)->hiddenBy(['configure forms', 'edit forms'])->replacements('form', function () {
 return Form::all()->map(function ($form) {
 return ['value' => $form->handle(), 'label' => __($form->title())];
 });
 });
 });

 $this->register('view {form} form submissions', function ($permission) {
 $this->permission($permission)->hiddenBy(['configure forms', 'view form submissions'])->children([
 $this->permission('delete {form} form submissions'),
 ])->replacements('form', function () {
 return Form::all()->map(function ($form) {
Expand Down

2 changes: 1 addition & 1 deletion
src/Forms/Widget.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,7 +21,7 @@ public function component()
 ]);
 }

 if (! User::current()->can('view', $form)) {
 if (! User::current()->can('viewSubmissions', $form)) {
 return;
 }

Expand Down

22 changes: 22 additions & 0 deletions
src/Http/Controllers/CP/Forms/Concerns/ProvidesFormAbilities.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
<?php

namespace Statamic\Http\Controllers\CP\Forms\Concerns;

use Statamic\Contracts\Forms\Form;
use Statamic\Facades\User;

trait ProvidesFormAbilities
{
 private function formAbilities(Form $form): array
 {
 $user = User::current();

 return [
 'edit' => $user->can('edit', $form),
 'delete' => $user->can('delete', $form),
 'editFields' => $user->can('editFields', $form),
 'viewSubmissions' => $user->can('viewSubmissions', $form),
 'generateFakeSubmissions' => $user->can('generateFakeSubmissions', $form),
 ];
 }
}

8 changes: 5 additions & 3 deletions
src/Http/Controllers/CP/Forms/FormBuilderController.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,22 +13,24 @@
use Statamic\Forms\Fields\FormFieldtype;
use Statamic\Forms\Fieldtypes\Fallback;
use Statamic\Http\Controllers\CP\CpController;
use Statamic\Http\Controllers\CP\Forms\Concerns\ProvidesFormAbilities;
use Statamic\Statamic;
use Statamic\Support\Arr;

use function Statamic\trans as __;

class FormBuilderController extends CpController
{
 use ManagesFormFields;
 use ManagesFormFields, ProvidesFormAbilities;

 public function edit($form)
 {
 $this->authorize('edit', $form);
 $this->authorize('editFields', $form);

 return Inertia::render('forms/Builder', [
 ...$this->fieldProps(),
 'form' => $form,
 'can' => $this->formAbilities($form),
 'initialFormFields' => $this->toVueObject($form->formFields()),
 'formsProInstalled' => Statamic::formsProInstalled(),
 'fieldtypes' => $this->fieldtypes()->map(fn (FormFieldtype $fieldtype): array => [
Expand All@@ -42,7 +44,7 @@ public function edit($form)

 public function update(Request $request, $form)
 {
 $this->authorize('edit', $form);
 $this->authorize('editFields', $form);

 $request->validate([
 'pages' => ['required', 'array', 'min:1'],
Expand Down

4 changes: 4 additions & 0 deletions
src/Http/Controllers/CP/Forms/FormConnectController.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,15 +4,19 @@

use Inertia\Inertia;
use Statamic\Http\Controllers\CP\CpController;
use Statamic\Http\Controllers\CP\Forms\Concerns\ProvidesFormAbilities;

class FormConnectController extends CpController
{
 use ProvidesFormAbilities;

 public function __invoke($form)
 {
 $this->authorize('edit', $form);

 return Inertia::render('forms/Connect', [
 'form' => $form,
 'can' => $this->formAbilities($form),
 ]);
 }
}

2 changes: 1 addition & 1 deletion
src/Http/Controllers/CP/Forms/FormExportController.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,7 @@ class FormExportController extends CpController

 public function export(FilteredRequest $request, $form, $type)
 {
 $this->authorize('view', $form);
 $this->authorize('viewSubmissions', $form);

 if (! $exporter = $form->exporter($type)) {
 throw new NotFoundHttpException;
Expand Down

8 changes: 4 additions & 4 deletions
src/Http/Controllers/CP/Forms/FormFieldsController.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,9 +15,9 @@

class FormFieldsController extends CpController
{
 public function edit(Request $request)
 public function edit(Request $request, $form)
 {
// todo: add authorization
$this->authorize('editFields', $form);

 $request->validate([
 'type' => 'required',
Expand DownExpand Up@@ -56,9 +56,9 @@ public function edit(Request $request)
 ];
 }

 public function update(Request $request)
 public function update(Request $request, $form)
 {
// todo: add authorization
$this->authorize('editFields', $form);

 $request->validate([
 'type' => 'required',
Expand Down

4 changes: 2 additions & 2 deletions
src/Http/Controllers/CP/Forms/FormFieldsetPreviewsController.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,9 +9,9 @@

class FormFieldsetPreviewsController extends CpController
{
 public function __invoke(Request $request)
 public function __invoke(Request $request, $form)
 {
// todo: add authorization
$this->authorize('editFields', $form);

 $request->validate([
 'fieldset' => 'required|string',
Expand Down

8 changes: 5 additions & 3 deletions
src/Http/Controllers/CP/Forms/FormLogicController.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,26 +5,28 @@
use Illuminate\Http\Request;
use Inertia\Inertia;
use Statamic\Http\Controllers\CP\CpController;
use Statamic\Http\Controllers\CP\Forms\Concerns\ProvidesFormAbilities;

class FormLogicController extends CpController
{
 use ManagesFormFields;
 use ManagesFormFields, ProvidesFormAbilities;

 public function edit($form)
 {
 $this->authorize('edit', $form);
 $this->authorize('editFields', $form);

 return Inertia::render('forms/Logic', [
 ...$this->fieldProps(),
 'form' => $form,
 'can' => $this->formAbilities($form),
 'formFields' => $this->toVueObject($form->formFields()),
 'action' => cp_route('forms.logic.update', $form->handle()),
 ]);
 }

 public function update(Request $request, $form)
 {
 $this->authorize('edit', $form);
 $this->authorize('editFields', $form);

 $this->setFormFields($request, $form);

Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[6.x] Forms 2: Permissions#14957

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

jasonvarga
merged 15 commits into

from

Jul 10, 2026
 Merged


[6.x] Forms 2: Permissions
#14957
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


15 commits


Select commit
Hold shift + click to select a range
a0ea00d

Add superseding permissions concept


duncanmcclean Jul 8, 2026
f4dcc93

Rework form permissions


duncanmcclean Jul 8, 2026
fff7c7d

Gate form pages by the new permissions


duncanmcclean Jul 8, 2026
3586efc

Avoid showing forms nav when only one page is accessible


duncanmcclean Jul 8, 2026
55c6513

Merge remote-tracking branch 'origin/forms-2' into forms-2-permissions


jasonvarga Jul 9, 2026
ed41e99

fail closed


jasonvarga Jul 9, 2026
825d3d4

Merge remote-tracking branch 'origin/forms-2' into forms-2-permissions


jasonvarga Jul 9, 2026
d3eefd7

configure forms should hide all the others


jasonvarga Jul 9, 2026
87fb51b

Don't leak submission counts to users who can't view submissions


jasonvarga Jul 10, 2026
895a1b7

Hide mobile nav popover trigger when only one form section is available


jasonvarga Jul 10, 2026
3d255bd

Add authorization test coverage for FormConnectController and FormExp…


jasonvarga Jul 10, 2026
cc58e64

Merge remote-tracking branch 'origin/forms-2' into forms-2-permissions


jasonvarga Jul 10, 2026
9754809

Gate fake submission generator behind configure forms permission


jasonvarga Jul 10, 2026
7579532

Drop redundant super-user test for fake submission generation


jasonvarga Jul 10, 2026
25eea7f

Drop redundant super-user test from FormConnectTest


jasonvarga Jul 10, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


10 changes: 8 additions & 2 deletions
lang/en/permissions.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -72,8 +72,14 @@
 'group_forms' => 'Forms',
 'configure_forms' => 'Configure forms',
 'configure_forms_desc' => 'Grants access to all form related permissions',
 'configure_form_fields' => 'Configure Form Fields',
 'configure_form_fields_desc' => 'Ability to edit form blueprints, fieldsets, and their fields.',
 'edit_forms' => 'Edit forms',
 'edit_forms_desc' => 'Grants access to all forms, except their submissions',
 'create_forms' => 'Create forms',
 'delete_forms' => 'Delete forms',
 'view_form_submissions' => 'View submissions',
 'view_form_submissions_desc' => 'Grants access to submissions across all forms',
 'delete_form_submissions' => 'Delete submissions',
 'edit_{form}_form' => 'Edit :form form',
 'view_{form}_form_submissions' => 'View :form submissions',
 'delete_{form}_form_submissions' => 'Delete :form submissions',

Expand Down

1 change: 1 addition & 0 deletions
resources/js/pages/forms/Index.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -73,6 +73,7 @@ const reloadPage = () => router.reload();
 </template>
 <template #cell-submissions="{ row: form, value: submissions }">
 <Badge
 v-if="form.can_view_submissions"
 :href="form.submissions_url"
 :append="String(submissions)"
 :text="__('Results')"
Expand Down

24 changes: 14 additions & 10 deletions
resources/js/pages/forms/Layout.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,19 +6,23 @@ import { Button } from '@ui';
const page = usePage();
const form = computed(() => page.props.form);

const navItems = [
 { label: __('Edit'), href: cp_url(`forms/${form.value.handle}/builder`) },
 { label: __('Logic'), href: cp_url(`forms/${form.value.handle}/logic`) },
 { label: __('Connect'), href: cp_url(`forms/${form.value.handle}/connect`) },
 { label: __('Results'), href: cp_url(`forms/${form.value.handle}/submissions`) },
 { label: __('Configure'), href: cp_url(`forms/${form.value.handle}/edit`) },
];
const can = (ability) => page.props.can?.[ability] ?? false;

const navItems = computed(() =>
 [
 can('editFields') && { label: __('Edit'), href: cp_url(`forms/${form.value.handle}/builder`) },
 can('editFields') && { label: __('Logic'), href: cp_url(`forms/${form.value.handle}/logic`) },
 can('edit') && { label: __('Connect'), href: cp_url(`forms/${form.value.handle}/connect`) },
 can('viewSubmissions') && { label: __('Results'), href: cp_url(`forms/${form.value.handle}/submissions`) },
 can('edit') && { label: __('Configure'), href: cp_url(`forms/${form.value.handle}/edit`) },
 ].filter(Boolean),
);

const currentPath = computed(() => new URL(page.url, window.location.origin).pathname);
const isActive = (href) => currentPath.value.includes(new URL(href, window.location.origin).pathname);

const activeSectionLabel = computed(() => {
 return navItems.find((item) => isActive(item.href))?.label ?? navItems[0]?.label ?? '';
 return navItems.value.find((item) => isActive(item.href))?.label ?? navItems.value[0]?.label ?? '';
});

const closeMobileNavPopover = () => {
Expand All@@ -30,7 +34,7 @@ const closeMobileNavPopover = () => {
<template>
 <Teleport to="#global-header-slot">
 <div class="flex items-center justify-center">
 <div class="global-header-nav-popover lg:hidden">
 <div v-if="navItems.length > 1" class="global-header-nav-popover lg:hidden">
 <Button
 id="anchor-global-header-nav"
 variant="ghost"
Expand All@@ -55,7 +59,7 @@ const closeMobileNavPopover = () => {
 </nav>
 </div>

 <nav class="global-header-nav hidden lg:block" :aria-label="__('form_navigation')">
 <nav v-if="navItems.length > 1" class="global-header-nav hidden lg:block" :aria-label="__('form_navigation')">
 <ul>
 <li v-for="navItem in navItems" :key="navItem.href">
 <Link
Expand Down

9 changes: 5 additions & 4 deletions
resources/js/pages/forms/Submissions.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,7 @@ defineOptions({ layout: [Layout, PanelLayout, FormsLayout] });

const props = defineProps([
 'form',
 'can',
 'columns',
 'filters',
 'actionUrl',
Expand DownExpand Up@@ -127,11 +128,11 @@ function exportSubmissions() {
 {{ __(form.title) }}
 </template>

 <Dropdown v-if="form.canEdit || form.canDelete" placement="left-start" class="me-2">
 <Dropdown v-if="can.edit || can.delete" placement="left-start" class="me-2">
 <DropdownMenu>
 <DropdownItem v-if="form.canEdit" :text="__('Configure Form')" icon="cog" :href="form.editUrl" />
 <DropdownItem v-if="can.edit" :text="__('Configure Form')" icon="cog" :href="form.editUrl" />
 <DropdownItem
 v-if="form.canDelete"
 v-if="can.delete"
 :text="__('Delete Form')"
 icon="trash"
 variant="destructive"
Expand All@@ -155,7 +156,7 @@ function exportSubmissions() {
 />

 <ResourceDeleter
 v-if="form.canDelete"
 v-if="can.delete"
 ref="deleter"
 :resource-title="form.title"
 :route="form.deleteUrl"
Expand Down

11 changes: 5 additions & 6 deletions
src/Actions/DeleteFakeSubmissions.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,7 +27,7 @@ public function visibleTo($item)

 public function authorize($user, $item)
 {
 return $user->can('delete', $item);
 return $user->can('generateFakeSubmissions', $item->form());
 }

 public function run($items, $values)
Expand All@@ -41,12 +41,11 @@ public function run($items, $values)

 $fakeSubmissions = $form->submissions()->filter(fn ($submission) => (bool) $submission->get('_fake'));
 $currentUser = request()->user() ? User::fromUser(request()->user()) : null;
 $requiredPermission = "delete {$form->handle()} form submissions";
 $isSuper = $currentUser && method_exists($currentUser, 'isSuper') && $currentUser->isSuper();
 $canConfigureForms = $currentUser && method_exists($currentUser, 'hasPermission') && $currentUser->hasPermission('configure forms');
 $canDeleteSubmissions = $currentUser && method_exists($currentUser, 'hasPermission') && $currentUser->hasPermission($requiredPermission);

 if (! $isSuper && ! $canConfigureForms && ! $canDeleteSubmissions) {
 // The UI always posts the `_all_fake_submissions_` sentinel, which resolves to an
 // empty $items collection in ActionController, so authorize() never actually runs
 // for this flow. This check is the real enforcement point for the UI-driven request.
 if (! $currentUser || $currentUser->cant('generateFakeSubmissions', $form)) {
 throw new Exception(__('You are not authorized to run this action.'));
 }

Expand Down

24 changes: 22 additions & 2 deletions
src/Auth/CorePermissions.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,6 @@ public function boot()
 $this->register('access cp');
 $this->register('configure sites');
 $this->register('configure fields');
 $this->register('configure form fields');
 $this->register('manage preferences');
 });

Expand DownExpand Up@@ -209,8 +208,29 @@ protected function registerForms()
 {
 $this->register('configure forms');

 $this->register('view {form} form submissions', function ($permission) {
 $this->register('edit forms', function ($permission) {
 $this->permission($permission)->hiddenBy('configure forms')->children([
 $this->permission('create forms'),
 $this->permission('delete forms'),
 ]);
 });

 $this->register('view form submissions', function ($permission) {
 $this->permission($permission)->hiddenBy('configure forms')->children([
 $this->permission('delete form submissions'),
 ]);
 });

 $this->register('edit {form} form', function ($permission) {
 $this->permission($permission)->hiddenBy(['configure forms', 'edit forms'])->replacements('form', function () {
 return Form::all()->map(function ($form) {
 return ['value' => $form->handle(), 'label' => __($form->title())];
 });
 });
 });

 $this->register('view {form} form submissions', function ($permission) {
 $this->permission($permission)->hiddenBy(['configure forms', 'view form submissions'])->children([
 $this->permission('delete {form} form submissions'),
 ])->replacements('form', function () {
 return Form::all()->map(function ($form) {
Expand Down

2 changes: 1 addition & 1 deletion
src/Forms/Widget.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,7 +21,7 @@ public function component()
 ]);
 }

 if (! User::current()->can('view', $form)) {
 if (! User::current()->can('viewSubmissions', $form)) {
 return;
 }

Expand Down

22 changes: 22 additions & 0 deletions
src/Http/Controllers/CP/Forms/Concerns/ProvidesFormAbilities.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
<?php

namespace Statamic\Http\Controllers\CP\Forms\Concerns;

use Statamic\Contracts\Forms\Form;
use Statamic\Facades\User;

trait ProvidesFormAbilities
{
 private function formAbilities(Form $form): array
 {
 $user = User::current();

 return [
 'edit' => $user->can('edit', $form),
 'delete' => $user->can('delete', $form),
 'editFields' => $user->can('editFields', $form),
 'viewSubmissions' => $user->can('viewSubmissions', $form),
 'generateFakeSubmissions' => $user->can('generateFakeSubmissions', $form),
 ];
 }
}

8 changes: 5 additions & 3 deletions
src/Http/Controllers/CP/Forms/FormBuilderController.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,22 +13,24 @@
use Statamic\Forms\Fields\FormFieldtype;
use Statamic\Forms\Fieldtypes\Fallback;
use Statamic\Http\Controllers\CP\CpController;
use Statamic\Http\Controllers\CP\Forms\Concerns\ProvidesFormAbilities;
use Statamic\Statamic;
use Statamic\Support\Arr;

use function Statamic\trans as __;

class FormBuilderController extends CpController
{
 use ManagesFormFields;
 use ManagesFormFields, ProvidesFormAbilities;

 public function edit($form)
 {
 $this->authorize('edit', $form);
 $this->authorize('editFields', $form);

 return Inertia::render('forms/Builder', [
 ...$this->fieldProps(),
 'form' => $form,
 'can' => $this->formAbilities($form),
 'initialFormFields' => $this->toVueObject($form->formFields()),
 'formsProInstalled' => Statamic::formsProInstalled(),
 'fieldtypes' => $this->fieldtypes()->map(fn (FormFieldtype $fieldtype): array => [
Expand All@@ -42,7 +44,7 @@ public function edit($form)

 public function update(Request $request, $form)
 {
 $this->authorize('edit', $form);
 $this->authorize('editFields', $form);

 $request->validate([
 'pages' => ['required', 'array', 'min:1'],
Expand Down

4 changes: 4 additions & 0 deletions
src/Http/Controllers/CP/Forms/FormConnectController.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,15 +4,19 @@

use Inertia\Inertia;
use Statamic\Http\Controllers\CP\CpController;
use Statamic\Http\Controllers\CP\Forms\Concerns\ProvidesFormAbilities;

class FormConnectController extends CpController
{
 use ProvidesFormAbilities;

 public function __invoke($form)
 {
 $this->authorize('edit', $form);

 return Inertia::render('forms/Connect', [
 'form' => $form,
 'can' => $this->formAbilities($form),
 ]);
 }
}

2 changes: 1 addition & 1 deletion
src/Http/Controllers/CP/Forms/FormExportController.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,7 @@ class FormExportController extends CpController

 public function export(FilteredRequest $request, $form, $type)
 {
 $this->authorize('view', $form);
 $this->authorize('viewSubmissions', $form);

 if (! $exporter = $form->exporter($type)) {
 throw new NotFoundHttpException;
Expand Down

8 changes: 4 additions & 4 deletions
src/Http/Controllers/CP/Forms/FormFieldsController.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,9 +15,9 @@

class FormFieldsController extends CpController
{
 public function edit(Request $request)
 public function edit(Request $request, $form)
 {
// todo: add authorization
$this->authorize('editFields', $form);

 $request->validate([
 'type' => 'required',
Expand DownExpand Up@@ -56,9 +56,9 @@ public function edit(Request $request)
 ];
 }

 public function update(Request $request)
 public function update(Request $request, $form)
 {
// todo: add authorization
$this->authorize('editFields', $form);

 $request->validate([
 'type' => 'required',
Expand Down

4 changes: 2 additions & 2 deletions
src/Http/Controllers/CP/Forms/FormFieldsetPreviewsController.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,9 +9,9 @@

class FormFieldsetPreviewsController extends CpController
{
 public function __invoke(Request $request)
 public function __invoke(Request $request, $form)
 {
// todo: add authorization
$this->authorize('editFields', $form);

 $request->validate([
 'fieldset' => 'required|string',
Expand Down

8 changes: 5 additions & 3 deletions
src/Http/Controllers/CP/Forms/FormLogicController.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,26 +5,28 @@
use Illuminate\Http\Request;
use Inertia\Inertia;
use Statamic\Http\Controllers\CP\CpController;
use Statamic\Http\Controllers\CP\Forms\Concerns\ProvidesFormAbilities;

class FormLogicController extends CpController
{
 use ManagesFormFields;
 use ManagesFormFields, ProvidesFormAbilities;

 public function edit($form)
 {
 $this->authorize('edit', $form);
 $this->authorize('editFields', $form);

 return Inertia::render('forms/Logic', [
 ...$this->fieldProps(),
 'form' => $form,
 'can' => $this->formAbilities($form),
 'formFields' => $this->toVueObject($form->formFields()),
 'action' => cp_route('forms.logic.update', $form->handle()),
 ]);
 }

 public function update(Request $request, $form)
 {
 $this->authorize('edit', $form);
 $this->authorize('editFields', $form);

 $this->setFormFields($request, $form);

Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
[6.x] Forms 2: Permissions#14957

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

jasonvarga
merged 15 commits into

from

Jul 10, 2026
 Merged


[6.x] Forms 2: Permissions
#14957
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


15 commits


Select commit
Hold shift + click to select a range
a0ea00d

Add superseding permissions concept


duncanmcclean Jul 8, 2026
f4dcc93

Rework form permissions


duncanmcclean Jul 8, 2026
fff7c7d

Gate form pages by the new permissions


duncanmcclean Jul 8, 2026
3586efc

Avoid showing forms nav when only one page is accessible


duncanmcclean Jul 8, 2026
55c6513

Merge remote-tracking branch 'origin/forms-2' into forms-2-permissions


jasonvarga Jul 9, 2026
ed41e99

fail closed


jasonvarga Jul 9, 2026
825d3d4

Merge remote-tracking branch 'origin/forms-2' into forms-2-permissions


jasonvarga Jul 9, 2026
d3eefd7

configure forms should hide all the others


jasonvarga Jul 9, 2026
87fb51b

Don't leak submission counts to users who can't view submissions


jasonvarga Jul 10, 2026
895a1b7

Hide mobile nav popover trigger when only one form section is available


jasonvarga Jul 10, 2026
3d255bd

Add authorization test coverage for FormConnectController and FormExp…


jasonvarga Jul 10, 2026
cc58e64

Merge remote-tracking branch 'origin/forms-2' into forms-2-permissions


jasonvarga Jul 10, 2026
9754809

Gate fake submission generator behind configure forms permission


jasonvarga Jul 10, 2026
7579532

Drop redundant super-user test for fake submission generation


jasonvarga Jul 10, 2026
25eea7f

Drop redundant super-user test from FormConnectTest


jasonvarga Jul 10, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


10 changes: 8 additions & 2 deletions
lang/en/permissions.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -72,8 +72,14 @@
 'group_forms' => 'Forms',
 'configure_forms' => 'Configure forms',
 'configure_forms_desc' => 'Grants access to all form related permissions',
 'configure_form_fields' => 'Configure Form Fields',
 'configure_form_fields_desc' => 'Ability to edit form blueprints, fieldsets, and their fields.',
 'edit_forms' => 'Edit forms',
 'edit_forms_desc' => 'Grants access to all forms, except their submissions',
 'create_forms' => 'Create forms',
 'delete_forms' => 'Delete forms',
 'view_form_submissions' => 'View submissions',
 'view_form_submissions_desc' => 'Grants access to submissions across all forms',
 'delete_form_submissions' => 'Delete submissions',
 'edit_{form}_form' => 'Edit :form form',
 'view_{form}_form_submissions' => 'View :form submissions',
 'delete_{form}_form_submissions' => 'Delete :form submissions',

Expand Down

1 change: 1 addition & 0 deletions
resources/js/pages/forms/Index.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -73,6 +73,7 @@ const reloadPage = () => router.reload();
 </template>
 <template #cell-submissions="{ row: form, value: submissions }">
 <Badge
 v-if="form.can_view_submissions"
 :href="form.submissions_url"
 :append="String(submissions)"
 :text="__('Results')"
Expand Down

24 changes: 14 additions & 10 deletions
resources/js/pages/forms/Layout.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,19 +6,23 @@ import { Button } from '@ui';
const page = usePage();
const form = computed(() => page.props.form);

const navItems = [
 { label: __('Edit'), href: cp_url(`forms/${form.value.handle}/builder`) },
 { label: __('Logic'), href: cp_url(`forms/${form.value.handle}/logic`) },
 { label: __('Connect'), href: cp_url(`forms/${form.value.handle}/connect`) },
 { label: __('Results'), href: cp_url(`forms/${form.value.handle}/submissions`) },
 { label: __('Configure'), href: cp_url(`forms/${form.value.handle}/edit`) },
];
const can = (ability) => page.props.can?.[ability] ?? false;

const navItems = computed(() =>
 [
 can('editFields') && { label: __('Edit'), href: cp_url(`forms/${form.value.handle}/builder`) },
 can('editFields') && { label: __('Logic'), href: cp_url(`forms/${form.value.handle}/logic`) },
 can('edit') && { label: __('Connect'), href: cp_url(`forms/${form.value.handle}/connect`) },
 can('viewSubmissions') && { label: __('Results'), href: cp_url(`forms/${form.value.handle}/submissions`) },
 can('edit') && { label: __('Configure'), href: cp_url(`forms/${form.value.handle}/edit`) },
 ].filter(Boolean),
);

const currentPath = computed(() => new URL(page.url, window.location.origin).pathname);
const isActive = (href) => currentPath.value.includes(new URL(href, window.location.origin).pathname);

const activeSectionLabel = computed(() => {
 return navItems.find((item) => isActive(item.href))?.label ?? navItems[0]?.label ?? '';
 return navItems.value.find((item) => isActive(item.href))?.label ?? navItems.value[0]?.label ?? '';
});

const closeMobileNavPopover = () => {
Expand All@@ -30,7 +34,7 @@ const closeMobileNavPopover = () => {
<template>
 <Teleport to="#global-header-slot">
 <div class="flex items-center justify-center">
 <div class="global-header-nav-popover lg:hidden">
 <div v-if="navItems.length > 1" class="global-header-nav-popover lg:hidden">
 <Button
 id="anchor-global-header-nav"
 variant="ghost"
Expand All@@ -55,7 +59,7 @@ const closeMobileNavPopover = () => {
 </nav>
 </div>

 <nav class="global-header-nav hidden lg:block" :aria-label="__('form_navigation')">
 <nav v-if="navItems.length > 1" class="global-header-nav hidden lg:block" :aria-label="__('form_navigation')">
 <ul>
 <li v-for="navItem in navItems" :key="navItem.href">
 <Link
Expand Down

9 changes: 5 additions & 4 deletions
resources/js/pages/forms/Submissions.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,7 @@ defineOptions({ layout: [Layout, PanelLayout, FormsLayout] });

const props = defineProps([
 'form',
 'can',
 'columns',
 'filters',
 'actionUrl',
Expand DownExpand Up@@ -127,11 +128,11 @@ function exportSubmissions() {
 {{ __(form.title) }}
 </template>

 <Dropdown v-if="form.canEdit || form.canDelete" placement="left-start" class="me-2">
 <Dropdown v-if="can.edit || can.delete" placement="left-start" class="me-2">
 <DropdownMenu>
 <DropdownItem v-if="form.canEdit" :text="__('Configure Form')" icon="cog" :href="form.editUrl" />
 <DropdownItem v-if="can.edit" :text="__('Configure Form')" icon="cog" :href="form.editUrl" />
 <DropdownItem
 v-if="form.canDelete"
 v-if="can.delete"
 :text="__('Delete Form')"
 icon="trash"
 variant="destructive"
Expand All@@ -155,7 +156,7 @@ function exportSubmissions() {
 />

 <ResourceDeleter
 v-if="form.canDelete"
 v-if="can.delete"
 ref="deleter"
 :resource-title="form.title"
 :route="form.deleteUrl"
Expand Down

11 changes: 5 additions & 6 deletions
src/Actions/DeleteFakeSubmissions.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,7 +27,7 @@ public function visibleTo($item)

 public function authorize($user, $item)
 {
 return $user->can('delete', $item);
 return $user->can('generateFakeSubmissions', $item->form());
 }

 public function run($items, $values)
Expand All@@ -41,12 +41,11 @@ public function run($items, $values)

 $fakeSubmissions = $form->submissions()->filter(fn ($submission) => (bool) $submission->get('_fake'));
 $currentUser = request()->user() ? User::fromUser(request()->user()) : null;
 $requiredPermission = "delete {$form->handle()} form submissions";
 $isSuper = $currentUser && method_exists($currentUser, 'isSuper') && $currentUser->isSuper();
 $canConfigureForms = $currentUser && method_exists($currentUser, 'hasPermission') && $currentUser->hasPermission('configure forms');
 $canDeleteSubmissions = $currentUser && method_exists($currentUser, 'hasPermission') && $currentUser->hasPermission($requiredPermission);

 if (! $isSuper && ! $canConfigureForms && ! $canDeleteSubmissions) {
 // The UI always posts the `_all_fake_submissions_` sentinel, which resolves to an
 // empty $items collection in ActionController, so authorize() never actually runs
 // for this flow. This check is the real enforcement point for the UI-driven request.
 if (! $currentUser || $currentUser->cant('generateFakeSubmissions', $form)) {
 throw new Exception(__('You are not authorized to run this action.'));
 }

Expand Down

24 changes: 22 additions & 2 deletions
src/Auth/CorePermissions.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,6 @@ public function boot()
 $this->register('access cp');
 $this->register('configure sites');
 $this->register('configure fields');
 $this->register('configure form fields');
 $this->register('manage preferences');
 });

Expand DownExpand Up@@ -209,8 +208,29 @@ protected function registerForms()
 {
 $this->register('configure forms');

 $this->register('view {form} form submissions', function ($permission) {
 $this->register('edit forms', function ($permission) {
 $this->permission($permission)->hiddenBy('configure forms')->children([
 $this->permission('create forms'),
 $this->permission('delete forms'),
 ]);
 });

 $this->register('view form submissions', function ($permission) {
 $this->permission($permission)->hiddenBy('configure forms')->children([
 $this->permission('delete form submissions'),
 ]);
 });

 $this->register('edit {form} form', function ($permission) {
 $this->permission($permission)->hiddenBy(['configure forms', 'edit forms'])->replacements('form', function () {
 return Form::all()->map(function ($form) {
 return ['value' => $form->handle(), 'label' => __($form->title())];
 });
 });
 });

 $this->register('view {form} form submissions', function ($permission) {
 $this->permission($permission)->hiddenBy(['configure forms', 'view form submissions'])->children([
 $this->permission('delete {form} form submissions'),
 ])->replacements('form', function () {
 return Form::all()->map(function ($form) {
Expand Down

2 changes: 1 addition & 1 deletion
src/Forms/Widget.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,7 +21,7 @@ public function component()
 ]);
 }

 if (! User::current()->can('view', $form)) {
 if (! User::current()->can('viewSubmissions', $form)) {
 return;
 }

Expand Down

22 changes: 22 additions & 0 deletions
src/Http/Controllers/CP/Forms/Concerns/ProvidesFormAbilities.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
<?php

namespace Statamic\Http\Controllers\CP\Forms\Concerns;

use Statamic\Contracts\Forms\Form;
use Statamic\Facades\User;

trait ProvidesFormAbilities
{
 private function formAbilities(Form $form): array
 {
 $user = User::current();

 return [
 'edit' => $user->can('edit', $form),
 'delete' => $user->can('delete', $form),
 'editFields' => $user->can('editFields', $form),
 'viewSubmissions' => $user->can('viewSubmissions', $form),
 'generateFakeSubmissions' => $user->can('generateFakeSubmissions', $form),
 ];
 }
}

8 changes: 5 additions & 3 deletions
src/Http/Controllers/CP/Forms/FormBuilderController.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,22 +13,24 @@
use Statamic\Forms\Fields\FormFieldtype;
use Statamic\Forms\Fieldtypes\Fallback;
use Statamic\Http\Controllers\CP\CpController;
use Statamic\Http\Controllers\CP\Forms\Concerns\ProvidesFormAbilities;
use Statamic\Statamic;
use Statamic\Support\Arr;

use function Statamic\trans as __;

class FormBuilderController extends CpController
{
 use ManagesFormFields;
 use ManagesFormFields, ProvidesFormAbilities;

 public function edit($form)
 {
 $this->authorize('edit', $form);
 $this->authorize('editFields', $form);

 return Inertia::render('forms/Builder', [
 ...$this->fieldProps(),
 'form' => $form,
 'can' => $this->formAbilities($form),
 'initialFormFields' => $this->toVueObject($form->formFields()),
 'formsProInstalled' => Statamic::formsProInstalled(),
 'fieldtypes' => $this->fieldtypes()->map(fn (FormFieldtype $fieldtype): array => [
Expand All@@ -42,7 +44,7 @@ public function edit($form)

 public function update(Request $request, $form)
 {
 $this->authorize('edit', $form);
 $this->authorize('editFields', $form);

 $request->validate([
 'pages' => ['required', 'array', 'min:1'],
Expand Down

4 changes: 4 additions & 0 deletions
src/Http/Controllers/CP/Forms/FormConnectController.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,15 +4,19 @@

use Inertia\Inertia;
use Statamic\Http\Controllers\CP\CpController;
use Statamic\Http\Controllers\CP\Forms\Concerns\ProvidesFormAbilities;

class FormConnectController extends CpController
{
 use ProvidesFormAbilities;

 public function __invoke($form)
 {
 $this->authorize('edit', $form);

 return Inertia::render('forms/Connect', [
 'form' => $form,
 'can' => $this->formAbilities($form),
 ]);
 }
}

2 changes: 1 addition & 1 deletion
src/Http/Controllers/CP/Forms/FormExportController.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,7 @@ class FormExportController extends CpController

 public function export(FilteredRequest $request, $form, $type)
 {
 $this->authorize('view', $form);
 $this->authorize('viewSubmissions', $form);

 if (! $exporter = $form->exporter($type)) {
 throw new NotFoundHttpException;
Expand Down

8 changes: 4 additions & 4 deletions
src/Http/Controllers/CP/Forms/FormFieldsController.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,9 +15,9 @@

class FormFieldsController extends CpController
{
 public function edit(Request $request)
 public function edit(Request $request, $form)
 {
// todo: add authorization
$this->authorize('editFields', $form);

 $request->validate([
 'type' => 'required',
Expand DownExpand Up@@ -56,9 +56,9 @@ public function edit(Request $request)
 ];
 }

 public function update(Request $request)
 public function update(Request $request, $form)
 {
// todo: add authorization
$this->authorize('editFields', $form);

 $request->validate([
 'type' => 'required',
Expand Down

4 changes: 2 additions & 2 deletions
src/Http/Controllers/CP/Forms/FormFieldsetPreviewsController.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,9 +9,9 @@

class FormFieldsetPreviewsController extends CpController
{
 public function __invoke(Request $request)
 public function __invoke(Request $request, $form)
 {
// todo: add authorization
$this->authorize('editFields', $form);

 $request->validate([
 'fieldset' => 'required|string',
Expand Down

8 changes: 5 additions & 3 deletions
src/Http/Controllers/CP/Forms/FormLogicController.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,26 +5,28 @@
use Illuminate\Http\Request;
use Inertia\Inertia;
use Statamic\Http\Controllers\CP\CpController;
use Statamic\Http\Controllers\CP\Forms\Concerns\ProvidesFormAbilities;

class FormLogicController extends CpController
{
 use ManagesFormFields;
 use ManagesFormFields, ProvidesFormAbilities;

 public function edit($form)
 {
 $this->authorize('edit', $form);
 $this->authorize('editFields', $form);

 return Inertia::render('forms/Logic', [
 ...$this->fieldProps(),
 'form' => $form,
 'can' => $this->formAbilities($form),
 'formFields' => $this->toVueObject($form->formFields()),
 'action' => cp_route('forms.logic.update', $form->handle()),
 ]);
 }

 public function update(Request $request, $form)
 {
 $this->authorize('edit', $form);
 $this->authorize('editFields', $form);

 $this->setFormFields($request, $form);

Expand Down
Loading
Loading