Skip to content

Commit 15e1149

Browse files
committed
made revision links work with localhost too; added standard date format
1 parent d70389a commit 15e1149

File tree

3 files changed

+7
-9
lines changed

3 files changed

+7
-9
lines changed

src/CrudServiceProvider.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,12 +106,10 @@ public static function resource($name, $controller, array $options = [])
106106
'as' => 'crud.'.$name.'.translateItem',
107107
'uses' => $controller.'@translateItem',
108108
]);
109-
110109
Route::get($name.'/{id}/revisions', [
111110
'as' => 'crud.'.$name.'.listRevisions',
112111
'uses' => $controller.'@listRevisions',
113112
]);
114-
115113
Route::post($name.'/{id}/revisions/{revisionId}/restore', [
116114
'as' => 'crud.'.$name.'.restoreRevision',
117115
'uses' => $controller.'@restoreRevision',
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
@if ($crud->hasAccess('revisions') && count($entry->revisionHistory))
2-
<a href="{{ url($crud->route.'/'.$entry->getKey().'/revisions') }}" class="btn btn-xs btn-default"><i class="fa fa-clone"></i> {{ trans('backpack::crud.revisions') }}</a>
2+
<a href="{{ url($crud->route.'/'.$entry->getKey().'/revisions') }}" class="btn btn-xs btn-default"><i class="fa fa-history"></i> {{ trans('backpack::crud.revisions') }}</a>
33
@endif

src/resources/views/inc/revision_timeline.blade.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,10 @@
22
@foreach($revisions as $revisionDate => $dateRevisions)
33
<li class="time-label" data-date="{{ date('Y-m-d', strtotime($revisionDate)) }}">
44
<span class="bg-red">
5-
{{-- @TODO: Display date in user's time format (.e.g dd/mm/yyyy vs mm/dd/yyyy) --}}
6-
{{ date('Y-m-d', strtotime($revisionDate)) }}
5+
{{ Date::parse($revisionDate)->format(config('backpack.base.default_date_format')) }}
76
</span>
87
</li>
9-
8+
109
@foreach($dateRevisions as $history)
1110
<li class="timeline-item-wrap">
1211
<i class="fa fa-calendar bg-blue"></i>
@@ -22,7 +21,7 @@
2221
{{ trans('backpack::crud.to') }}: {{ $history->newValue() }}
2322
</div>
2423
<div class="timeline-footer">
25-
{!! Form::open(array('url' => $crud->route.'/'.$entry->getKey().'/revisions/'.$history->id.'/restore', 'method' => 'post')) !!}
24+
{!! Form::open(array('url' => \Request::url().'/'.$history->id.'/restore', 'method' => 'post')) !!}
2625
<button type="submit" class="btn btn-primary btn-xs restore-btn" data-entry-id="{{ $entry->id }}" data-revision-id="{{ $history->id }}" onclick="onRestoreClick(event)">
2726
<i class="fa fa-history"></i> {{ trans('backpack::crud.restore_this_value') }}</button>
2827
{!! Form::close() !!}
@@ -47,7 +46,7 @@ function onRestoreClick(e) {
4746
e.preventDefault();
4847
var entryId = $(e.target).attr('data-entry-id');
4948
var revisionId = $(e.target).attr('data-revision-id');
50-
$.ajax('/{{ $crud->route.'/' }}' + entryId + '/revisions/' + revisionId + '/restore', {
49+
$.ajax('{{ \Request::url().'/' }}' + revisionId + '/restore', {
5150
method: 'POST',
5251
data: {
5352
revision_id: revisionId
@@ -59,7 +58,8 @@ function onRestoreClick(e) {
5958
// Animate the new revision in (by sliding)
6059
$('.timeline-item-wrap').first().addClass('fadein');
6160
new PNotify({
62-
title: '{{ trans('backpack::crud.revision_restored') }}'
61+
title: '{{ trans('backpack::crud.revision_restored') }}',
62+
type: 'success'
6363
});
6464
}
6565
});

0 commit comments

Comments
 (0)