Fix fatal error see BT#11758

remotes/angel/1.11.x
jmontoyaa 8 years ago
parent 36c6461831
commit 24d31284f9
  1. 9
      main/work/work.lib.php
  2. 6
      main/work/work.php

@ -510,11 +510,11 @@ function showStudentWorkGrid()
);
$columnModel = array(
array('name'=>'type', 'index'=>'type', 'width'=>'30', 'align'=>'center', 'sortable' => 'false'),
array('name'=>'type', 'index'=>'type', 'width'=>'30', 'align'=>'center', 'sortable' => 'false'),
array('name'=>'title', 'index'=>'title', 'width'=>'250', 'align'=>'left'),
array('name'=>'expires_on', 'index'=>'expires_on', 'width'=>'80', 'align'=>'center', 'sortable'=>'false'),
array('name'=>'feedback', 'index'=>'feedback', 'width'=>'80', 'align'=>'center'),
array('name'=>'last_upload', 'index'=>'feedback', 'width'=>'125', 'align'=>'center'),
array('name'=>'feedback', 'index'=>'feedback', 'width'=>'80', 'align'=>'center', 'sortable'=>'false'),
array('name'=>'last_upload', 'index'=>'feedback', 'width'=>'125', 'align'=>'center', 'sortable'=>'false')
);
if ($courseInfo['show_score'] == 0) {
@ -554,7 +554,7 @@ function showTeacherWorkGrid()
array('name'=>'title', 'index'=>'title', 'width'=>'300', 'align'=>'left', 'wrap_cell' => "true"),
array('name'=>'sent_date', 'index'=>'sent_date', 'width'=>'125', 'align'=>'center'),
array('name'=>'expires_on', 'index'=>'expires_on', 'width'=>'125', 'align'=>'center'),
array('name'=>'amount', 'index'=>'end_on', 'width'=>'110', 'align'=>'center'),
array('name'=>'amount', 'index'=>'amount', 'width'=>'110', 'align'=>'center', 'sortable' => 'false'),
array('name'=>'actions', 'index'=>'actions', 'width'=>'110', 'align'=>'left', 'sortable'=>'false')
);
@ -1414,7 +1414,6 @@ function getWorkListStudent(
$work['last_upload'] .= api_get_local_time($lastWork['sent_date']);
}
$work['title'] = Display::url($work['title'], $url.'&id='.$work['id']);
$work['others'] = Display::url(
Display::return_icon('group.png', get_lang('Others')),

@ -1,8 +1,6 @@
<?php
/* For licensing terms, see /license.txt */
use ChamiloSession as Session;
/**
* @package chamilo.work
**/
@ -333,9 +331,9 @@ switch ($action) {
get_lang('Description').':'.Security::remove_XSS($my_folder_data['description'], STUDENT).
'</div>';
}
if (api_is_allowed_to_edit() || api_is_coach()) {
// Work list
// Work list
if (api_is_allowed_to_edit() || api_is_coach()) {
$content .= '<div class="row">';
$content .= '<div class="col-md-12">';
$content .= '<div class="table-responsive">';

Loading…
Cancel
Save