Skip to content

A free open source IT asset/license management system

Update authorization

Marcus Mooree07c00865668
diff --git a/app/Livewire/CloneFieldset.php b/app/Livewire/CloneFieldset.php
index 39c8baacf8..af96884bd0 100644
--- a/app/Livewire/CloneFieldset.php
+++ b/app/Livewire/CloneFieldset.php
@@ -21,13 +21,13 @@ class CloneFieldset extends Component
public function submit()
{
- $this->authorize('create', CustomFieldset::class);
+ $original = CustomFieldset::findOrFail($this->id);
- $this->validate((new CustomFieldset)->rules);
+ $this->authorize('clone', $original);
- $fieldset = DB::transaction(function () {
- $original = CustomFieldset::findOrFail($this->id);
+ $this->validate((new CustomFieldset)->rules);
+ $fieldset = DB::transaction(function () use ($original) {
$fieldset = new CustomFieldset(['name' => $this->name]);
$fieldset->created_by = auth()->id();
$fieldset->save();
diff --git a/resources/views/custom_fields/fieldsets/view.blade.php b/resources/views/custom_fields/fieldsets/view.blade.php
index 307a51ac91..2e8729ddbb 100644
--- a/resources/views/custom_fields/fieldsets/view.blade.php
+++ b/resources/views/custom_fields/fieldsets/view.blade.php
@@ -91,10 +91,11 @@
@endforeach
</tbody>
- @can('update', $custom_fieldset)
+ @canany(['update', 'clone'], $custom_fieldset)
<tfoot>
<tr>
<td colspan="3">
+ @can('update', $custom_fieldset)
<form method="POST" action="{{ route('fieldsets.associate', $custom_fieldset->id) }}" accept-charset="UTF-8" class="form-inline" id="ordering">
@csrf
@@ -127,15 +128,18 @@
</span>
</form>
+ @endcan
</td>
<td colspan="4" class="text-right">
- <livewire:clone-fieldset :id="$custom_fieldset->id" />
+ @can('clone', $custom_fieldset)
+ <livewire:clone-fieldset :id="$custom_fieldset->id" />
+ @endcan
</td>
</tr>
</tfoot>
- @endcan
+ @endcanany
</table>
@endif
diff --git a/tests/Feature/Livewire/CloneFieldsetTest.php b/tests/Feature/Livewire/CloneFieldsetTest.php
index 9ae77a4e79..617886f4ce 100644
--- a/tests/Feature/Livewire/CloneFieldsetTest.php
+++ b/tests/Feature/Livewire/CloneFieldsetTest.php
@@ -11,6 +11,15 @@ use Tests\TestCase;
class CloneFieldsetTest extends TestCase
{
+ public function test_the_component_can_render()
+ {
+ $fieldset = CustomFieldset::factory()->create();
+
+ Livewire::actingAs(User::factory()->viewCustomFields()->createCustomFields()->create())
+ ->test(CloneFieldset::class, ['id' => $fieldset->id])
+ ->assertStatus(200);
+ }
+
public function test_clones_fieldset_with_field_order_and_required_flags_and_redirects_to_it()
{
$original = CustomFieldset::factory()->create();
@@ -18,7 +27,7 @@ class CloneFieldsetTest extends TestCase
$original->fields()->attach($first, ['order' => 1, 'required' => true]);
$original->fields()->attach($second, ['order' => 2, 'required' => false]);
- $user = User::factory()->createCustomFields()->create();
+ $user = User::factory()->viewCustomFields()->createCustomFields()->create();
$component = Livewire::actingAs($user)
->test(CloneFieldset::class, ['id' => $original->id])
@@ -62,7 +71,7 @@ class CloneFieldsetTest extends TestCase
$original = CustomFieldset::factory()->create();
$fieldsetCount = CustomFieldset::count();
- Livewire::actingAs(User::factory()->createCustomFields()->create())
+ Livewire::actingAs(User::factory()->viewCustomFields()->createCustomFields()->create())
->test(CloneFieldset::class, ['id' => $original->id])
->set('name', '')
->call('submit')
@@ -76,7 +85,7 @@ class CloneFieldsetTest extends TestCase
$original = CustomFieldset::factory()->create();
$fieldsetCount = CustomFieldset::count();
- Livewire::actingAs(User::factory()->createCustomFields()->create())
+ Livewire::actingAs(User::factory()->viewCustomFields()->createCustomFields()->create())
->test(CloneFieldset::class, ['id' => $original->id])
->set('name', $original->name)
->call('submit')