Merge pull request #4105 from bozana/9462

pkp/pkp-lib#9462 consider user_user_groups migration script in upgrade and submodule update
pkp · Jan 5, 2024 · 70366ff · 70366ff
2 parents d17b30a + d646396
commit 70366ff
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/dbscripts/xml/upgrade.xml b/dbscripts/xml/upgrade.xml
@@ -224,6 +224,7 @@
 
 	<upgrade minversion="3.1.0.0" maxversion="3.4.9.9">
 		<migration class="PKP\migration\upgrade\v3_5_0\I9253_SiteAnnouncements"/>
+		<migration class="PKP\migration\upgrade\v3_5_0\I9462_UserUserGroups"/>
 	</upgrade>
 
 	<!-- update plugin configuration - should be done as the final upgrade task -->

diff --git a/lib/pkp b/lib/pkp
+5 −14		classes/cliTool/CommandLineTool.php
+5 −3		classes/context/ContextDAO.php
+0 −1		classes/core/PKPApplication.php
+2 −1		classes/migration/install/RolesAndUserGroupsMigration.php
+54 −0		classes/migration/upgrade/v3_5_0/I9462_UserUserGroups.php
+10 −0		classes/notification/NotificationSubscriptionSettingsDAO.php
+8 −5		classes/security/RoleDAO.php
+30 −10		classes/services/queryBuilders/PKPContextQueryBuilder.php
+54 −1		classes/user/Collector.php
+26 −0		classes/user/DAO.php
+7 −0		classes/user/Repository.php
+0 −98		classes/user/UserStageAssignmentDAO.php
+1 −1		classes/user/form/UserFormHelper.php
+30 −0		classes/userGroup/Collector.php
+12 −0		classes/userGroup/DAO.php
+18 −19		classes/userGroup/Repository.php
+40 −1		classes/userGroup/relationships/UserUserGroup.php
+22 −0		classes/userGroup/relationships/enums/UserUserGroupStatus.php
+5 −5		controllers/grid/settings/user/UserGridHandler.php
+17 −9		controllers/grid/settings/user/form/UserForm.php
+2 −1		controllers/grid/users/stageParticipant/StageParticipantGridCellProvider.php
+3 −0		locale/en/user.po