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

Jump to bottom

Add affiliations update button #582

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Add affiliations update button #582

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f4c9c5e
Add affiliations update button
veteranmina Aug 28, 2021
4c03388
missing comma...
veteranmina Aug 28, 2021
78adca3
Move button to footer
veteranmina Aug 28, 2021
9bd1c20
Merge remote-tracking branch 'upstream/master' into Affiliations
veteranmina May 15, 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
1 change: 1 addition & 0 deletions src/Config/web.jobnames.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
return [

'character' => [
'affiliations' => \Seat\Eveapi\Jobs\Esi\Update\Affiliations::class,
'assets' => \Seat\Eveapi\Jobs\Assets\Character\Assets::class,
'blueprints' => \Seat\Eveapi\Jobs\Character\Blueprints::class,
'calendar' => [
Expand Down
1 change: 1 addition & 0 deletions src/resources/lang/en/seat.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -453,6 +453,7 @@
'profiles as well. Leave blank to use the default. If you enter something below, you must ensure at least one button is shown.',

// Updaters
'update_affiliation' => 'Update Affiliation|Update Affiliations',
'update_dispatched' => 'Update job has successfully been dispatched. Please check back again ' .
'in a few moments.',
'update_failed' => 'Update job dispatching failed. Please contact your SeAT administrator.',
Expand Down
17 changes: 10 additions & 7 deletions src/resources/views/character/includes/summary.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,13 +151,16 @@
<img src="{{ asset('web/img/eve-prism.png') }}" />
</a>
</span>
@can('global.superuser')
@if(! is_null($character->refresh_token))
<a href="{{ route('configuration.users.edit', $character->refresh_token->user_id) }}" class="btn btn-xs btn-secondary float-right">
<i class="fas fa-user"></i> {{ trans_choice('web::seat.user', 1) }}
</a>
@endif
@endcan
<span class="float-right">
@can('global.superuser')
@if(! is_null($character->refresh_token))
<a href="{{ route('configuration.users.edit', $character->refresh_token->user_id) }}" class="btn btn-xs btn-secondary">
<i class="fas fa-user"></i> {{ trans_choice('web::seat.user', 1) }}
</a>
@endif
@endcan
@include('web::components.jobs.buttons.update', ['type' => 'character', 'entity' => $character->character_id, 'job' => 'character.affiliations', 'label' => trans('web::seat.update_affiliation', 1)])
</span>
</div>
</div>

Expand Down