diff --git a/src/app/convert/scripts/ThumbnailScript.php b/src/app/convert/scripts/ThumbnailScript.php index fc760662e251ec0fd78f16515995ef8278986835..199f69943cf24679b2b37fedba9450ed09f33f40 100644 --- a/src/app/convert/scripts/ThumbnailScript.php +++ b/src/app/convert/scripts/ThumbnailScript.php @@ -38,6 +38,7 @@ class ThumbnailScript $GLOBALS['id'] = $args['userId']; + $document = DocumentModel::getById(['select' => ['status'], 'id' => $args['id']]); DocumentModel::update([ 'set' => ['status' => 'CONVERTING'], 'where' => ['id = ?'], @@ -65,11 +66,13 @@ class ThumbnailScript 'data' => ['errors' => $isConverted['errors']] ]); } else { - DocumentModel::update([ - 'set' => ['status' => 'READY'], - 'where' => ['id = ?'], - 'data' => [$args['id']] - ]); + if ($document['status'] != 'CONVERTING') { + DocumentModel::update([ + 'set' => ['status' => 'READY'], + 'where' => ['id = ?'], + 'data' => [$args['id']] + ]); + } } return $isConverted; diff --git a/src/app/document/models/DocumentModel.php b/src/app/document/models/DocumentModel.php index 239bbca6afec24f66c0cdb4845cebe1d1d25020d..79451e45dad99f063585a71288b86bdbfa312118 100755 --- a/src/app/document/models/DocumentModel.php +++ b/src/app/document/models/DocumentModel.php @@ -38,16 +38,16 @@ class DocumentModel return $aDocuments; } - public static function getById(array $aArgs) + public static function getById(array $args) { - ValidatorModel::notEmpty($aArgs, ['select', 'id']); - ValidatorModel::arrayType($aArgs, ['select']); + ValidatorModel::notEmpty($args, ['select', 'id']); + ValidatorModel::arrayType($args, ['select']); $document = DatabaseModel::select([ - 'select' => $aArgs['select'], + 'select' => $args['select'], 'table' => ['main_documents'], 'where' => ['id = ?'], - 'data' => [$aArgs['id']] + 'data' => [$args['id']] ]); if (empty($document[0])) {