Skip to content

Commit 32b6ee7

Browse files
committed
Merge remote-tracking branch 'origin/main'
# Conflicts: # src/Resources/MenuResource/Pages/ManageMenuItems.php
2 parents e1a21b4 + 0004b66 commit 32b6ee7

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

src/Resources/MenuResource/Pages/ManageMenuItems.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44

55
use Filament\Actions\LocaleSwitcher;
66
use Illuminate\Database\Eloquent\Model;
7-
use SolutionForest\FilamentTree\Concern\TreeRecords\Translatable;
87
use SolutionForest\FilamentTree\Actions\Action;
98
use SolutionForest\FilamentTree\Actions\DeleteAction;
109
use SolutionForest\FilamentTree\Actions\EditAction;
10+
use SolutionForest\FilamentTree\Concern\TreeRecords\Translatable;
1111
use SolutionForest\FilamentTree\Resources\Pages\TreePage;
1212
use Statikbe\FilamentFlexibleContentBlockPages\Facades\FilamentFlexibleContentBlockPages;
1313
use Statikbe\FilamentFlexibleContentBlockPages\Filament\Form\Forms\MenuItemForm;
@@ -104,12 +104,13 @@ public function getTreeRecordTitle(?Model $record = null): string
104104
}
105105

106106
$locale = $this->getActiveLocale();
107+
107108
return $record->getDisplayLabel($locale);
108109
}
109110

110111
public function getTreeRecordIcon(?\Illuminate\Database\Eloquent\Model $record = null): ?string
111112
{
112-
//TODO
113+
// TODO
113114
return parent::getTreeRecordIcon($record);
114115
}
115116

0 commit comments

Comments
 (0)