normalize filenames

This commit is contained in:
HolgerHatGarKeineNode
2023-02-27 16:50:25 +01:00
parent 9896618944
commit 2be0b8da2a
13 changed files with 145 additions and 126 deletions

View File

@@ -23,22 +23,26 @@ class NewsArticleForm extends Component
public array $temporaryUrls = [];
public ?string $fromUrl = '';
protected $queryString = ['fromUrl' => ['except' => '']];
public function rules()
{
return [
'image' => [Rule::requiredIf(! $this->libraryItem->id), 'nullable', 'mimes:jpeg,png,jpg,gif', 'max:10240'],
'image' => [Rule::requiredIf(!$this->libraryItem->id), 'nullable', 'mimes:jpeg,png,jpg,gif', 'max:10240'],
'libraryItem.lecturer_id' => 'required',
'libraryItem.name' => 'required',
'libraryItem.type' => 'required',
'libraryItem.language_code' => 'required',
'libraryItem.value' => 'required',
'libraryItem.subtitle' => 'required',
'libraryItem.excerpt' => 'required',
'libraryItem.lecturer_id' => 'required',
'libraryItem.name' => 'required',
'libraryItem.type' => 'required',
'libraryItem.language_code' => 'required',
'libraryItem.value' => 'required',
'libraryItem.subtitle' => 'required',
'libraryItem.excerpt' => 'required',
'libraryItem.main_image_caption' => 'required',
'libraryItem.read_time' => 'required',
'libraryItem.approved' => 'boolean',
'libraryItem.news' => 'boolean',
'libraryItem.read_time' => 'required',
'libraryItem.approved' => 'boolean',
'libraryItem.news' => 'boolean',
];
}
@@ -46,16 +50,19 @@ class NewsArticleForm extends Component
{
if ($this->libraryItem === null) {
$this->libraryItem = new LibraryItem([
'type' => 'markdown_article',
'value' => '',
'read_time' => 1,
'news' => true,
'type' => 'markdown_article',
'value' => '',
'read_time' => 1,
'news' => true,
'language_code' => 'de',
'approved' => auth()
'approved' => auth()
->user()
->hasRole('news-editor'),
]);
}
if (!$this->fromUrl) {
$this->fromUrl = url()->previous();
}
}
public function updatedImages($value)
@@ -76,17 +83,18 @@ class NewsArticleForm extends Component
if ($this->image) {
$this->libraryItem->addMedia($this->image)
->usingFileName(md5($this->image->getClientOriginalName()).'.'.$this->image->getClientOriginalExtension())
->toMediaCollection('main');
}
return to_route('article.overview', ['country' => null]);
return redirect($this->fromUrl);
}
public function delete()
{
$this->libraryItem->delete();
return to_route('article.overview', ['country' => null]);
return redirect($this->fromUrl);
}
public function render()