Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bugfix/main/minor fixes #1412

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
+18 −20
Open

Bugfix/main/minor fixes #1412

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
24ef83d
Replaced outdated code
jonasraoni May 30, 2023
7e0344c
Fixed/improved returns
jonasraoni May 30, 2023
fbdc3ca
Replaced is_a() by a more specific instanceof check
jonasraoni May 30, 2023
d20ae24
Submodule update ##jonasraoni/bugfix/main/minor-fixes##
jonasraoni May 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 0 additions & 1 deletion classes/notification/NotificationManager.php
View file
Open in desktop
Expand Up @@ -118,7 +118,6 @@ public function getNotificationTypeByEditorDecision(Decision $decision): ?int
default:
return parent::getNotificationTypeByEditorDecision($decision);
}
return null;
}
}

Expand Down
2 changes: 1 addition & 1 deletion classes/spotlight/SpotlightDAO.php
View file
Open in desktop
Expand Up @@ -187,7 +187,7 @@ public function updateObject($spotlight)
*/
public function deleteObject($spotlight)
{
return $this->deleteById($spotlight->getId());
$this->deleteById($spotlight->getId());
}

/**
Expand Down
6 changes: 3 additions & 3 deletions controllers/grid/catalogEntry/PublicationFormatGridCellProvider.php
View file
Open in desktop
Expand Up @@ -17,6 +17,7 @@
namespace APP\controllers\grid\catalogEntry;

use APP\core\Application;
use APP\publicationFormat\PublicationFormat;
use PKP\controllers\api\file\linkAction\AddFileLinkAction;
use PKP\controllers\grid\DataObjectGridCellProvider;
use PKP\controllers\grid\files\fileList\linkAction\SelectFilesLinkAction;
Expand Down Expand Up @@ -97,8 +98,7 @@ public function getTemplateVarsFromRowColumn($row, $column)
{
$data = $row->getData();

if (is_a($data, 'Representation')) {
/** @var Representation $data */
if ($data instanceof PublicationFormat) {
switch ($column->getId()) {
case 'indent': return [];
case 'name':
Expand Down Expand Up @@ -151,7 +151,7 @@ public function getCellActions($request, $row, $column, $position = GridHandler:
{
$data = $row->getData();
$router = $request->getRouter();
if (is_a($data, 'Representation')) {
if ($data instanceof PublicationFormat) {
switch ($column->getId()) {
case 'isAvailable':
return [new LinkAction(
Expand Down
2 changes: 1 addition & 1 deletion lib/pkp
Open in desktop
Submodule pkp updated 28 files
+1 −1 classes/announcement/AnnouncementTypeDAO.php
+1 −1 classes/core/DataObject.php
+1 −1 classes/db/DAO.php
+1 −1 classes/file/ContextFileManager.php
+1 −7 classes/handler/PKPHandler.php
+1 −0 classes/metadata/MetadataRecord.php
+0 −2 classes/migration/Migration.php
+3 −3 classes/migration/upgrade/v3_4_0/PreflightCheckMigration.php
+1 −1 classes/navigationMenu/NavigationMenuDAO.php
+1 −1 classes/navigationMenu/NavigationMenuItemAssignmentDAO.php
+1 −1 classes/navigationMenu/NavigationMenuItemDAO.php
+20 −19 classes/notification/PKPNotificationOperationManager.php
+4 −8 classes/payment/PaymentManager.php
+1 −1 classes/plugins/Plugin.php
+1 −0 classes/plugins/ThemePlugin.php
+2 −1 classes/query/QueryDAO.php
+2 −2 classes/security/Validation.php
+2 −2 classes/stageAssignment/StageAssignmentDAO.php
+2 −1 classes/statistics/PKPTemporaryItemInvestigationsDAO.php
+2 −1 classes/statistics/PKPTemporaryItemRequestsDAO.php
+2 −1 classes/statistics/PKPTemporaryTotalsDAO.php
+2 −1 classes/statistics/TemporaryInstitutionsDAO.php
+1 −4 classes/submissionFile/DAO.php
+2 −0 classes/user/DAO.php
+1 −1 controllers/grid/eventLog/EventLogGridCellProvider.php
+1 −1 pages/catalog/PKPCatalogHandler.php
+6 −4 pages/reviewer/PKPReviewerHandler.php
+9 −9 tests/classes/filter/FilterDAOTest.php
2 changes: 1 addition & 1 deletion pages/manageCatalog/ManageCatalogHandler.php
View file
Open in desktop
Expand Up @@ -147,6 +147,6 @@ public function index($args, $request)
'catalog' => $catalogList->getConfig()
]
]);
return $templateMgr->display('manageCatalog/index.tpl');
$templateMgr->display('manageCatalog/index.tpl');
}
}
25 changes: 12 additions & 13 deletions plugins/importexport/csv/CSVImportExportPlugin.php
View file
Open in desktop
Expand Up @@ -21,10 +21,8 @@
use APP\publicationFormat\PublicationFormatDAO;
use APP\submission\Submission;
use APP\template\TemplateManager;
use PKP\core\Core;
use PKP\db\DAORegistry;
use PKP\file\FileManager;
use PKP\file\TemporaryFileManager;
use PKP\plugins\ImportExportPlugin;
use PKP\security\Role;
use PKP\submission\GenreDAO;
Expand Down Expand Up @@ -160,7 +158,7 @@ public function executeCLI($scriptName, &$args)
if (in_array($locale, $supportedLocales)) {
$submission = Repo::submission()->newDataObject();
$submission->setContextId($press->getId());
$submission->setUserId($user->getId());
$submission->setData('uploaderUserId', $user->getId());
$submission->stampLastActivity();
$submission->setStatus(PKPSubmission::STATUS_PUBLISHED);
$submission->setWorkType($isEditedVolume == 1 ? Submission::WORK_TYPE_EDITED_VOLUME : Submission::WORK_TYPE_AUTHORED_WORK);
Expand Down Expand Up @@ -218,7 +216,6 @@ public function executeCLI($scriptName, &$args)
$publicationFormat->setPhysicalFormat(false);
$publicationFormat->setIsApproved(true);
$publicationFormat->setIsAvailable(true);
$publicationFormat->setSubmissionId($submissionId);
$publicationFormat->setProductAvailabilityCode('20'); // ONIX code for Available.
$publicationFormat->setEntryKey('DA'); // ONIX code for Digital
$publicationFormat->setData('name', 'PDF', $submission->getLocale());
Expand All @@ -240,30 +237,32 @@ public function executeCLI($scriptName, &$args)
$publicationDateDao->insertObject($publicationDate);

// Submission File.
$temporaryFileManager = new TemporaryFileManager();
$temporaryFilename = tempnam($temporaryFileManager->getBasePath(), 'remote');
$temporaryFileManager->copyFile($pdfUrl, $temporaryFilename);
$fileManager = new FileManager();
$extension = $fileManager->parseFileExtension($_FILES['uploadedFile']['name']);
$submissionDir = Repo::submissionFile()->getSubmissionDir($press->getId(), $submissionId);
/** @var PKPFileService */
$fileService = Services::get('file');
$fileId = $fileService->add(
$pdfUrl,
$submissionDir . '/' . uniqid() . '.' . $extension
);

$submissionFile = $submissionFileDao->newDataObject();
$submissionFile->setData('submissionId', $submissionId);
$submissionFile->setSubmissionLocale($submission->getLocale());
$submissionFile->setGenreId($genre->getId());
$submissionFile->setFileStage(SubmissionFile::SUBMISSION_FILE_PROOF);
$submissionFile->setDateUploaded(Core::getCurrentDate());
$submissionFile->setDateModified(Core::getCurrentDate());
$submissionFile->setAssocType(Application::ASSOC_TYPE_REPRESENTATION);
$submissionFile->setData('assocId', $publicationFormatId);
$submissionFile->setData('mimetype', 'application/pdf');
$submissionFile->setData('fileId', $fileId);

// Assume open access, no price.
$submissionFile->setDirectSalesPrice(0);
$submissionFile->setSalesType('openAccess');

Repo::submissionFile()
->add($submissionFile, $temporaryFilename);

$fileManager = new FileManager();
$fileManager->deleteByPath($temporaryFilename);
->add($submissionFile);

echo __('plugins.importexport.csv.import.submission', ['title' => $title]) . "\n";
} else {
Expand Down