- @if (method_exists($this, 'previewUrl') && ($preview = $this->previewUrl()))
-
Ausgabe prüfen
+ @php
+ $pruefen = $pruefenUrl ?? null;
+ if (! filled($pruefen) && method_exists($this, 'previewUrl')) {
+ $pruefen = $this->previewUrl();
+ }
+ @endphp
+ @if (filled($pruefen))
+
Ausgabe prüfen
+ @else
+
@endif
@if ($this->canEditEditorial())
diff --git a/resources/views/filament/verwaltung/texte-artikel.blade.php b/resources/views/filament/verwaltung/texte-artikel.blade.php
index 86483d4..edfced6 100644
--- a/resources/views/filament/verwaltung/texte-artikel.blade.php
+++ b/resources/views/filament/verwaltung/texte-artikel.blade.php
@@ -7,7 +7,7 @@
['id' => 'artikel-teaser', 'label' => 'Teaser', 'model' => 'teaser', 'kind' => 'textarea', 'rows' => 2, 'value' => $this->teaser, 'field' => 'teaser'],
['id' => 'artikel-kurz', 'label' => 'Kurzbeschreibung', 'model' => 'summary', 'kind' => 'textarea', 'rows' => 4, 'value' => $this->summary, 'field' => 'summary'],
['id' => 'artikel-beschreibung', 'label' => 'Ausführliche Beschreibung', 'model' => 'descriptionText', 'kind' => 'textarea', 'rows' => 6, 'value' => $this->descriptionText, 'field' => 'description'],
- ['id' => 'artikel-suche', 'label' => 'Suchbegriffe', 'model' => 'searchTerms', 'kind' => 'text', 'value' => $this->searchTerms, 'origin' => 'Freie Suche, keine Klassifikation'],
+ ['id' => 'artikel-suche', 'label' => 'Suchbegriffe', 'model' => 'searchTerms', 'kind' => 'text', 'value' => $this->searchTerms, 'origin' => null],
];
@endphp
diff --git a/resources/views/filament/verwaltung/texte-komposition.blade.php b/resources/views/filament/verwaltung/texte-komposition.blade.php
index cdf79cc..3ae06fd 100644
--- a/resources/views/filament/verwaltung/texte-komposition.blade.php
+++ b/resources/views/filament/verwaltung/texte-komposition.blade.php
@@ -7,7 +7,7 @@
['id' => 'redaktion-teaser', 'label' => 'Teaser', 'model' => 'teaser', 'kind' => 'textarea', 'rows' => 2, 'value' => $this->teaser, 'field' => 'teaser'],
['id' => 'redaktion-kurz', 'label' => 'Kurzbeschreibung', 'model' => 'summary', 'kind' => 'textarea', 'rows' => 3, 'value' => $this->summary, 'field' => 'summary'],
['id' => 'redaktion-beschreibung', 'label' => 'Ausführliche Beschreibung', 'model' => 'description', 'kind' => 'textarea', 'rows' => 8, 'value' => $this->description, 'field' => 'description'],
- ['id' => 'redaktion-suche', 'label' => 'Suchbegriffe', 'model' => 'searchTerms', 'kind' => 'text', 'value' => $this->searchTerms, 'origin' => 'Freie Suche, keine Klassifikation', 'placeholder' => 'Begriffe für die Suche'],
+ ['id' => 'redaktion-suche', 'label' => 'Suchbegriffe', 'model' => 'searchTerms', 'kind' => 'text', 'value' => $this->searchTerms, 'origin' => null, 'placeholder' => 'Begriffe für die Suche'],
];
@endphp
@@ -20,7 +20,7 @@
'kind' => $feld['kind'],
'rows' => $feld['rows'] ?? 3,
'value' => $feld['value'],
- 'origin' => $feld['origin'] ?? (isset($feld['field']) ? $profile->originLabel($feld['field']) : null),
+ 'origin' => $feld['origin'] ?? (isset($feld['field']) && in_array($profile->origin($feld['field']), ['eigen', 'quelle', 'variante'], true) ? $profile->originLabel($feld['field']) : null),
'placeholder' => $feld['placeholder'] ?? '',
'disabled' => ! $editable,
])
diff --git a/resources/views/filament/verwaltung/texte-medium.blade.php b/resources/views/filament/verwaltung/texte-medium.blade.php
index 2046fab..9e509cc 100644
--- a/resources/views/filament/verwaltung/texte-medium.blade.php
+++ b/resources/views/filament/verwaltung/texte-medium.blade.php
@@ -7,9 +7,9 @@
['id' => 'redaktion-teaser', 'label' => 'Teaser', 'model' => 'teaser', 'kind' => 'textarea', 'rows' => 2, 'value' => $this->teaser, 'field' => 'teaser'],
['id' => 'redaktion-kurz', 'label' => 'Kurzbeschreibung', 'model' => 'summary', 'kind' => 'textarea', 'rows' => 3, 'value' => $this->summary, 'field' => 'summary'],
['id' => 'redaktion-beschreibung', 'label' => 'Ausführliche Beschreibung', 'model' => 'descriptionText', 'kind' => 'textarea', 'rows' => 8, 'value' => $this->descriptionText, 'field' => 'description'],
- ['id' => 'redaktion-suche', 'label' => 'Suchbegriffe', 'model' => 'searchTerms', 'kind' => 'text', 'value' => $this->searchTerms, 'origin' => 'Freie Suche, keine Klassifikation', 'placeholder' => 'Begriffe für die Suche, durch Komma getrennt'],
+ ['id' => 'redaktion-suche', 'label' => 'Suchbegriffe', 'model' => 'searchTerms', 'kind' => 'text', 'value' => $this->searchTerms, 'origin' => null, 'placeholder' => 'Begriffe für die Suche, durch Komma getrennt'],
['id' => 'redaktion-einsatz', 'label' => 'Hinweise für den Einsatz', 'model' => 'usageNote', 'kind' => 'textarea', 'rows' => 4, 'value' => $this->usageNote, 'origin' => null],
- ['id' => 'redaktion-lizenz', 'label' => 'Interner Lizenzvermerk', 'model' => 'licenseNote', 'kind' => 'textarea', 'rows' => 4, 'value' => $this->licenseNote, 'origin' => 'Nur intern'],
+ ['id' => 'redaktion-lizenz', 'label' => 'Interner Lizenzvermerk', 'model' => 'licenseNote', 'kind' => 'textarea', 'rows' => 4, 'value' => $this->licenseNote, 'origin' => null],
['id' => 'redaktion-quelle', 'label' => 'Quellenzeile für die Website', 'model' => 'websiteCredit', 'kind' => 'textarea', 'rows' => 2, 'value' => $this->websiteCredit, 'origin' => null],
['id' => 'redaktion-alt', 'label' => 'Alternativtext für die Website', 'model' => 'websiteAlt', 'kind' => 'text', 'value' => $this->websiteAlt, 'origin' => null],
];
@@ -24,7 +24,7 @@
'kind' => $feld['kind'],
'rows' => $feld['rows'] ?? 3,
'value' => $feld['value'],
- 'origin' => $feld['origin'] ?? (isset($feld['field']) ? $profile->originLabel($feld['field']) : null),
+ 'origin' => $feld['origin'] ?? (isset($feld['field']) && in_array($profile->origin($feld['field']), ['eigen', 'quelle', 'variante'], true) ? $profile->originLabel($feld['field']) : null),
'placeholder' => $feld['placeholder'] ?? '',
'disabled' => ! $editable,
'required' => $feld['required'] ?? false,
diff --git a/tests/Feature/VerwaltungArbeitsplatzTest.php b/tests/Feature/VerwaltungArbeitsplatzTest.php
index a529b93..1a6b2df 100644
--- a/tests/Feature/VerwaltungArbeitsplatzTest.php
+++ b/tests/Feature/VerwaltungArbeitsplatzTest.php
@@ -41,6 +41,12 @@ public function test_redaktion_return_keeps_open_composition_inputs_and_saves_on
->call('openRedaktion')
->assertSet('redaktionOpen', true)
->assertSet('partOpen', false)
+ ->assertSee('Redaktion speichern')
+ ->assertSee('Ausgabe prüfen')
+ ->assertSee('grid-template-areas: "griff daumen text aktionen"', false)
+ ->assertDontSee('grid-column: 2 / -1', false)
+ ->assertDontSee('In Mitgliederbibliothek anzeigen')
+ ->assertDontSee('Vorschau für Trainer')
->assertSet('roleDraft', 'Einstieg')
->assertSet('learningGoal', 'Grenze erkennen')
->set('teaser', 'Kurzer Teaser im Manager')