*5111* replace FlexibleRole classes with new UserGroup structure

pkp · Apr 10, 2010 · 6d75bbc · 6d75bbc
1 parent 34acb6b
commit 6d75bbc
Show file tree

Hide file tree

Showing 17 changed files with 1,307 additions and 1,387 deletions.
diff --git a/classes/core/Application.inc.php b/classes/core/Application.inc.php
@@ -117,7 +117,8 @@ function getDAOMap() {
 			'LibraryFileDAO' => 'press.LibraryFileDAO',
 			'LayoutAssignmentDAO' => 'submission.layoutAssignment.LayoutAssignmentDAO',
 			'RoleDAO' => 'security.RoleDAO',
-			'FlexibleRoleDAO' => 'role.FlexibleRoleDAO',
+			'UserGroupDAO' => 'security.UserGroupDAO',
+			'UserGroupAssignmentDAO' => 'security.UserGroupAssignmentDAO',
 			'SeriesEditorSubmissionDAO' => 'submission.seriesEditor.SeriesEditorSubmissionDAO',
 			'UserDAO' => 'user.UserDAO',
 			'UserSettingsDAO' => 'user.UserSettingsDAO'

diff --git a/classes/handler/Handler.inc.php b/classes/handler/Handler.inc.php
@@ -16,7 +16,6 @@
 import('handler.PKPHandler');
 import('handler.validation.HandlerValidatorPress');
 import('handler.validation.HandlerValidatorRoles');
-import('handler.validation.HandlerValidatorCustomRole');
 
 class Handler extends PKPHandler{
 	function Handler() {

diff --git a/classes/handler/validation/HandlerValidatorCustomRole.inc.php b/classes/handler/validation/HandlerValidatorCustomRole.inc.php
diff --git a/classes/role/FlexibleRole.inc.php b/classes/role/FlexibleRole.inc.php