Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
This commit is contained in:
John Molakvoæ (skjnldsv) 2018-09-19 17:00:05 +02:00 коммит произвёл Roeland Jago Douma
Родитель 8622c54948
Коммит a5eb500d5e
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: F941078878347C0C
2 изменённых файлов: 21 добавлений и 22 удалений

Просмотреть файл

@ -110,7 +110,7 @@ class TemplatesController extends Controller {
}
if ($template instanceof ISimpleFile) {
return new DataResponse([], Http::STATUS_NO_CONTENT);
return new DataResponse([], Http::STATUS_NOT_FOUND);
}
return $this->fetchPreview($template, $x, $y, $a, $forceIcon, $mode);

Просмотреть файл

@ -63,21 +63,21 @@ class TemplateManager {
private $previewManager;
/** Accepted templates mime types */
const MIME_DOCUMENTS = [
'a', 'b', 'c'
const MIMES_DOCUMENTS = [
'application/vnd.oasis.opendocument.text'
];
const MIME_SHEETS = [
'aa', 'bb', 'cc'
const MIMES_SHEETS = [
'application/vnd.oasis.opendocument.spreadsheet'
];
const MIME_PRESENTATIONS = [
'aaa', 'bbb', 'ccc'
const MIMES_PRESENTATIONS = [
'application/vnd.oasis.opendocument.presentation'
];
/** @var array Template mime types match */
static public $tplTypes = [
'document' => self::MIME_DOCUMENTS,
'sheet' => self::MIME_SHEETS,
'presentation' => self::MIME_PRESENTATIONS
'document' => self::MIMES_DOCUMENTS,
'spreadsheet' => self::MIMES_SHEETS,
'presentation' => self::MIMES_PRESENTATIONS
];
/**
@ -92,12 +92,12 @@ class TemplateManager {
* @param IPreview $previewManager
*/
public function __construct(string $appName,
string $userId,
IConfig $config,
Factory $appDataFactory,
IURLGenerator $urlGenerator,
IRootFolder $rootFolder,
IPreview $previewManager) {
string $userId,
IConfig $config,
Factory $appDataFactory,
IURLGenerator $urlGenerator,
IRootFolder $rootFolder,
IPreview $previewManager) {
$this->appName = $appName;
$this->userId = $userId;
$this->config = $config;
@ -172,8 +172,8 @@ class TemplateManager {
$system = $this->getSystem();
$user = $this->getUser();
return array_filter(array_merge($user, $system), function ($template) {
$template['ext'] === $type;
return array_filter(array_merge($user, $system), function ($template) use ($type) {
return $template['ext'] === $type;
});
}
@ -220,9 +220,8 @@ class TemplateManager {
*/
private function flipTypes(): array{
$result = array();
foreach ($this::$tplTypes as $type => &$mime) {
$mime = array_fill_keys($mime, $type);
$result = array_merge($result, $mime);
foreach ($this::$tplTypes as $type => $mime) {
$result = array_merge($result, array_fill_keys($mime, $type));
}
return $result;
@ -262,7 +261,7 @@ class TemplateManager {
return [
'name' => $template->getName(),
'preview' => $this->urlGenerator->linkToRoute('richdocuments.templates.getPreview', ['templateName' => $template->getName()]),
'ext' => $this->flipTypes[$template->getMimeType()],
'ext' => $this->flipTypes()[$template->getMimeType()],
'etag' => $template->getETag(),
'delete' => $this->urlGenerator->linkToRoute('richdocuments.templates.delete', ['templateName' => $template->getName()])
];