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

fix invalid link in activities #549

Merged
merged 2 commits into from
Nov 27, 2023
Merged

fix invalid link in activities #549

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5d55987
patching improvements
dbarzin Nov 22, 2023
365ebba
fix invalid link in activities
dbarzin Nov 27, 2023
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
10 changes: 5 additions & 5 deletions resources/views/admin/activities/show.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,10 +56,10 @@
</th>
<td>
@foreach($activity->activitiesProcesses as $process)
<a href="{{ route('admin.operations.show', $process->id) }}">{{ $process->identifiant }}</a>
<a href="{{ route('admin.processes.show', $process->id) }}">{{ $process->identifiant }}</a>
@if (!$loop->last)
,
@endif
@endif
@endforeach
</td>
</tr>
Expand All @@ -73,7 +73,7 @@
<a href="{{ route('admin.operations.show', $operation->id) }}">{{ $operation->name }}</a>
@if (!$loop->last)
,
@endif
@endif
@endforeach
</td>
</tr>
Expand All @@ -90,8 +90,8 @@
</div>
<div class="card-footer">
{{ trans('global.created_at') }} {{ $activity->created_at ? $activity->created_at->format(trans('global.timestamp')) : '' }} |
{{ trans('global.updated_at') }} {{ $activity->updated_at ? $activity->updated_at->format(trans('global.timestamp')) : '' }}
{{ trans('global.updated_at') }} {{ $activity->updated_at ? $activity->updated_at->format(trans('global.timestamp')) : '' }}
</div>
</div>

@endsection
@endsection
5 changes: 4 additions & 1 deletion resources/views/admin/patching/edit.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,10 +264,13 @@
</div>
</div>
</div>
<!---------------------------------------------------------------------------------------------------->
<!---------------------------------------------------------------------------------------------------->
<div class="row">
<div class="col-sm">
<div class="form-group">
<a class="btn btn-default" href="{{ route('admin.patching.index') }}">
{{ trans('global.back_to_list') }}
</a>
<button class="btn btn-danger" type="submit">
{{ trans('global.save') }}
</button>
Expand Down
16 changes: 8 additions & 8 deletions resources/views/admin/patching/index.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
@extends('layouts.admin')
@section('content')
<div style="margin-bottom: 10px;" class="row">
<div class="col-lg-2">
<div class="col-lg-3">
<form method="get" action="/admin/patching/index">
<label class="recommended" for="patching_group">{{ trans('cruds.logicalServer.fields.patching_group') }}</label>
<select name="group" class="form-control select2 {{ $errors->has('patching_group') ? 'is-invalid' : '' }}"
Expand Down Expand Up @@ -81,22 +81,22 @@
</td>
<td>
@foreach($server->applications as $application)
<a href="{{ route('admin.applications.show', $application->id) }}">
{{ $application->responsible }}
</a>
@if(!$loop->last)
,
@if ($application->responsible!=null)
{{ $application->responsible }}
@if(!$loop->last)
,
@endif
@endif
@endforeach
</td>
<td>
{{ $server->patching_group ?? '' }}
</td>
<td>
{{ $server->update_date ?? '' }}
{{ ($server->update_date!=null) ? \Carbon\Carbon::createFromFormat(config('panel.date_format'), $server->update_date)->format('Y-m-d') : '' }}
</td>
<td>
{{ $server->next_update ?? '' }}
{{ ($server->next_update!=null) ? \Carbon\Carbon::createFromFormat(config('panel.date_format'), $server->next_update)->format('Y-m-d') : '' }}
</td>
<td>
@can('logical_server_show')
Expand Down
Loading