Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -332,7 +332,6 @@ public function update(Request $request, $collection)
->defaultPublishState($values['default_publish_state'])
->sortDirection($values['sort_direction'])
->mount($values['mount'] ?? null)
->revisionsEnabled($values['revisions'] ?? false)
->taxonomies($values['taxonomies'] ?? [])
->futureDateBehavior(Arr::get($values, 'future_date_behavior'))
->pastDateBehavior(Arr::get($values, 'past_date_behavior'))
Expand All @@ -342,6 +341,10 @@ public function update(Request $request, $collection)
->requiresSlugs($values['require_slugs'])
->previewTargets($values['preview_targets']);

if (array_key_exists('revisions', $values)) {
$collection->revisionsEnabled($values['revisions']);
}

if ($sites = Arr::get($values, 'sites')) {
$collection
->sites($sites)
Expand Down
34 changes: 34 additions & 0 deletions tests/Feature/Collections/UpdateCollectionTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,40 @@ public function settings_links_to_true_will_also_create_the_default_blueprint_if
$this->assertEquals(['test', 'link'], $blueprints->map->handle()->values()->all());
}

#[Test]
public function it_updates_revisions()
{
config(['statamic.revisions.enabled' => true]);

$collection = tap(Collection::make('test')->revisionsEnabled(false))->save();

$this
->actingAs($this->userWithPermission())
->update($collection, ['revisions' => true])
->assertOk();

$this->assertTrue(Collection::findByHandle('test')->revisionsEnabled());
}

#[Test]
public function it_doesnt_update_revisions_when_the_field_is_hidden()
{
config(['statamic.revisions.enabled' => true]);

$collection = tap(Collection::make('test')->revisionsEnabled(true))->save();

config(['statamic.revisions.enabled' => false]);

$this
->actingAs($this->userWithPermission())
->update($collection)
->assertOk();

config(['statamic.revisions.enabled' => true]);

$this->assertTrue(Collection::findByHandle('test')->revisionsEnabled());
}

private function userWithoutPermission()
{
$this->setTestRoles(['test' => ['access cp']]);
Expand Down
Loading