Fix query fatal error when loading jqgrid.

main/work/work.lib.php

@@ -1973,7 +1973,6 @@ function get_work_user_list(
 
         $url = api_get_path(WEB_CODE_PATH).'work/';
         $unoconv = api_get_configuration_value('unoconv.binaries');
-
         $loadingText = addslashes(get_lang('Loading'));
         $uploadedText = addslashes(get_lang('Uploaded'));
         $failsUploadText = addslashes(get_lang('UplNoFileUploaded'));
@@ -2041,7 +2040,8 @@ function get_work_user_list(
             ) {
                 // Firstname, lastname, username
                 $work['fullname'] = Display::div(
-                    api_get_person_name($work['firstname'], $work['lastname']), ['class' => 'work-name']
+                    api_get_person_name($work['firstname'], $work['lastname']),
+                    ['class' => 'work-name']
                 );
                 $work['title_clean'] = $work['title'];
 
@@ -2064,7 +2064,6 @@ function get_work_user_list(
                 }
 
                 $send_to = Portfolio::share('work', $work['id'],  array('style' => 'white-space:nowrap;'));
-
                 $feedback = null;
                 $count = getWorkCommentCount($item_id, $course_info);
                 if (!is_null($count) && !empty($count)) {

main/work/work_list_all.php

@@ -212,15 +212,15 @@ if (!empty($my_folder_data['description'])) {
 
 $check_qualification = intval($my_folder_data['qualification']);
 
+$orderName = api_is_western_name_order() ? 'firstname' : 'lastname';
+
 if (!empty($work_data['enable_qualification']) &&
     !empty($check_qualification)
 ) {
     $type = 'simple';
 
     $columns = array(
-        //get_lang('Type'),
         get_lang('FullUserName'),
-        //get_lang('LastName'),
         get_lang('Title'),
         get_lang('Feedback'),
         get_lang('Date'),
@@ -230,28 +230,13 @@ if (!empty($work_data['enable_qualification']) &&
     );
 
     $column_model = array(
-        /*array(
-            'name' => 'type',
-            'index' => 'file',
-            'width' => '8',
-            'align' => 'left',
-            'search' => 'false',
-            'sortable' => 'false',
-        ),*/
         array(
             'name' => 'fullname',
-            'index' => 'fullname',
+            'index' => $orderName,
             'width' => '30',
             'align' => 'left',
             'search' => 'true',
         ),
-        /*array(
-            'name' => 'lastname',
-            'index' => 'lastname',
-            'width' => '35',
-            'align' => 'left',
-            'search' => 'true',
-        ),*/
         array(
             'name' => 'title',
             'index' => 'title',
@@ -304,7 +289,6 @@ if (!empty($work_data['enable_qualification']) &&
     $type = 'complex';
 
     $columns = array(
-        //get_lang('Type'),
         get_lang('FullUserName'),
         get_lang('Title'),
         get_lang('Feedback'),
@@ -314,17 +298,9 @@ if (!empty($work_data['enable_qualification']) &&
     );
 
     $column_model = array(
-        /*array(
-            'name' => 'type',
-            'index' => 'file',
-            'width' => '8',
-            'align' => 'left',
-            'search' => 'false',
-            'sortable' => 'false',
-        ),*/
         array(
             'name' => 'fullname',
-            'index' => 'fullname',
+            'index' => $orderName,
             'width' => '35',
             'align' => 'left',
             'search' => 'true',
@@ -376,8 +352,8 @@ if (!empty($work_data['enable_qualification']) &&
 $extra_params = array(
     'autowidth' => 'true',
     'height' => 'auto',
-    'sortname' => 'fullname',
-    'sortable' => 'false'
+    'sortname' => $orderName,
+    'sortable' => 'false',
 );
 
 $url = api_get_path(WEB_AJAX_PATH).'model.ajax.php?a=get_work_user_list_all&work_id='.$workId.'&type='.$type.'&'.api_get_cidreq();