diff --git a/classes/migration/install/OMPMigration.php b/classes/migration/install/OMPMigration.php index 0c64458a66b..adcb2911a45 100644 --- a/classes/migration/install/OMPMigration.php +++ b/classes/migration/install/OMPMigration.php @@ -17,6 +17,7 @@ use APP\publication\enums\VersionStage; use Illuminate\Database\Schema\Blueprint; use Illuminate\Support\Facades\Schema; +use PKP\publication\enums\UpdateType; class OMPMigration extends \PKP\migration\Migration { @@ -61,6 +62,7 @@ public function up(): void $table->enum('version_stage', array_column(VersionStage::cases(), 'value'))->nullable(); $table->integer('version_minor')->nullable(); $table->integer('version_major')->nullable(); + $table->enum('update_type', array_column(UpdateType::cases(), 'value'))->nullable(); $table->datetime('created_at')->useCurrent(); $table->bigInteger('source_publication_id')->nullable(); diff --git a/classes/publication/DAO.php b/classes/publication/DAO.php index b5f6929763a..bb65a27ac15 100644 --- a/classes/publication/DAO.php +++ b/classes/publication/DAO.php @@ -38,6 +38,7 @@ class DAO extends \PKP\publication\DAO 'versionStage' => 'version_stage', 'versionMinor' => 'version_minor', 'versionMajor' => 'version_major', + 'updateType' => 'update_type', 'createdAt' => 'created_at', 'sourcePublicationId' => 'source_publication_id' ]; diff --git a/dbscripts/xml/upgrade.xml b/dbscripts/xml/upgrade.xml index fe7179fc5be..044af907fb1 100644 --- a/dbscripts/xml/upgrade.xml +++ b/dbscripts/xml/upgrade.xml @@ -207,6 +207,7 @@ + diff --git a/js/load.js b/js/load.js index 4fd384ba18e..e41d19d94bc 100644 --- a/js/load.js +++ b/js/load.js @@ -35,6 +35,7 @@ import StatsPublicationsPage from '@/components/Container/StatsPublicationsPage. import StatsContextPage from '@/components/Container/StatsContextPage.vue'; import StatsUsersPage from '@/components/Container/StatsUsersPage.vue'; import SubmissionWizardPage from '@/components/Container/SubmissionWizardPageOMP.vue'; +import FileMetadataForm from '@/managers/FileManager/modals/FileMetadataForm.vue'; import ManageCatalogPage from '@/components/Container/ManageCatalogPage.vue'; // Helper for initializing and tracking Vue controllers @@ -64,5 +65,6 @@ window.pkp = Object.assign(PkpLoad, window.pkp || {}, { StatsContextPage, StatsUsersPage, SubmissionWizardPage, + FileMetadataForm, }, }); diff --git a/lib/pkp b/lib/pkp index aee04153f01..8e2454992a4 160000 --- a/lib/pkp +++ b/lib/pkp @@ -1 +1 @@ -Subproject commit aee04153f01b75b648269f995dc65572b0e5ee3c +Subproject commit 8e2454992a4f4f71cc5ca0a8439923c31335c011 diff --git a/lib/ui-library b/lib/ui-library index 1caccc4f50e..63f22ec0264 160000 --- a/lib/ui-library +++ b/lib/ui-library @@ -1 +1 @@ -Subproject commit 1caccc4f50e3554cdcb802edf8c22c1ca72b71cb +Subproject commit 63f22ec02641a8f1cb415de5878435e4e3b6c663