Skip to content

Commit 712aa9e

Browse files
scott graysonscott grayson
authored andcommitted
Merge: Resolve conflicts and integrate latest changes
- Remove HasLibraryAccess.php (replaced by policy-based permissions) - Integrate updates to LibraryItem model and related components - Merge latest changes from feature branches
2 parents 1fd295b + 7013cce commit 712aa9e

File tree

6 files changed

+3
-14
lines changed

6 files changed

+3
-14
lines changed

src/Commands/SeedLibraryCommand.php

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,3 @@ public function handle(): int
3232
return self::SUCCESS;
3333
}
3434
}
35-
36-
37-
38-

src/Middleware/RedirectToCorrectEditPage.php

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,3 @@ public function handle(Request $request, Closure $next)
3737
return $next($request);
3838
}
3939
}
40-
41-
42-
43-

src/Models/LibraryItem.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -646,7 +646,7 @@ public function toggleFavorite(): void
646646
*/
647647
public function isFavorite(): bool
648648
{
649-
if (!auth()->check()) {
649+
if (! auth()->check()) {
650650
return false;
651651
}
652652

src/Models/LibraryItemTag.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public function getColorFromId(): string
2929
'primary', 'secondary', 'success', 'danger', 'warning', 'info',
3030
'gray', 'slate', 'zinc', 'neutral', 'stone', 'red', 'orange',
3131
'amber', 'yellow', 'lime', 'green', 'emerald', 'teal', 'cyan',
32-
'sky', 'blue', 'indigo', 'violet', 'purple', 'fuchsia', 'pink', 'rose'
32+
'sky', 'blue', 'indigo', 'violet', 'purple', 'fuchsia', 'pink', 'rose',
3333
];
3434

3535
return $colors[$this->id % count($colors)];

src/Resources/LibraryItemResource.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,7 @@ public static function table(Table $table): Table
143143
->limit(50)
144144
->tooltip(function (Tables\Columns\TextColumn $column): ?string {
145145
$state = $column->getState();
146+
146147
return strlen($state) > 50 ? $state : null;
147148
})
148149
->icon(fn (?LibraryItem $record): string => $record?->getDisplayIcon() ?? 'heroicon-o-document')

src/Resources/Pages/CreateLink.php

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,3 @@ protected function mutateFormDataBeforeCreate(array $data): array
2121
return $data;
2222
}
2323
}
24-
25-
26-
27-

0 commit comments

Comments
 (0)