Skip to content

Commit 6f350a7

Browse files
committed
Merge branch 'main' into dat/active-policy-not-accept-by-user
2 parents fe1b918 + 9807851 commit 6f350a7

3 files changed

Lines changed: 14 additions & 2 deletions

File tree

.vscode/tasks.json

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
{
2+
"version": "2.0.0",
3+
"tasks": [
4+
{
5+
"label": "finish-rebase-active-policy-branch",
6+
"type": "shell",
7+
"command": "GIT_PAGER=cat EDITOR=true VISUAL=true GIT_EDITOR=true GIT_SEQUENCE_EDITOR=true git rebase --continue && GIT_PAGER=cat git status --short --branch && git branch --show-current",
8+
"isBackground": false
9+
}
10+
]
11+
}

app/Http/Controllers/PoliciesController.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,7 @@ public function getMissingPolicies(Request $request): PoliciesCollection {
2626
->from('policy_acceptances')
2727
->whereColumn('policy_acceptances.policy_id', 'policies.id')
2828
->where('policy_acceptances.user_id', $request->user()->id);
29-
})
30-
->get();
29+
})->get();
3130

3231
return new PoliciesCollection($missingPolicies);
3332
}

app/Http/Resources/PolicyResource.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ class PolicyResource extends JsonResource {
1212
*
1313
* @return array<string, mixed>
1414
*/
15+
public static $wrap = null;
16+
1517
public function toArray(Request $request): array {
1618
return [
1719
'metadata' => [

0 commit comments

Comments
 (0)