From 99752956fcbcd890e80684bb4411753306c43ca1 Mon Sep 17 00:00:00 2001
From: Brad Shuttleworth <brad@knowledgetree.com>
Date: Tue, 14 Mar 2006 15:54:27 +0000
Subject: [PATCH] fix for KTS-623

---
 plugins/ktcore/admin/groupManagement.php      | 19 +++++++++++++++++++
 templates/ktcore/principals/groupadmin.smarty | 10 ++++++----
 2 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/plugins/ktcore/admin/groupManagement.php b/plugins/ktcore/admin/groupManagement.php
index 3a59541..11abbea 100755
--- a/plugins/ktcore/admin/groupManagement.php
+++ b/plugins/ktcore/admin/groupManagement.php
@@ -537,6 +537,25 @@ class KTGroupAdminDispatcher extends KTAdminDispatcher {
     }
     // }}}
 
+	function getGroupStringForGroup($oGroup) {
+		$aGroupNames = array();
+		$aGroups = $oGroup->getMemberGroups();
+		$MAX_GROUPS = 6;
+		$add_elipsis = false;
+		if (count($aGroups) == 0) { return _('Group currently has no subgroups.'); }
+		if (count($aGroups) > $MAX_GROUPS) { 
+		    $aGroups = array_slice($aGroups, 0, $MAX_GROUPS); 
+			$add_elipsis = true;
+		}
+		foreach ($aGroups as $oGroup) { 
+		    $aGroupNames[] = $oGroup->getName();
+		}
+		if ($add_elipsis) {
+		    $aGroupNames[] = '&hellip;';
+		}
+		
+		return implode(', ', $aGroupNames);
+	}
     // }}}
 }
 
diff --git a/templates/ktcore/principals/groupadmin.smarty b/templates/ktcore/principals/groupadmin.smarty
index 9d25ee9..32676e5 100644
--- a/templates/ktcore/principals/groupadmin.smarty
+++ b/templates/ktcore/principals/groupadmin.smarty
@@ -29,15 +29,16 @@ action may take some time if you have many groups).{/i18n}</p>
 
 {else}
 {if (!empty($search_results))}
-<table class="listing">
+<table class="kt_collection" cellspacing="0">
 <thead>
    <tr>
       <th>{i18n}Group Name{/i18n}</th>
       <th>{i18n}Unit Name{/i18n}</th>
       <th>{i18n}Edit{/i18n}</th>
+      <th>{i18n}Delete{/i18n}</th>	  
       <th>{i18n}Manage Users{/i18n}</th>
       <th>{i18n}Manage sub-groups{/i18n}</th>
-      <th>{i18n}Delete{/i18n}</th>
+      <th>{i18n}Subgroups{/i18n}</th>
    </tr>
 </thead>
 <tbody>
@@ -56,12 +57,13 @@ action may take some time if you have many groups).{/i18n}</p>
 	</td>
         <td><a href="{addQS}action=editGroup&group_id={$oGroup->getId()}{/addQS}"
 class="ktAction ktEdit">{i18n}Edit{/i18n}</a></td>
+        <td><a href="{addQS}action=deleteGroup&group_id={$oGroup->getId()}{/addQS}"
+class="ktAction ktDelete">{i18n}Delete{/i18n}</a></td>
         <td><a
 href="{addQS}action=manageUsers&group_id={$oGroup->getId()}{/addQS}">{i18n}Manage Users{/i18n}</a></td>  
         <td><a
 href="{addQS}action=manageSubgroups&group_id={$oGroup->getId()}{/addQS}">{i18n}Manage sub-groups{/i18n}</a></td>
-        <td><a href="{addQS}action=deleteGroup&group_id={$oGroup->getId()}{/addQS}"
-class="ktAction ktDelete">{i18n}Delete{/i18n}</a></td>
+        <td class="title"><span class="descriptiveText">{$context->getGroupStringForGroup($oGroup)}</span></td>
      </tr>   
      {/foreach}
    
--
libgit2 0.21.4