diff --git a/app/Http/Controllers/ExtendedController.php b/app/Http/Controllers/ExtendedController.php index b71e8dcd..6ae09717 100755 --- a/app/Http/Controllers/ExtendedController.php +++ b/app/Http/Controllers/ExtendedController.php @@ -433,6 +433,7 @@ class ExtendedController extends Controller if($this->modelClass == Post::class) { $model = $this->newModel()->create(); + $model->type = $this->modelType; } else { diff --git a/resources/views/inc/admin/crudModal.blade.php b/resources/views/inc/admin/crudModal.blade.php index 4ec278e2..caff2725 100755 --- a/resources/views/inc/admin/crudModal.blade.php +++ b/resources/views/inc/admin/crudModal.blade.php @@ -109,10 +109,12 @@ {{ Form::label('publish_website', 'Internetseite') }}
@if($model->hasGetMutator('HasPublications')) @if($model->hasPublications) - {{ 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).')')) }}
+ @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 diff --git a/resources/views/inc/forms/formAjaxPublish.blade.php b/resources/views/inc/forms/formAjaxPublish.blade.php index 089ea0bf..3940e3f7 100644 --- a/resources/views/inc/forms/formAjaxPublish.blade.php +++ b/resources/views/inc/forms/formAjaxPublish.blade.php @@ -35,16 +35,18 @@ @endif - @if($model->publication('facebook')->isPublished()) - - - - @endif + @if($model->type != 'dienst') + @if($model->publication('facebook')->isPublished()) + + + + @endif - @if($model->publication('twitter')->isPublished()) - - - + @if($model->publication('twitter')->isPublished()) + + + + @endif @endif @include('inc.forms.button', [