COmanage Developers List

Author: marie
Date: 2013-10-21 18:38:36 -0400 (Mon, 21 Oct 2013)
New Revision: 621

Modified:
   registry/trunk/app/Controller/CoGroupsController.php
   registry/trunk/app/View/CoGroupMembers/select.ctp
   registry/trunk/app/View/CoGroups/fields.inc
Log:
co 683 - add status to group members

Modified: registry/trunk/app/Controller/CoGroupsController.php
===================================================================
--- registry/trunk/app/Controller/CoGroupsController.php        2013-10-18 
05:53:26 UTC (rev 620)
+++ registry/trunk/app/Controller/CoGroupsController.php        2013-10-21 
22:38:36 UTC (rev 621)
@@ -199,7 +199,8 @@
                                   )
                                  );
         $coPerson['CoPerson']['CoGroupMember'] = 
array($member['CoGroupMember']);
-        $coPerson['CoPerson']['Name'] = $name['Name'];
+        $coPerson['CoPerson']['Name']          = $name['Name'];
+        $coPerson['CoPerson']['Status']        = 
$member['CoPerson']['status']; 
         $member = array_merge($member, $coPerson);
       }
       

Modified: registry/trunk/app/View/CoGroupMembers/select.ctp
===================================================================
--- registry/trunk/app/View/CoGroupMembers/select.ctp   2013-10-18 05:53:26 
UTC (rev 620)
+++ registry/trunk/app/View/CoGroupMembers/select.ctp   2013-10-21 22:38:36 
UTC (rev 621)
@@ -32,6 +32,7 @@
   <thead>
     <tr class="ui-widget-header">
       <th><?php print _txt('fd.name'); ?></th>
+      <th><?php print _txt('fd.status'); ?></th>
       <th><?php print _txt('fd.perms'); ?></th>
     </tr>
     <?php
@@ -61,6 +62,11 @@
       </td>
       <td>
         <?php
+          print _txt('en.status', null, $p['CoPerson']['status']);
+        ?>
+      </td>
+      <td>
+        <?php
           $isMember = isset($co_group_roles['members'][$p['CoPerson']['id']])
                       && $co_group_roles['members'][$p['CoPerson']['id']];
           $isOwner = isset($co_group_roles['owners'][$p['CoPerson']['id']])
@@ -94,7 +100,7 @@
   
   <tfoot>
     <tr class="ui-widget-header">
-      <th colspan="2">
+      <th colspan="3">
       </th>
     </tr>
     <tr>

Modified: registry/trunk/app/View/CoGroups/fields.inc
===================================================================
--- registry/trunk/app/View/CoGroups/fields.inc 2013-10-18 05:53:26 UTC (rev 
620)
+++ registry/trunk/app/View/CoGroups/fields.inc 2013-10-21 22:38:36 UTC (rev 
621)
@@ -176,7 +176,13 @@
                                                 'action' => 'edit',
                                                 $g['id'],
                                                 'co' => 
$cur_co['Co']['id']));
-                  
+                  // Print person's status
+                  if( !empty($c['CoPerson']['Status']) ) {
+                    print ' (' 
+                      . _txt('en.status', null, $c['CoPerson']['Status'])
+                      .')';
+                  }
+
                   if($g['owner']) {
                     if(!$g['member']) {
                       print " " . _txt('fd.group.own.only');