Browse Source

Add colomn ID in admin usergroup display

Hubert Borderiou 11 years ago
parent
commit
cc084b8019
3 changed files with 10 additions and 7 deletions
  1. 6 4
      main/admin/usergroups.php
  2. 1 1
      main/inc/ajax/model.ajax.php
  3. 3 2
      main/inc/lib/usergroup.lib.php

+ 6 - 4
main/admin/usergroups.php

@@ -48,12 +48,13 @@ $url = api_get_path(WEB_AJAX_PATH).'model.ajax.php?a=get_usergroups';
 
 //The order is important you need to check the the $column variable in the model.ajax.php file
 $columns = array(
-    get_lang('Name'), get_lang('Users'), get_lang('Courses'), get_lang('Sessions'), get_lang('Actions')
+    get_lang('Id'), get_lang('Name'), get_lang('Users'), get_lang('Courses'), get_lang('Sessions'), get_lang('Actions')
 );
 
 //Column config
 $column_model   = array(
-    array('name'=>'name',           'index'=>'name',        'width'=>'35',   'align'=>'left'),
+    array('name'=>'id',             'index'=>'id',          'width'=>'5',  'align'=>'left'),
+    array('name'=>'name',           'index'=>'name',        'width'=>'35',  'align'=>'left'),
     array('name'=>'users',    		'index'=>'users', 		'width'=>'15',  'align'=>'left'),
     array('name'=>'courses',    	'index'=>'courses', 	'width'=>'15',  'align'=>'left'),
     array('name'=>'sessions',    	'index'=>'sessions', 	'width'=>'15',  'align'=>'left'),
@@ -64,7 +65,8 @@ $column_model   = array(
 $extra_params['autowidth'] = 'true';
 //height auto
 $extra_params['height'] = 'auto';
-
+$extra_params['sortname'] = 'name';
+$extra_params['sortorder'] = 'desc';
 //With this function we can add actions to the jgrid
 $action_links = 'function action_formatter (cellvalue, options, rowObject) {
     return \''
@@ -80,7 +82,7 @@ $action_links = 'function action_formatter (cellvalue, options, rowObject) {
 $(function() {
 <?php
     // grid definition see the $usergroup>display() function
-    echo Display::grid_js('usergroups',  $url,$columns, $column_model, $extra_params, array(), $action_links, true);
+    echo Display::grid_js('usergroups', $url, $columns, $column_model, $extra_params, array(), $action_links, true);
 ?>
 });
 </script>

+ 1 - 1
main/inc/ajax/model.ajax.php

@@ -935,7 +935,7 @@ switch ($action) {
         $result = $new_result;
         break;
     case 'get_usergroups':
-        $columns = array('name', 'users', 'courses','sessions','actions');
+        $columns = array('id', 'name', 'users', 'courses','sessions','actions');
         $result = $obj->getUsergroupsPagination($sidx, $sord, $start, $limit);
         break;
     case 'get_extra_fields':

+ 3 - 2
main/inc/lib/usergroup.lib.php

@@ -597,7 +597,7 @@ class UserGroup extends Model
      */
     public function getUsergroupsPagination($sidx, $sord, $start, $limit)
     {
-        $sord = in_array(strtolower($sord), array('asc', 'desc')) ? $sord : 'desc';
+        $sord = in_array(strtolower($sord), array('asc', 'desc')) ? $sord : 'asc';
 
         $start = intval($start);
         $limit = intval($limit);
@@ -626,7 +626,7 @@ class UserGroup extends Model
             }
             $result = $new_result;
         }
-        $columns = array('name', 'users', 'courses','sessions');
+        $columns = array('id', 'name', 'users', 'courses','sessions');
 
         if (!in_array($sidx, $columns)) {
             $sidx = 'name';
@@ -634,6 +634,7 @@ class UserGroup extends Model
 
         // Multidimensional sort
         $result = msort($result, $sidx, $sord);
+
         return $result;
     }