franzz/spot
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix file upload feedback

Browse Source
This commit is contained in:
Franzz
2019-06-28 00:06:23 +02:00
parent 4d46662544
commit 6d7f561544
3 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
inc/spot.php
View File

@@ -327,9 +327,9 @@ class Spot extends Main
public function upload() public function upload()
{ {
$this->oClassManagement->incClass('uploader', true); $this->oClassManagement->incClass('uploader', true);
new Uploader($this->oPicture); $oUploader = new Uploader($this->oPicture);
return self::getJsonResult(true, ''); return $oUploader->sBody;
} }
public function getAdminSettings() { public function getAdminSettings() {

8
inc/uploader.php
View File

@@ -7,11 +7,14 @@ class Uploader extends UploadHandler
* @var Picture * @var Picture
*/ */
private $oPicture; private $oPicture;
public $sBody;
function __construct(&$oPicture) function __construct(&$oPicture)
{ {
$this->error_messages['wrong_project_mode'] = 'Le projet n\'est pas en mode "blog".'; $this->error_messages['wrong_project_mode'] = 'Le projet n\'est pas en mode "blog".';
$this->oPicture = &$oPicture; $this->oPicture = &$oPicture;
$this->sBody = '';
parent::__construct(array('image_versions'=>array(), 'accept_file_types'=>'/\.(gif|jpe?g|png)$/i')); parent::__construct(array('image_versions'=>array(), 'accept_file_types'=>'/\.(gif|jpe?g|png)$/i'));
} }
@@ -29,6 +32,7 @@ class Uploader extends UploadHandler
protected function handle_file_upload($uploaded_file, $name, $size, $type, $error, $index = null, $content_range = null) { protected function handle_file_upload($uploaded_file, $name, $size, $type, $error, $index = null, $content_range = null) {
$file = parent::handle_file_upload($uploaded_file, $name, $size, $type, $error, $index, $content_range); $file = parent::handle_file_upload($uploaded_file, $name, $size, $type, $error, $index, $content_range);
if(empty($file->error)) { if(empty($file->error)) {
$sError = $this->oPicture->addPic($file->name); $sError = $this->oPicture->addPic($file->name);
if($sError!='') { if($sError!='') {
@@ -38,6 +42,10 @@ class Uploader extends UploadHandler
return $file; return $file;
} }
protected function body($sBodyPart) {
$this->sBody .= $sBodyPart;
}
} }
/* /*

13
masks/upload.html
View File

@@ -16,20 +16,17 @@ oSpot.pageInit = function(asHash)
.fileupload({ .fileupload({
dataType: 'json', dataType: 'json',
acceptFileTypes: /(\.|\/)(gif|jpe?g|png)$/i, acceptFileTypes: /(\.|\/)(gif|jpe?g|png)$/i,
done: function (e, asResult) { done: function (e, asData) {
var $Status = $('#status'); var $Status = $('#status');
$.each(asResult.files, function(iKey, oFile) { $.each(asData.result.files, function(iKey, oFile) {
var sMsg = ('error' in oFile)?oFile.error:(oFile.name+" uploaded successfully"); var sMsg = ('error' in oFile)?oFile.error:(oFile.name+" uploaded successfully");
$Status.append($('<p>').text(sMsg)); $Status.append($('<p>').text(sMsg));
}); });
}, },
progressall: function (e, data) { progressall: function (e, data) {
var progress = parseInt(data.loaded / data.total * 100, 10); var progress = parseInt(data.loaded / data.total * 100, 10);
$('#progress .bar').css( $('#progress .bar').css('width', progress+'%');
'width', }
progress + '%'
);
}
}); });
} }
else $('#messages').empty().append('Le projet "'+asProject.name+'" n\'est pas en mode blog. Aucun upload possible.'); else $('#messages').empty().append('Le projet "'+asProject.name+'" n\'est pas en mode blog. Aucun upload possible.');