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

[svn r16709] The order of the parameters of the function of course.lib.php was incorrect select_and_sort_categories (see FS#3193) (by cvargas)

Browse Source
skala
Yannick Warnier 17 years ago
parent 3f978f1386
commit 806545288c
3 changed files with 8 additions and 13 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. 13
      main/admin/course_list.php
  2. 4
      main/create_course/add_course.php
  3. 4
      main/inc/lib/course.lib.php

13
main/admin/course_list.php
Unescape View File

@ -1,5 +1,5 @@
<?php <?php
// $Id: course_list.php 15245 2008-05-08 16:53:52Z juliomontoya $ // $Id: course_list.php 16709 2008-11-10 22:22:28Z yannoo $
/* /*
============================================================================== ==============================================================================
Dokeos - elearning and course management software Dokeos - elearning and course management software
@ -174,13 +174,6 @@ if (isset ($_GET['search']) && $_GET['search'] == 'advanced')
{ {
// Get all course categories // Get all course categories
$table_course_category = Database :: get_main_table(TABLE_MAIN_CATEGORY); $table_course_category = Database :: get_main_table(TABLE_MAIN_CATEGORY);
$sql = "SELECT code,name FROM ".$table_course_category." WHERE auth_course_child ='TRUE' ORDER BY tree_pos";
$res = api_sql_query($sql, __FILE__, __LINE__);
$categories['%'] = get_lang('All');
while ($cat = Database::fetch_array($res))
{
$categories[$cat['code']] = '('.$cat['code'].') '.$cat['name'];
}
$interbreadcrumb[] = array ("url" => 'index.php', "name" => get_lang('PlatformAdmin')); $interbreadcrumb[] = array ("url" => 'index.php', "name" => get_lang('PlatformAdmin'));
$interbreadcrumb[] = array ("url" => 'course_list.php', "name" => get_lang('CourseList')); $interbreadcrumb[] = array ("url" => 'course_list.php', "name" => get_lang('CourseList'));
$tool_name = get_lang('SearchACourse'); $tool_name = get_lang('SearchACourse');
@ -189,7 +182,9 @@ if (isset ($_GET['search']) && $_GET['search'] == 'advanced')
$form = new FormValidator('advanced_course_search', 'get'); $form = new FormValidator('advanced_course_search', 'get');
$form->add_textfield('keyword_code', get_lang('CourseCode'), false); $form->add_textfield('keyword_code', get_lang('CourseCode'), false);
$form->add_textfield('keyword_title', get_lang('Title'), false); $form->add_textfield('keyword_title', get_lang('Title'), false);
$form->addElement('select', 'keyword_category', get_lang('CourseFaculty'), $categories); $categories = array();
$categories_select = $form->addElement('select', 'keyword_category', get_lang('CourseFaculty'), $categories);
CourseManager::select_and_sort_categories($categories_select);
$el = & $form->addElement('select_language', 'keyword_language', get_lang('CourseLanguage')); $el = & $form->addElement('select_language', 'keyword_language', get_lang('CourseLanguage'));
$el->addOption(get_lang('All'), '%'); $el->addOption(get_lang('All'), '%');
$form->addElement('radio', 'keyword_visibility', get_lang("CourseAccess"), get_lang('OpenToTheWorld'), COURSE_VISIBILITY_OPEN_WORLD); $form->addElement('radio', 'keyword_visibility', get_lang("CourseAccess"), get_lang('OpenToTheWorld'), COURSE_VISIBILITY_OPEN_WORLD);

4
main/create_course/add_course.php
Unescape View File

@ -1,5 +1,5 @@
<?php <?php
// $Id: add_course.php 15801 2008-07-17 04:23:35Z yannoo $ // $Id: add_course.php 16709 2008-11-10 22:22:28Z yannoo $
/* /*
============================================================================== ==============================================================================
Dokeos - elearning and course management software Dokeos - elearning and course management software
@ -165,4 +165,4 @@ else
============================================================================== ==============================================================================
*/ */
Display :: display_footer(); Display :: display_footer();
?> ?>

4
main/inc/lib/course.lib.php
Unescape View File

@ -1754,7 +1754,7 @@ class CourseManager
ORDER BY code"; ORDER BY code";
$res = api_sql_query($sql, __FILE__, __LINE__); $res = api_sql_query($sql, __FILE__, __LINE__);
$new_padding = $padding.str_repeat('-',3); $new_padding = $padding.' - ';
while ($cat = Database::fetch_array($res)) while ($cat = Database::fetch_array($res))
{ {
@ -1763,7 +1763,7 @@ class CourseManager
$select_element->addOption($padding.'('.$cat['code'].') '.$cat['name'], $cat['code'], $params); $select_element->addOption($padding.'('.$cat['code'].') '.$cat['name'], $cat['code'], $params);
if($cat['auth_cat_child']) if($cat['auth_cat_child'])
{ {
CourseManager::select_and_sort_categories($select_element, $cat['code'], $category_selected_code, $new_padding); CourseManager::select_and_sort_categories($select_element, $category_selected_code, $cat['code'], $new_padding);
} }
} }
} }

Write Preview
Loading…
Cancel
Save