Skip to content

Minor improvements for the language grid view #6203

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
BurntimeX merged 4 commits into from
Feb 4, 2025
Merged

Minor improvements for the language grid view #6203

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1f4d985
Change the order of the title column
BurntimeX Feb 4, 2025
5935140
Add missing row link
BurntimeX Feb 4, 2025
f4f720c
Fix alignment of numeric columns
BurntimeX Feb 4, 2025
51b637a
Add visible indicator for the default language
BurntimeX Feb 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 27 additions & 6 deletions wcfsetup/install/files/lib/system/gridView/admin/LanguageGridView.class.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,9 @@
use wcf\system\gridView\filter\ObjectIdFilter;
use wcf\system\gridView\filter\TextFilter;
use wcf\system\gridView\GridViewColumn;
use wcf\system\gridView\GridViewRowLink;
use wcf\system\gridView\renderer\DefaultColumnRenderer;
use wcf\system\gridView\renderer\ILinkColumnRenderer;
use wcf\system\gridView\renderer\NumberColumnRenderer;
use wcf\system\gridView\renderer\ObjectIdColumnRenderer;
use wcf\system\interaction\admin\LanguageInteractions;
Expand Down Expand Up @@ -44,14 +46,32 @@ public function __construct()
->filter(new ObjectIdFilter())
->renderer(new ObjectIdColumnRenderer())
->sortable(),
GridViewColumn::for('languageCode')
->label('wcf.acp.language.code')
->filter(new TextFilter())
->sortable(),
GridViewColumn::for('languageName')
->label('wcf.global.name')
->filter(new TextFilter())
->titleColumn()
->sortable()
->renderer([
new class extends DefaultColumnRenderer {
#[\Override]
public function render(mixed $value, DatabaseObject $row): string
{
\assert($row instanceof Language);

if ($row->isDefault) {
$value .= \sprintf(
' <span class="badge">%s</span>',
WCF::getLanguage()->get('wcf.global.defaultValue')
);
}

return $value;
}
},
]),
GridViewColumn::for('languageCode')
->label('wcf.acp.language.code')
->filter(new TextFilter())
->sortable(),
GridViewColumn::for('users')
->label('wcf.acp.language.users')
Expand All @@ -62,7 +82,7 @@ public function __construct()
->label('wcf.acp.language.variables')
->filter(new NumericFilter($this->subSelectVariables()))
->renderer(
new class extends DefaultColumnRenderer {
new class extends NumberColumnRenderer implements ILinkColumnRenderer {
#[\Override]
public function render(mixed $value, DatabaseObject $row): string
{
Expand All @@ -84,7 +104,7 @@ public function render(mixed $value, DatabaseObject $row): string
->label('wcf.acp.language.customVariables')
->filter(new NumericFilter($this->subSelectCustomVariables()))
->renderer(
new class extends DefaultColumnRenderer {
new class extends NumberColumnRenderer implements ILinkColumnRenderer {
#[\Override]
public function render(mixed $value, DatabaseObject $row): string
{
Expand Down Expand Up @@ -121,6 +141,7 @@ public function render(mixed $value, DatabaseObject $row): string
)
);

$this->addRowLink(new GridViewRowLink(LanguageEditForm::class));
$this->setSortField('languageName');
}

Expand Down