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

More fixes due the recent changes in session fields

Browse Source
skala
Julio Montoya 12 years ago
parent 4e0405ba9b
commit 55e9d1ee90
5 changed files with 47 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. 27
      main/admin/extra_field_options.php
  2. 2
      main/inc/ajax/model.ajax.php
  3. 9
      main/inc/lib/database.lib.php
  4. 32
      main/inc/lib/extra_field_option.lib.php
  5. 3
      main/inc/lib/session_field.lib.php

27
main/admin/extra_field_options.php
Unescape View File

@ -39,13 +39,18 @@ $check = Security::check_token('request');
$token = Security::get_token();
if ($action == 'add') {
$interbreadcrumb[]=array('url' => 'session_fields.php','name' => get_lang('SessionFields'));
$interbreadcrumb[]=array('url' => 'session_fields.php','name' => get_lang('ExtraFields'));
$interbreadcrumb[]=array('url' => 'session_fields.php?action=edit&id='.$extra_field_info['id'],'name' => $extra_field_info['field_display_text']);
$interbreadcrumb[]=array('url' => 'extra_field_options.php?type='.$type.'&field_id='.$extra_field_info['id'], 'name' => get_lang('EditExtraFieldOptions'));
$interbreadcrumb[]=array('url' => '#','name' => get_lang('Add'));
} elseif ($action == 'edit') {
$interbreadcrumb[]=array('url' => 'session_fields.php','name' => get_lang('SessionFields'));
$interbreadcrumb[]=array('url' => 'session_fields.php','name' => get_lang('ExtraFields'));
$interbreadcrumb[]=array('url' => 'session_fields.php?action=edit&id='.$extra_field_info['id'],'name' => $extra_field_info['field_display_text']);
$interbreadcrumb[]=array('url' => 'extra_field_options.php?type='.$type.'&field_id='.$extra_field_info['id'], 'name' => get_lang('EditExtraFieldOptions'));
$interbreadcrumb[]=array('url' => '#','name' => get_lang('Edit'));
} else {
$interbreadcrumb[]=array('url' => 'session_fields.php','name' => get_lang('SessionFields'));
$interbreadcrumb[]=array('url' => 'session_fields.php','name' => get_lang('ExtraFields'));
$interbreadcrumb[]=array('url' => 'session_fields.php?action=edit&id='.$extra_field_info['id'],'name' => $extra_field_info['field_display_text']);
$interbreadcrumb[]=array('url' => '#','name' => get_lang('EditExtraFieldOptions'));
}
@ -90,7 +95,7 @@ Display::display_header($tool_name);
echo Display::page_header($extra_field_info['field_display_text']);
$obj = new ExtraFieldOption($type);
//$obj->field_id = $field_id;
$obj->field_id = $field_id;
// Action handling: Add
switch ($action) {
@ -102,19 +107,19 @@ switch ($action) {
$form = $obj->return_form($url, 'add');
// The validation or display
if ($form->validate()) {
if ($form->validate()) {
if ($check) {
$values = $form->exportValues();
$res = $obj->save($values);
$values = $form->exportValues();
$res = $obj->save_one_item($values);
if ($res) {
Display::display_confirmation_message(get_lang('ItemAdded'));
}
}
$obj->display();
} else {
echo '<div class="actions">';
/*echo '<div class="actions">';
echo '<a href="'.api_get_self().'">'.Display::return_icon('back.png',get_lang('Back'),'',ICON_SIZE_MEDIUM).'</a>';
echo '</div>';
echo '</div>'; */
$form->addElement('hidden', 'sec_token');
$form->setConstants(array('sec_token' => $token));
$form->display();
@ -134,9 +139,9 @@ switch ($action) {
}
$obj->display();
} else {
echo '<div class="actions">';
/*echo '<div class="actions">';
echo '<a href="'.api_get_self().'">'.Display::return_icon('back.png',get_lang('Back'),'',ICON_SIZE_MEDIUM).'</a>';
echo '</div>';
echo '</div>';*/
$form->addElement('hidden', 'sec_token');
$form->setConstants(array('sec_token' => $token));
$form->display();

2
main/inc/ajax/model.ajax.php
Unescape View File

@ -152,7 +152,7 @@ switch ($action) {
$type = $_REQUEST['type'];
$field_id = $_REQUEST['field_id'];
$obj = new ExtraFieldOption($type);
$count = $obj->get_count_by_field_id($field_id);
$count = $obj->get_count_by_field_id($field_id);
break;
case 'get_timelines':
require_once $libpath.'timeline.lib.php';

9
main/inc/lib/database.lib.php
Unescape View File

@ -1177,9 +1177,8 @@ class Database {
* @example array('where'=> array('type = ? AND category = ?' => array('setting', 'Plugins'))
* @example array('where'=> array('name = "Julio" AND lastname = "montoya"))
*/
public static function select($columns, $table_name, $conditions = array(), $type_result = 'all', $option = 'ASSOC') {
$conditions = self::parse_conditions($conditions);
public static function select($columns, $table_name, $conditions = array(), $type_result = 'all', $option = 'ASSOC') {
$conditions = self::parse_conditions($conditions);
//@todo we could do a describe here to check the columns ...
$clean_columns = '';
@ -1192,7 +1191,6 @@ class Database {
$clean_columns = (string)$columns;
}
}
$sql = "SELECT $clean_columns FROM $table_name $conditions";
//var_dump($sql);
$result = self::query($sql);
@ -1229,8 +1227,7 @@ class Database {
}
$type_condition = strtolower($type_condition);
switch ($type_condition) {
case 'where':
case 'where':
foreach ($condition_data as $condition => $value_array) {
if (is_array($value_array)) {
$clean_values = array();

32
main/inc/lib/extra_field_option.lib.php
Unescape View File

@ -22,7 +22,7 @@ class ExtraFieldOption extends Model {
}
public function get_count_by_field_id($field_id) {
$row = Database::select('count(*) as count', $this->table, array('where' => array('field_id = ?', $field_id)), 'first');
$row = Database::select('count(*) as count', $this->table, array('where' => array('field_id = ?' => $field_id)), 'first');
return $row['count'];
}
@ -130,7 +130,22 @@ class ExtraFieldOption extends Model {
}
return true;
}
public function save_one_item($params, $show_query = false) {
$field_id = intval($params['field_id']);
if (empty($field_id)) {
return false;
}
$params['tms'] = api_get_utc_datetime();
if (empty($params['option_order'])) {
$order = self::get_max_order($field_id);
$params['option_order'] = $order;
}
parent::save($params, $show_query);
}
public function get_field_option_by_field_and_option($field_id, $option_value) {
$field_id = intval($field_id);
$option_value = Database::escape_string($option_value);
@ -253,7 +268,8 @@ class ExtraFieldOption extends Model {
// action links
echo '<div class="actions">';
//echo '<a href="../admin/index.php">'.Display::return_icon('back.png', get_lang('BackTo').' '.get_lang('PlatformAdmin'),'', ICON_SIZE_MEDIUM).'</a>';
echo '<a href="'.api_get_self().'?action=add">'.Display::return_icon('add_user_fields.png',get_lang('Add'),'', ICON_SIZE_MEDIUM).'</a>';
$field_id = isset($_REQUEST['field_id']) ? intval($_REQUEST['field_id']) : null;
echo '<a href="'.api_get_self().'?action=add&type='.$this->type.'&field_id='.$field_id.'">'.Display::return_icon('add_user_fields.png',get_lang('Add'),'', ICON_SIZE_MEDIUM).'</a>';
echo '</div>';
echo Display::grid_html('extra_field_options');
}
@ -269,19 +285,21 @@ class ExtraFieldOption extends Model {
$form->addElement('header', $header);
$id = isset($_GET['id']) ? intval($_GET['id']) : '';
$form->addElement('hidden', 'id', $id);
//$form->addElement('hidden', 'type', $this->type);
//$form->addElement('hidden', 'field_id', $this->field_id);
$form->addElement('hidden', 'id', $id);
$form->addElement('hidden', 'type', $this->type);
$form->addElement('hidden', 'field_id', $this->field_id);
$form->addElement('text', 'option_display_text', get_lang('Name'), array('class' => 'span5'));
$form->addElement('text', 'option_value', get_lang('Value'), array('class' => 'span5'));
$form->addElement('text', 'option_value', get_lang('Value'), array('class' => 'span5'));
$form->addElement('text', 'option_order', get_lang('Order'), array('class' => 'span2'));
$defaults = array();
if ($action == 'edit') {
// Setting the defaults
$defaults = $this->get($id);
$defaults = $this->get($id);
$form->freeze('option_value');
$form->addElement('button', 'submit', get_lang('Modify'), 'class="save"');
} else {
$form->addElement('button', 'submit', get_lang('Add'), 'class="save"');

3
main/inc/lib/session_field.lib.php
Unescape View File

@ -48,10 +48,11 @@ class SessionField extends ExtraField {
$form->addElement('text', 'field_variable', get_lang('FieldLabel'), array('class' => 'span5'));
$form->addElement('text', 'field_options', get_lang('FieldPossibleValues'), array('id' => 'field_options', 'class' => 'span6'));
if ($action == 'edit') {
if ($action == 'edit') {
if (in_array($defaults['field_type'], array(ExtraField::FIELD_TYPE_SELECT, ExtraField::FIELD_TYPE_DOUBLE_SELECT))) {
$url = Display::url(get_lang('EditExtraFieldOptions'), 'extra_field_options.php?type=session&field_id=' . $id);
$form->addElement('label', null, $url);
$form->freeze('field_options');
}
}
$form->addElement('text', 'field_default_value', get_lang('FieldDefaultValue'), array('id' => 'field_default_value', 'class' => 'span5'));

Write Preview
Loading…
Cancel
Save