unify sub category sort

xiaomlove · Apr 20, 2023 · 10cd698 · 10cd698
1 parent e5c91d4
commit 10cd698
Show file tree

Hide file tree

Showing 6 changed files with 74 additions and 75 deletions.
diff --git a/app/Filament/Resources/Section/CategoryResource.php b/app/Filament/Resources/Section/CategoryResource.php
@@ -78,8 +78,8 @@ function () {
                 ,
                 Forms\Components\TextInput::make('sort_index')
                     ->default(0)
-                    ->label(__('label.search_box.taxonomy.sort_index'))
-                    ->helperText(__('label.search_box.taxonomy.sort_index_help'))
+                    ->label(__('label.priority'))
+                    ->helperText(__('label.priority_help'))
                 ,
 
             ]);
@@ -97,7 +97,7 @@ public static function table(Table $table): Table
                 Tables\Columns\TextColumn::make('class_name')->label(__('label.search_box.taxonomy.class_name')),
                 Tables\Columns\TextColumn::make('sort_index')->label(__('label.search_box.taxonomy.sort_index'))->sortable(),
             ])
-            ->defaultSort('sort_index', 'asc')
+            ->defaultSort('sort_index', 'desc')
             ->filters([
                 Tables\Filters\SelectFilter::make('mode')
                     ->options(SearchBox::query()->pluck('name', 'id')->toArray())

diff --git a/app/Filament/Resources/Section/CodecResource.php b/app/Filament/Resources/Section/CodecResource.php
@@ -32,8 +32,8 @@ public static function form(Form $form): Form
                 Forms\Components\TextInput::make('name')->required()->label(__('label.search_box.taxonomy.name'))->required(),
                 Forms\Components\TextInput::make('sort_index')
                     ->default(0)
-                    ->label(__('label.search_box.taxonomy.sort_index'))
-                    ->helperText(__('label.search_box.taxonomy.sort_index_help'))
+                    ->label(__('label.priority'))
+                    ->helperText(__('label.priority_help'))
                 ,
                 Forms\Components\Select::make('mode')
                     ->options(SearchBox::query()->pluck('name', 'id')->toArray())
@@ -55,7 +55,7 @@ public static function table(Table $table): Table
                 Tables\Columns\TextColumn::make('name')->label(__('label.search_box.taxonomy.name'))->searchable(),
                 Tables\Columns\TextColumn::make('sort_index')->label(__('label.search_box.taxonomy.sort_index'))->sortable(),
             ])
-            ->defaultSort('sort_index', 'asc')
+            ->defaultSort('sort_index', 'desc')
             ->filters([
                 Tables\Filters\SelectFilter::make('mode')
                     ->options(SearchBox::query()->pluck('name', 'id')->toArray())

diff --git a/app/Repositories/SearchBoxRepository.php b/app/Repositories/SearchBoxRepository.php
@@ -176,7 +176,7 @@ private function buildTaxonomySelect(SearchBox $searchBox, $torrentField, array
             $select .= sprintf('<option value="%s">%s</option>', 0, nexus_trans('nexus.select_one_please'));
             $list = NexusDB::table($table)->where(function (Builder $query) use ($searchBox) {
                 return $query->where('mode', $searchBox->id)->orWhere('mode', 0);
-            })->get();
+            })->orderBy('sort_index', 'desc')->get();
             foreach ($list as $item) {
                 $selected = '';
                 if (isset($torrentInfo[$torrentField]) && $torrentInfo[$torrentField] == $item->id) {