From b8b94dcc1cb90a37699e979ae9511c633e64c81d Mon Sep 17 00:00:00 2001 From: Neil Blakey-Milner Date: Tue, 2 Aug 2005 13:23:18 +0000 Subject: [PATCH] Add a link to controlling member groups of a group. --- presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/listGroupsUI.inc | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/listGroupsUI.inc b/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/listGroupsUI.inc index ef3c0c1..0e78c29 100644 --- a/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/listGroupsUI.inc +++ b/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/listGroupsUI.inc @@ -47,7 +47,8 @@ function getNameDisplay($sName) { function getGroups($aUnitIDs, $sName) { global $default; - /*ok*/ $sQuery = "SELECT GL.id AS groupID, UL.name AS UnitNameB4, GL.name AS name, 'Edit' , 'Delete', 'Edit Unit', 'Edit Users', " . + /*ok*/ $sQuery = "SELECT GL.id AS \"groupID\", UL.name AS UnitNameB4, GL.name AS name, 'Edit' AS \"Edit\", 'Delete' AS \"Delete\", " . + "'Edit Unit' AS \"Edit Unit\", 'Edit Users' AS \"Edit Users\", 'Edit Member Groups' AS \"Edit Member Groups\", " . "CASE WHEN UL.name IS NULL THEN 'No Unit Assigned' ELSE UL.name END AS UnitName " . "FROM ($default->groups_table GL LEFT JOIN $default->groups_units_table GUL ON GL.id = GUL.group_id) " . "LEFT JOIN $default->units_table UL ON UL.id = GUL.unit_id "; @@ -76,16 +77,17 @@ function getGroups($aUnitIDs, $sName) { $sQuery .= $sWhereClause . "ORDER BY GL.name"; $default->log->info("groupQuery: $sQuery"); - $aColumns = array("name", "UnitName", "Edit", "Delete", "Edit Unit", "Edit Users"); - $aColumnNames = array(_("Name"), _("Unit Name"), _("Edit"), _("Delete"), _("Edit Unit"), _("Edit Users")); - $aColumnTypes = array(1,1,3,3,3,3); + $aColumns = array("name", "UnitName", "Edit", "Delete", "Edit Unit", "Edit Users", "Edit Member Groups"); + $aColumnNames = array(_("Name"), _("Unit Name"), _("Edit"), _("Delete"), _("Edit Unit"), _("Edit Users"), _("Edit Member Groups")); + $aColumnTypes = array(1,1,3,3,3,3, 3); $aDBColumnArray = array("groupID"); $aQueryStringVariableNames = array("fGroupID"); $aHyperLinkURL = array( 2=> "$default->rootUrl/control.php?action=editGroup", 3=> "$default->rootUrl/control.php?action=removeGroup", 4=> "$default->rootUrl/control.php?action=editGroupUnit", - 5=> "$default->rootUrl/control.php?action=editGroupUsers"); + 5=> "$default->rootUrl/control.php?action=editGroupUsers", + 6=> "$default->rootUrl/control.php?action=editGroupGroups"); $oSearchResults = & new PatternTableSqlQuery($sQuery, $aColumns, $aColumnTypes, $aColumnNames, "100%", $aHyperLinkURL,$aDBColumnArray,$aQueryStringVariableNames); $oSearchResults->setDisplayColumnHeadings(true); -- libgit2 0.21.4