Skip to content
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

5.0.x #599

Merged
merged 6 commits into from
Feb 23, 2022
Merged

5.0.x #599

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
10f74c4
feat: add corporate_reward_payout (#597)
tehraven Jan 12, 2022
1df69df
fix: add check around impersonation button
Crypta-Eve Feb 20, 2022
8333770
fix: s/online_layers/online_players/g
Crypta-Eve Feb 20, 2022
79f38b9
Round Security Status in Character Overview
Crypta-Eve Feb 20, 2022
6bfec6b
fix: only show corp member limit if we have it
Crypta-Eve Feb 23, 2022
4b80a77
remove tracking ordering from alliance tracking datatable
Crypta-Eve Feb 23, 2022
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
Prev Previous commit
remove tracking ordering from alliance tracking datatable
  • Loading branch information
@Crypta-Eve
Crypta-Eve committed Feb 23, 2022
commit 4b80a77c1a4c33fc9e79dbeb342ae508a47e2efc
5 changes: 2 additions & 3 deletions src/Http/DataTables/Alliance/Intel/TrackingDataTable.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,8 +92,7 @@ public function html()
public function query()
{
return CorporationInfo::player()
->with('member_limit', 'ceo', 'alliance')
->withCount('characters')
->with('member_limit', 'ceo', 'alliance', 'characters')
->select('corporation_infos.*');
}

Expand All @@ -108,7 +107,7 @@ public function getColumns()
['data' => 'ceo.name', 'title' => trans('web::seat.ceo')],
['data' => 'tax_rate', 'title' => trans('web::seat.tax_rate')],
['data' => 'member_count', 'title' => trans('web::seat.member_count')],
['data' => 'tracking', 'title' => trans_choice('web::seat.valid_token', 2)],
['data' => 'tracking', 'title' => trans_choice('web::seat.valid_token', 2), 'orderable' => false],
];
}
}