diff --git a/app/Http/Controllers/ExtendedController.php b/app/Http/Controllers/ExtendedController.php
index 8cbf0c04..a61dfabe 100755
--- a/app/Http/Controllers/ExtendedController.php
+++ b/app/Http/Controllers/ExtendedController.php
@@ -1709,8 +1709,12 @@ class ExtendedController extends Controller
->select(DB::raw('YEAR(`datetime`) as year'))
->where('type', $this->modelType)
->orderBy('datetime', 'DESC')
- ->groupBy(DB::raw('YEAR(`datetime`)'))
- ->get();
+ ->groupBy(DB::raw('YEAR(`datetime`)'));
+ if(key_exists('limit', $options))
+ {
+ $years = $years->limit($options['limit']);
+ }
+ $years = $years->get();
$filter['label'] = $options['label'];
$filter['name'] = $options['name'];
diff --git a/app/Http/Controllers/OperationController.php b/app/Http/Controllers/OperationController.php
index dcacaec6..22877822 100755
--- a/app/Http/Controllers/OperationController.php
+++ b/app/Http/Controllers/OperationController.php
@@ -75,6 +75,10 @@ class OperationController extends PostController
'column' => 'type',
'value' => 'fahrzeug',
],
+ [
+ 'column' => 'published',
+ 'value' => '1,'
+ ]
],
]
],
diff --git a/app/Http/Controllers/ServiceController.php b/app/Http/Controllers/ServiceController.php
index 2fcdf52d..4e5847d9 100755
--- a/app/Http/Controllers/ServiceController.php
+++ b/app/Http/Controllers/ServiceController.php
@@ -168,7 +168,8 @@ class ServiceController extends PostController
'year' => [
'type' => 'select',
'label' => __('general.year'),
- 'name' => strtolower(__('general.year'))
+ 'name' => strtolower(__('general.year')),
+ 'limit' => 5,
],
]
];
diff --git a/resources/views/inc/admin/crudModal.blade.php b/resources/views/inc/admin/crudModal.blade.php
index caff2725..3b4c9fdb 100755
--- a/resources/views/inc/admin/crudModal.blade.php
+++ b/resources/views/inc/admin/crudModal.blade.php
@@ -107,17 +107,19 @@
{{ Form::open(array('id' => 'formPublish')) }}
{{ Form::checkbox('publish_website', 'true', ($model->published == "" ? ($wizard ? true : false) : true), array('class' => 'form-check-input', 'id' => 'publish_website')) }}
{{ Form::label('publish_website', 'Internetseite') }}
- @if($model->hasGetMutator('HasPublications'))
- @if($model->hasPublications)
- @if($model->type != 'dienst')
- {{ Form::checkbox('publish_facebook', 'true', ($model->publication('facebook')->state == "" ? ($wizard ? true : false) : true), array('class' => 'form-check-input', 'id' => 'publish_facebook', ($model->publication('facebook')->isPublished() ? 'disabled' : ''))) }}
- {{ Form::label('publish_facebook', 'Facebook '.($model->publication('facebook')->date_to_publish <= \Carbon\Carbon::now() ? '('.__("general.immediately").')' : '('.Date::daysToPublicationString($model->publication('facebook')->date_to_publish).')')) }}
- {{ Form::checkbox('publish_twitter', 'true', ($model->publication('twitter')->state == "" ? ($wizard ? true : false) : true), array('class' => 'form-check-input', 'id' => 'publish_twitter', ($model->publication('twitter')->isPublished() ? 'disabled' : ''))) }}
- {{ Form::label('publish_twitter', 'Twitter '.($model->publication('twitter')->date_to_publish <= \Carbon\Carbon::now() ? '('.__("general.immediately").')' : '('.Date::daysToPublicationString($model->publication('twitter')->date_to_publish).')')) }}
- @endif
- {{ Form::checkbox('publish_stadtanzeiger', 'true', ($model->publication('stadtanzeiger')->state == "" ? ($wizard ? true : false) : true), array('class' => 'form-check-input', 'id' => 'publish_stadtanzeiger', ($model->publication('stadtanzeiger')->isPublished() ? 'disabled' : ''))) }}
- {{ Form::label('publish_stadtanzeiger', 'Stadtanzeiger '.($model->publication('stadtanzeiger')->date_to_publish <= \Carbon\Carbon::now() ? '('.__("general.immediately").')' : '('.Date::daysToPublicationString($model->publication('stadtanzeiger')->date_to_publish).')')) }}
- @endif
+ @if($model->isPost)
+ @if($model->hasGetMutator('HasPublications'))
+ @if($model->hasPublications)
+ @if($model->type != 'dienst')
+ {{ Form::checkbox('publish_facebook', 'true', ($model->publication('facebook')->state == "" ? ($wizard ? true : false) : true), array('class' => 'form-check-input', 'id' => 'publish_facebook', ($model->publication('facebook')->isPublished() ? 'disabled' : ''))) }}
+ {{ Form::label('publish_facebook', 'Facebook '.($model->publication('facebook')->date_to_publish <= \Carbon\Carbon::now() ? '('.__("general.immediately").')' : '('.Date::daysToPublicationString($model->publication('facebook')->date_to_publish).')')) }}
+ {{ Form::checkbox('publish_twitter', 'true', ($model->publication('twitter')->state == "" ? ($wizard ? true : false) : true), array('class' => 'form-check-input', 'id' => 'publish_twitter', ($model->publication('twitter')->isPublished() ? 'disabled' : ''))) }}
+ {{ Form::label('publish_twitter', 'Twitter '.($model->publication('twitter')->date_to_publish <= \Carbon\Carbon::now() ? '('.__("general.immediately").')' : '('.Date::daysToPublicationString($model->publication('twitter')->date_to_publish).')')) }}
+ @endif
+ {{ Form::checkbox('publish_stadtanzeiger', 'true', ($model->publication('stadtanzeiger')->state == "" ? ($wizard ? true : false) : true), array('class' => 'form-check-input', 'id' => 'publish_stadtanzeiger', ($model->publication('stadtanzeiger')->isPublished() ? 'disabled' : ''))) }}
+ {{ Form::label('publish_stadtanzeiger', 'Stadtanzeiger '.($model->publication('stadtanzeiger')->date_to_publish <= \Carbon\Carbon::now() ? '('.__("general.immediately").')' : '('.Date::daysToPublicationString($model->publication('stadtanzeiger')->date_to_publish).')')) }}
+ @endif
+ @endif
@endif
{{ Form::close() }}