Jingga/oms-Media
1
0
Fork 0
mirror of https://github.com/Karaka-Management/oms-Media.git synced 2026-02-18 10:18:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixing media upload based on reporter

Browse Source
This commit is contained in:
Dennis Eichhorn 2016-07-06 22:21:21 +02:00
parent 84cccb51be
commit 05641c71f0
4 changed files with 54 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
Controller.js
View File

@ -9,17 +9,30 @@
this.app = app; this.app = app;
}; };
jsOMS.Modules.Media.prototype.bind = function () jsOMS.Modules.Media.prototype.bind = function (id)
{ {
let forms = document.getElementsByTagName('form'); let e = typeof id === 'undefined' ? document.getElementsByTagName('form') : [document.getElementById(id)],
length = e.length;
for (let i = 0; i < length; i++) {
this.bindElement(e[i]);
}
};
jsOMS.Modules.Media.prototype.bindElement = function (form)
{
if (typeof form === 'undefined' || !form) {
// todo: do logging here
return;
}
/* Handle media forms */
for (let i = 0; i < forms.length; i++) {
let self = this; let self = this;
if (typeof forms[i].querySelector('input[type=file]') !== 'undefined') { if (typeof form.querySelector('input[type=file]') !== 'undefined') {
try { try {
this.app.uiManager.getFormManager().get(forms[i].id).injectSubmit(function (e, requestId, requestGroup) // Inject media upload into form view
this.app.uiManager.getFormManager().get(form.id).injectSubmit(function (e, requestId, requestGroup)
{ {
let fileFields = e.querySelectorAll('input[type=file]'), let fileFields = e.querySelectorAll('input[type=file]'),
uploader = new jsOMS.Modules.Models.Media.Upload(self.app.responseManager, self.app.logger); uploader = new jsOMS.Modules.Models.Media.Upload(self.app.responseManager, self.app.logger);
@ -27,7 +40,7 @@
uploader.setSuccess(e.id, function (type, response) uploader.setSuccess(e.id, function (type, response)
{ {
e.querySelector('input[type=file]+input[type=hidden]').value = JSON.stringify(response.uploads); e.querySelector('input[type=file]+input[type=hidden]').value = JSON.stringify(response.uploads);
self.app.eventManager.triggerDone(requestId, requestGroup); self.app.eventManager.trigger(requestId, requestGroup);
}); });
uploader.setUri(Url + '{/lang}/api/media'); uploader.setUri(Url + '{/lang}/api/media');
@ -48,11 +61,12 @@
this.app.logger.info('Tried to add media upload support for form without an ID.'); this.app.logger.info('Tried to add media upload support for form without an ID.');
} }
} }
}
}; };
}(window.jsOMS = window.jsOMS || {})); }(window.jsOMS = window.jsOMS || {}));
jsOMS.ready(function () jsOMS.ready(function ()
{ {
"use strict";
window.omsApp.moduleManager.get('Media').bind(); window.omsApp.moduleManager.get('Media').bind();
}); });

6
Controller.php
View File

@ -25,6 +25,7 @@ use phpOMS\Message\ResponseAbstract;
use phpOMS\Model\Html\Head; use phpOMS\Model\Html\Head;
use phpOMS\Module\ModuleAbstract; use phpOMS\Module\ModuleAbstract;
use phpOMS\Module\WebInterface; use phpOMS\Module\WebInterface;
use phpOMS\System\MimeType;
use phpOMS\Views\View; use phpOMS\Views\View;
/** /**
@ -96,8 +97,8 @@ class Controller extends ModuleAbstract implements WebInterface
{ {
/** @var Head $head */ /** @var Head $head */
$head = $response->get('Content')->getData('head'); $head = $response->get('Content')->getData('head');
$head->addAsset(AssetType::JS, $request->getUri()->getBase() . 'Modules/Media/Models/Upload.js'); $head->addAsset(AssetType::JSLATE, $request->getUri()->getBase() . 'Modules/Media/Models/Upload.js');
$head->addAsset(AssetType::JS, $request->getUri()->getBase() . 'Modules/Media/Controller.js'); $head->addAsset(AssetType::JSLATE, $request->getUri()->getBase() . 'Modules/Media/Controller.js');
} }
/** /**
@ -175,6 +176,7 @@ class Controller extends ModuleAbstract implements WebInterface
{ {
$uploads = $this->uploadFiles($request->getFiles(), $request->getAccount()); $uploads = $this->uploadFiles($request->getFiles(), $request->getAccount());
$response->getHeader()->set('Content-Type', MimeType::M_JSON . '; charset=utf-8', true);
$response->set($request->__toString(), [['uploads' => $uploads, 'type' => 'UI']]); $response->set($request->__toString(), [['uploads' => $uploads, 'type' => 'UI']]);
} }

1
Models/Upload.js
View File

@ -94,6 +94,7 @@
} }
} }
} catch (exception) { } catch (exception) {
console.log(exception);
self.logger.error('Invalid media upload response: ' + xhr.response); self.logger.error('Invalid media upload response: ' + xhr.response);
return false; return false;

2
Models/UploadFile.php
View File

@ -192,7 +192,7 @@ class UploadFile
$rndPath = str_pad(dechex(rand(0, 65535)), 4, '0', STR_PAD_LEFT); $rndPath = str_pad(dechex(rand(0, 65535)), 4, '0', STR_PAD_LEFT);
} while (file_exists($this->outputDir . '/' . $rndPath)); } while (file_exists($this->outputDir . '/' . $rndPath));
$this->outputDir = '/../../..' . $this->outputDir . '/' . $rndPath; $this->outputDir = $this->outputDir . '/' . $rndPath;
} }
} }