Commit b8b94dcc1cb90a37699e979ae9511c633e64c81d

Authored by Neil Blakey-Milner
1 parent 417eefe8

Add a link to controlling member groups of a group.


git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@3545 c91229c3-7414-0410-bfa2-8a42b809f60b
presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/listGroupsUI.inc
... ... @@ -47,7 +47,8 @@ function getNameDisplay($sName) {
47 47  
48 48 function getGroups($aUnitIDs, $sName) {
49 49 global $default;
50   - /*ok*/ $sQuery = "SELECT GL.id AS groupID, UL.name AS UnitNameB4, GL.name AS name, 'Edit' , 'Delete', 'Edit Unit', 'Edit Users', " .
  50 + /*ok*/ $sQuery = "SELECT GL.id AS \"groupID\", UL.name AS UnitNameB4, GL.name AS name, 'Edit' AS \"Edit\", 'Delete' AS \"Delete\", " .
  51 + "'Edit Unit' AS \"Edit Unit\", 'Edit Users' AS \"Edit Users\", 'Edit Member Groups' AS \"Edit Member Groups\", " .
51 52 "CASE WHEN UL.name IS NULL THEN '<font color=darkgrey>No Unit Assigned</font>' ELSE UL.name END AS UnitName " .
52 53 "FROM ($default->groups_table GL LEFT JOIN $default->groups_units_table GUL ON GL.id = GUL.group_id) " .
53 54 "LEFT JOIN $default->units_table UL ON UL.id = GUL.unit_id ";
... ... @@ -76,16 +77,17 @@ function getGroups($aUnitIDs, $sName) {
76 77 $sQuery .= $sWhereClause . "ORDER BY GL.name";
77 78 $default->log->info("groupQuery: $sQuery");
78 79  
79   - $aColumns = array("name", "UnitName", "Edit", "Delete", "Edit Unit", "Edit Users");
80   - $aColumnNames = array(_("Name"), _("Unit Name"), _("Edit"), _("Delete"), _("Edit Unit"), _("Edit Users"));
81   - $aColumnTypes = array(1,1,3,3,3,3);
  80 + $aColumns = array("name", "UnitName", "Edit", "Delete", "Edit Unit", "Edit Users", "Edit Member Groups");
  81 + $aColumnNames = array(_("Name"), _("Unit Name"), _("Edit"), _("Delete"), _("Edit Unit"), _("Edit Users"), _("Edit Member Groups"));
  82 + $aColumnTypes = array(1,1,3,3,3,3, 3);
82 83 $aDBColumnArray = array("groupID");
83 84 $aQueryStringVariableNames = array("fGroupID");
84 85  
85 86 $aHyperLinkURL = array( 2=> "$default->rootUrl/control.php?action=editGroup",
86 87 3=> "$default->rootUrl/control.php?action=removeGroup",
87 88 4=> "$default->rootUrl/control.php?action=editGroupUnit",
88   - 5=> "$default->rootUrl/control.php?action=editGroupUsers");
  89 + 5=> "$default->rootUrl/control.php?action=editGroupUsers",
  90 + 6=> "$default->rootUrl/control.php?action=editGroupGroups");
89 91  
90 92 $oSearchResults = & new PatternTableSqlQuery($sQuery, $aColumns, $aColumnTypes, $aColumnNames, "100%", $aHyperLinkURL,$aDBColumnArray,$aQueryStringVariableNames);
91 93 $oSearchResults->setDisplayColumnHeadings(true);
... ...