chamilo
/
chamilo-lms
mirror of https://github.com/chamilo/chamilo-lms/tree/1.11.x
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix session extra fields - refs BT#9089

Browse Source
1.10.x
Angel Fernando Quiroz Campos 11 years ago
parent 168174eb79
commit 2083ff3f91
4 changed files with 34 additions and 26 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 22
      main/admin/resume_session.php
  2. 2
      main/admin/session_add.php
  3. 12
      main/inc/lib/extra_field.lib.php
  4. 24
      main/inc/lib/extra_field_value.lib.php

22
main/admin/resume_session.php
Unescape View File

@ -240,17 +240,21 @@ foreach ($sessionFields as $field) {
}
break;
case ExtraField::FIELD_TYPE_DATE:
$extraFieldDate = str_replace(';', '-', $sesionValueData['field_value']);
echo api_format_date($extraFieldDate, DATE_FORMAT_LONG_NO_DAY);
if ($sesionValueData !== false && !empty($sesionValueData['field_value'])) {
echo api_format_date($sesionValueData['field_value'], DATE_FORMAT_LONG_NO_DAY);
} else {
echo get_lang('None');
}
break;
case ExtraField::FIELD_TYPE_FILE_IMAGE:
if (file_exists(WEB_CODE_PATH) . $sesionValueData['field_value']) {
echo Display::img(
api_get_path(WEB_CODE_PATH) . $sesionValueData['field_value'],
$field['field_display_text'],
array('width' => '300')
);
if ($sesionValueData !== false && !empty($sesionValueData['field_value'])) {
if (file_exists(api_get_path(SYS_CODE_PATH) . $sesionValueData['field_value'])) {
echo Display::img(
api_get_path(WEB_CODE_PATH) . $sesionValueData['field_value'],
$field['field_display_text'],
array('width' => '300')
);
}
}
break;
default:

2
main/admin/session_add.php
Unescape View File

@ -433,7 +433,7 @@ if ($form->validate()) {
if ($return == strval(intval($return))) {
// integer => no error on session creation
header('Location: add_courses_to_session.php?id_session=' . $return . '&add=true&msg=');
// header('Location: add_courses_to_session.php?id_session=' . $return . '&add=true&msg=');
exit();
}
}

12
main/inc/lib/extra_field.lib.php
Unescape View File

@ -1023,11 +1023,13 @@ EOF;
);
if (is_array($extraData) && array_key_exists($fieldVariable, $extraData)) {
$fieldTexts[] = Display::img(
api_get_path(WEB_CODE_PATH) . $extraData[$fieldVariable],
'',
array('width' => '300')
);
if (file_exists(api_get_path(SYS_CODE_PATH) . $extraData[$fieldVariable])) {
$fieldTexts[] = Display::img(
api_get_path(WEB_CODE_PATH) . $extraData[$fieldVariable],
'ASDASD',
array('width' => '300')
);
}
}
$form->addElement(

24
main/inc/lib/extra_field_value.lib.php
Unescape View File

@ -163,20 +163,22 @@ class ExtraFieldValue extends Model
mkdir($sysCodePath . $fileDir, $dirPermissions, true);
}
$imageExtraField = new Image($value['tmp_name']);
$imageExtraField->send_image($sysCodePath . $fileDir . $fileName, -1, 'png');
if ($value['error'] == 0) {
$imageExtraField = new Image($value['tmp_name']);
$imageExtraField->send_image($sysCodePath . $fileDir . $fileName, -1, 'png');
$new_params = array(
$this->handler_id => $params[$this->handler_id],
'field_id' => $extra_field_info['id'],
'field_value' => $fileDir . $fileName
);
$new_params = array(
$this->handler_id => $params[$this->handler_id],
'field_id' => $extra_field_info['id'],
'field_value' => $fileDir . $fileName
);
if ($this->handler_id !== 'session_id' && $this->handler_id !== 'course_code') {
$new_params['comment'] = $comment;
}
if ($this->type !== 'session' && $this->type !== 'course') {
$new_params['comment'] = $comment;
}
self::save($new_params);
self::save($new_params);
}
break;
default;
$new_params = array(

Write Preview
Loading…
Cancel
Save