Peter M. Groen / knowledgetree

Commit 75b06f45bff06c3668b71a6118b1cf421587c63d

Authored by Michael Joseph
1 parent aa5d13e2

corrected sysadmin group retrieval query 


git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@1559 c91229c3-7414-0410-bfa2-8a42b809f60b
Inline Side-by-side
Showing 1 changed file with 2 additions and 2 deletions
presentation/lookAndFeel/knowledgeTree/administration/usermanagement/addUserToGroupUI.inc
  View file @75b06f4
@@ -140,8 +140,8 @@ function getGroupDisplay($oGroup) { @@ -140,8 +140,8 @@ function getGroupDisplay($oGroup) {
140 // if this is the system administrator, prepend group names with unit name 140 // if this is the system administrator, prepend group names with unit name
141 $oPatternListBox = & new PatternListBox($default->owl_groups_table, "name", "id", "fGroupID"); 141 $oPatternListBox = & new PatternListBox($default->owl_groups_table, "name", "id", "fGroupID");
142 $oPatternListBox->setFromClause("LEFT OUTER JOIN groups_units_link GUL on ST.id=GUL.group_id " . 142 $oPatternListBox->setFromClause("LEFT OUTER JOIN groups_units_link GUL on ST.id=GUL.group_id " .
143 - "INNER JOIN units_lookup UL on GUL.unit_id=UL.id");  
144 - $oPatternListBox->setCompositeDisplayName("DISTINCT CONCAT(CONCAT(UL.name, '-'),ST.name)"); 143 + "LEFT OUTER JOIN units_lookup UL on GUL.unit_id=UL.id");
  144 + $oPatternListBox->setCompositeDisplayName("DISTINCT COALESCE(CONCAT(CONCAT(UL.name, '-'),ST.name),ST.name)");
145 } else if (Permission::userIsUnitAdministrator()) { 145 } else if (Permission::userIsUnitAdministrator()) {
146 // else if this is a unit administrator, only display the groups in your unit 146 // else if this is a unit administrator, only display the groups in your unit
147 $oPatternListBox = & new PatternListBox($default->owl_groups_table, "name", "id", "fGroupID"); 147 $oPatternListBox = & new PatternListBox($default->owl_groups_table, "name", "id", "fGroupID");