Merge pull request #2851 from bozana/440-usersRow

#440 users row action in the admin contexts grid
pkp · Oct 11, 2017 · a6803d8 · a6803d8
2 parents ac1d36e + 52cf2dd
commit a6803d8
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 2 deletions.
diff --git a/controllers/grid/admin/context/ContextGridHandler.inc.php b/controllers/grid/admin/context/ContextGridHandler.inc.php
@@ -24,7 +24,7 @@ function __construct() {
 		parent::__construct();
 		$this->addRoleAssignment(array(
 			ROLE_ID_SITE_ADMIN),
-			array('fetchGrid', 'fetchRow', 'createContext', 'editContext', 'updateContext',
+			array('fetchGrid', 'fetchRow', 'createContext', 'editContext', 'updateContext', 'users',
 				'deleteContext', 'saveSequence')
 		);
 	}
@@ -59,6 +59,7 @@ function initialize($request, $args = null) {
 		AppLocale::requireComponents(
 			LOCALE_COMPONENT_PKP_USER,
 			LOCALE_COMPONENT_APP_MANAGER,
+			LOCALE_COMPONENT_PKP_MANAGER,
 			LOCALE_COMPONENT_PKP_ADMIN,
 			LOCALE_COMPONENT_APP_ADMIN
 		);
@@ -182,6 +183,18 @@ function createContext($args, $request) {
 		return $this->editContext($args, $request);
 	}
 
+	/**
+	 * Display users management grid for the given context.
+	 * @param $args array
+	 * @param $request PKPRequest
+	 * @return JSONMessage JSON object
+	 */
+	function users($args, $request) {
+		$templateMgr = TemplateManager::getManager($request);
+		$templateMgr->assign('oldUserId', (int) $request->getUserVar('oldUserId')); // for merging users.
+		parent::setupTemplate($request);
+		return $templateMgr->fetchJson('core:controllers/tab/settings/users.tpl');
+	}
 
 	//
 	// Protected helper methods.

diff --git a/controllers/grid/admin/context/ContextGridRow.inc.php b/controllers/grid/admin/context/ContextGridRow.inc.php
@@ -60,7 +60,6 @@ function initialize($request, $template = null) {
 				'delete'
 			)
 		);
-
 		import('lib.pkp.classes.linkAction.request.RedirectAction');
 		$dispatcher = $router->getDispatcher();
 		$this->addAction(
@@ -72,6 +71,20 @@ function initialize($request, $template = null) {
 				'wrench'
 			)
 		);
+		$this->addAction(
+			new LinkAction(
+				'users',
+				new AjaxModal(
+					$router->url($request, $element->getPath(), null, 'users', null),
+					__('manager.users'),
+					'modal_edit',
+					true
+				),
+				__('manager.users'),
+				'users'
+			)
+		);
+
 	}
 }