Skip to content

Commit

Permalink
Merge pull request #858 from Vitaliy-1/i10874_groups_stages
Browse files Browse the repository at this point in the history
pkp/pkp-lib#10874 Remove submission stage from roles installation
  • Loading branch information
Vitaliy-1 authored Feb 11, 2025
2 parents 11a6c96 + 99ef036 commit 99f4cee
Show file tree
Hide file tree
Showing 5 changed files with 57 additions and 5 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
<?php

/**
* @file classes/migration/upgrade/v3_5_0/I10874_UserGroupStagesRemoveSubmission.php
*
* Copyright (c) 2025 Simon Fraser University
* Copyright (c) 2025 John Willinsky
* Distributed under the GNU GPL v3. For full terms see the file docs/COPYING.
*
* @class I10874_UserGroupStagesRemoveSubmission
*
* @brief Remove WORKFLOW_STAGE_ID_SUBMISSION stage from user_group_stage table
*/

namespace APP\migration\upgrade\v3_5_0;

use Illuminate\Support\Collection;
use Illuminate\Support\Facades\DB;
use PKP\migration\Migration;

class I10874_UserGroupStagesRemoveSubmission extends Migration
{
public const WORKFLOW_STAGE_SUBMISSION = 1;

protected Collection $rowsWithSubmissionStage;

public function up(): void
{
$this->rowsWithSubmissionStage = DB::table('user_group_stage')
->where('stage_id', self::WORKFLOW_STAGE_SUBMISSION)
->get();

DB::table('user_group_stage')->where('stage_id', self::WORKFLOW_STAGE_SUBMISSION)->delete();
}

public function down(): void
{
$toInsert = [];
foreach ($this->rowsWithSubmissionStage as $row) { /* @var \stdClass $row */
$toInsert[] = [
'context_id' => $row->context_id,
'user_group_id' => $row->user_group_id,
'stage_id' => $row->stage_id,
];
}

DB::table('user_group_stage')->insert($toInsert);
}
}
4 changes: 3 additions & 1 deletion cypress.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -45,5 +45,7 @@ module.exports = defineConfig({
experimentalRunAllSpecs: true,
},
// Allow cypress to interact with iframes
chromeWebSecurity: false
chromeWebSecurity: false,
viewportWidth: 3024,
viewportHeight: 1964
})
1 change: 1 addition & 0 deletions dbscripts/xml/upgrade.xml
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,7 @@
<migration class="PKP\migration\upgrade\v3_5_0\I7135_CreateNewRorRegistryCacheTables"/>
<migration class="PKP\migration\upgrade\v3_5_0\I10759_AddReviewAssignmentSettings"/>
<migration class="PKP\migration\upgrade\v3_5_0\I10819_OrcidOauthScopeMail"/>
<migration class="APP\migration\upgrade\v3_5_0\I10874_UserGroupStagesRemoveSubmission"/>
<note file="docs/release-notes/README-3.5.0" />
</upgrade>

Expand Down
2 changes: 1 addition & 1 deletion lib/pkp
Submodule pkp updated 60 files
+8 −0 classes/i18n/LocaleConversion.php
+4 −15 classes/migration/upgrade/v3_5_0/I7135_CreateNewRorRegistryCacheTables.php
+1 −0 classes/navigationMenu/NavigationMenuDAO.php
+3 −3 classes/services/PKPContextService.php
+2 −1 classes/template/PKPTemplateManager.php
+5 −1 controllers/grid/settings/sections/form/PKPSectionForm.php
+1 −1 cypress/tests/integration/NativeXmlImportExportSubmission.cy.js
+3 −0 locale/ar/submission.po
+3 −0 locale/az/submission.po
+3 −0 locale/bg/submission.po
+3 −0 locale/bs_Latn/submission.po
+3 −0 locale/ca/submission.po
+3 −0 locale/ckb/submission.po
+3 −0 locale/cs/submission.po
+3 −0 locale/da/submission.po
+3 −0 locale/de/submission.po
+3 −0 locale/el/submission.po
+22 −9 locale/en/submission.po
+3 −0 locale/es/submission.po
+3 −0 locale/eu/submission.po
+3 −0 locale/fa/submission.po
+3 −0 locale/fi/submission.po
+3 −0 locale/fr/submission.po
+3 −0 locale/fr_CA/submission.po
+3 −0 locale/gd/submission.po
+3 −0 locale/gl/submission.po
+3 −0 locale/hr/submission.po
+3 −0 locale/hu/submission.po
+3 −0 locale/hy/submission.po
+3 −0 locale/id/submission.po
+3 −0 locale/is/submission.po
+3 −0 locale/it/submission.po
+3 −0 locale/ja/submission.po
+3 −0 locale/ka/submission.po
+3 −0 locale/kk/submission.po
+3 −0 locale/lv/submission.po
+3 −0 locale/mk/submission.po
+3 −0 locale/ms/submission.po
+3 −0 locale/nb_NO/submission.po
+3 −0 locale/nl/submission.po
+3 −0 locale/pl/submission.po
+3 −0 locale/pt/submission.po
+3 −0 locale/pt_BR/submission.po
+3 −0 locale/ro/submission.po
+3 −0 locale/ru/submission.po
+3 −0 locale/sk/submission.po
+3 −0 locale/sl/submission.po
+3 −0 locale/sr_Cyrl/submission.po
+3 −0 locale/sr_Latn/submission.po
+3 −0 locale/sv/submission.po
+3 −0 locale/sw/submission.po
+3 −0 locale/th/submission.po
+3 −0 locale/tr/submission.po
+3 −0 locale/uk/submission.po
+3 −0 locale/vi/submission.po
+3 −0 locale/zh_Hans/submission.po
+3 −0 locale/zh_Hant/submission.po
+5 −1 pages/submission/PKPSubmissionHandler.php
+27 −5 plugins/importexport/native/filter/NativeXmlSubmissionFilter.php
+1 −1 schemas/ror.json
6 changes: 3 additions & 3 deletions registry/userGroups.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@

<groups>
<!-- Managerial Role -->
<group roleId="0x00000010" stages="1,5" name="default.groups.name.manager" plural="default.groups.plural.manager" abbrev="default.groups.abbrev.manager" permitMetadataEdit="true" permitSettings="true" />
<group roleId="0x00000010" stages="5" name="default.groups.name.manager" plural="default.groups.plural.manager" abbrev="default.groups.abbrev.manager" permitMetadataEdit="true" permitSettings="true" />

<!-- Moderator Role -->
<group roleId="0x00000011" stages="1,5" name="default.groups.name.sectionEditor" plural="default.groups.plural.sectionEditor" abbrev="default.groups.abbrev.sectionEditor" permitMetadataEdit="true" masthead="true" />
<group roleId="0x00000011" stages="5" name="default.groups.name.sectionEditor" plural="default.groups.plural.sectionEditor" abbrev="default.groups.abbrev.sectionEditor" permitMetadataEdit="true" masthead="true" />

<!-- Author Role -->
<group roleId="0x00010000" stages="1,5" name="default.groups.name.author" plural="default.groups.plural.author" abbrev="default.groups.abbrev.author" permitSelfRegistration="true" permitMetadataEdit="true" />
<group roleId="0x00010000" stages="5" name="default.groups.name.author" plural="default.groups.plural.author" abbrev="default.groups.abbrev.author" permitSelfRegistration="true" permitMetadataEdit="true" />

<!-- Reader Role -->
<group roleId="0x00100000" stages="" name="default.groups.name.reader" plural="default.groups.plural.reader" abbrev="default.groups.abbrev.reader" permitSelfRegistration="true" />
Expand Down

0 comments on commit 99f4cee

Please sign in to comment.