Skip to content

Commit 54684f4

Browse files
Merge pull request #117 from imbus/SIT-202-avoidUsingUndefinedVariables
fixed using undefined variable and removed some old stuff
2 parents 9bfed0e + 4b56105 commit 54684f4

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

app/Http/Transformers/PredefinedFiltersTransformer.php

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,11 @@ public function transformPredefinedFilter($filter)
5656
$array['groups'] = null;
5757
}
5858

59+
$permissionsArray = [];
60+
5961
$permissionsArray['available_actions'] = [
60-
'update' => $filter->created_by === auth()->id() || $filter->userHasPermission(auth()->user(), 'edit'),
61-
'delete' => $filter->created_by === auth()->id() || $filter->userHasPermission(auth()->user(), 'delete')
62+
'update' => $filter->userHasPermission(auth()->user(), 'edit'),
63+
'delete' => $filter->userHasPermission(auth()->user(), 'delete')
6264
];
6365
return $array += $permissionsArray;
6466
}

tests/Feature/PredefinedFilter/Api/PredefinedFilterControllerTest.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -737,7 +737,7 @@ public function test_transform_without_permission_groups_loaded_sets_groups_null
737737
$this->assertFalse($result['available_actions']['delete']);
738738
}
739739

740-
public function test_transform_sets_available_actions_true_for_owner()
740+
public function test_transform_sets_available_actions_false_for_owner()
741741
{
742742
$this->transformer = new PredefinedFiltersTransformer();
743743

@@ -754,8 +754,8 @@ public function test_transform_sets_available_actions_true_for_owner()
754754

755755
$result = $this->transformer->transformPredefinedFilter($filter);
756756

757-
$this->assertTrue($result['available_actions']['update']);
758-
$this->assertTrue($result['available_actions']['delete']);
757+
$this->assertFalse($result['available_actions']['update']);
758+
$this->assertFalse($result['available_actions']['delete']);
759759
}
760760

761761
public function test_transform_formats_dates_correctly()

0 commit comments

Comments
 (0)