*6233* Remove columns that rely on the "acting-as" user group. - intr…

…oduce temporary placeholders to avoid execution errors after removing the acting-as code.
pkp · Nov 26, 2010 · b64e8e6 · b64e8e6
1 parent 8944446
commit b64e8e6
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 21 deletions.
diff --git a/controllers/grid/files/fairCopyFiles/FairCopyFilesGridHandler.inc.php b/controllers/grid/files/fairCopyFiles/FairCopyFilesGridHandler.inc.php
@@ -140,31 +140,28 @@ function initialize(&$request) {
 			'controllers/grid/gridCell.tpl',
 			$cellProvider)
 		);
-		$session =& $request->getSession();
-		$actingAsUserGroupId = $session->getActingAsUserGroupId();
-		$userGroupDao =& DAORegistry::getDAO('UserGroupDAO');
-		$actingAsUserGroup =& $userGroupDao->getById($actingAsUserGroupId);
 
-		// add a column for the role the user is acting as
+		// Add a column for the uploader.
+		// FIXME: We're just adding some placeholder text here until this
+		// is correctly implemented, see #6233.
 		$this->addColumn(
 			new GridColumn(
-				$actingAsUserGroupId,
+				'FIXME',
 				null,
-				$actingAsUserGroup->getLocalizedAbbrev(),
+				'FIXME',
 				'controllers/grid/common/cell/roleCell.tpl',
 				$cellProvider
 			)
 		);
 
-		// Add another column for the submitter's role
-		$monographDao =& DAORegistry::getDAO('MonographDAO');
-		$monograph =& $monographDao->getMonograph($monographId);
-		$uploaderUserGroup =& $userGroupDao->getById($monograph->getUserGroupId());
+		// Add another column for the uploader's role
+		// FIXME: We're just adding some placeholder text here until this
+		// is correctly implemented, see #6233.
 		$this->addColumn(
 			new GridColumn(
-				$uploaderUserGroup->getId(),
+				'FIXME',
 				null,
-				$uploaderUserGroup->getLocalizedAbbrev(),
+				'FIXME',
 				'controllers/grid/common/cell/roleCell.tpl',
 				$cellProvider
 			)

diff --git a/controllers/grid/users/reviewer/ReviewerGridHandler.inc.php b/controllers/grid/users/reviewer/ReviewerGridHandler.inc.php
@@ -125,22 +125,20 @@ function initialize(&$request) {
 			)
 		);
 
-		$session =& $request->getSession();
-		$actingAsUserGroupId = $session->getActingAsUserGroupId();
-		$userGroupDao =& DAORegistry::getDAO('UserGroupDAO');
-		$actingAsUserGroup =& $userGroupDao->getById($actingAsUserGroupId);
-
-		// add a column for the role the user is acting as
+		// Add a column for the stage editor.
+		// FIXME: We're just adding some placeholder text here until this
+		// is correctly implemented, see #6233.
 		$this->addColumn(
 			new GridColumn(
-				$actingAsUserGroupId,
+				'FIXME',
 				null,
-				$actingAsUserGroup->getLocalizedName(),
+				'FIXME',
 				'controllers/grid/common/cell/roleCell.tpl',
 				$cellProvider
 			)
 		);
 
+		// Add a column for the assigned reviewer.
 		$this->addColumn(
 			new GridColumn(
 				'reviewer',