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

Set course destination id see BT#1771

Browse Source
remotes/angel/1.11.x
jmontoyaa 8 years ago
parent d965010f80
commit 0b393212d8
2 changed files with 30 additions and 35 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. 33
      main/exercise/TestCategory.php
  2. 32
      src/Chamilo/CourseBundle/Component/CourseCopy/CourseRestorer.php

33
main/exercise/TestCategory.php
Unescape View File

@ -56,12 +56,8 @@ class TestCategory
*/
public function save($courseId = 0)
{
$courseId = (int) $courseId;
if (empty($courseId)) {
$courseId = api_get_course_int_id();
}
$courseInfo = api_get_course_info($courseId);
$courseId = empty($courseId) ? api_get_course_int_id() : (int) $courseId;
$courseInfo = api_get_course_info_by_id($courseId);
if (empty($courseInfo)) {
return false;
}
@ -141,27 +137,32 @@ class TestCategory
/**
* Modify category name or description of category with id=in_id
* @param int $courseId
* @return bool
*/
public function modifyCategory()
public function modifyCategory($courseId = 0)
{
$table = Database::get_course_table(TABLE_QUIZ_QUESTION_CATEGORY);
$id = intval($this->id);
$name = Database::escape_string($this->name);
$description = Database::escape_string($this->description);
$cat = $this->getCategory($id);
$courseId = api_get_course_int_id();
$courseId = empty($courseId) ? api_get_course_int_id() : (int) $courseId;
$courseInfo = api_get_course_info_by_id($courseId);
if (empty($courseInfo)) {
return false;
}
if ($cat) {
$sql = "UPDATE $table SET
title = '$name',
description = '$description'
WHERE id = $id AND c_id = ".$courseId;
title = '$name',
description = '$description'
WHERE id = $id AND c_id = ".$courseId;
Database::query($sql);
// item_property update
$course_info = api_get_course_info_by_id($courseId);
api_item_property_update(
$course_info,
$courseInfo,
TOOL_TEST_CATEGORY,
$this->id,
'TestCategoryModified',
@ -201,10 +202,7 @@ class TestCategory
*/
public static function getCategoryListInfo($in_field = '', $courseId = 0)
{
$courseId = (int) $courseId;
if (empty($courseId)) {
$courseId = api_get_course_int_id();
}
$courseId = empty($courseId) ? api_get_course_int_id() : (int) $courseId;
$table = Database::get_course_table(TABLE_QUIZ_QUESTION_CATEGORY);
$in_field = Database::escape_string($in_field);
@ -227,7 +225,6 @@ class TestCategory
$categories[] = $row[$in_field];
}
}
return $categories;
}

32
src/Chamilo/CourseBundle/Component/CourseCopy/CourseRestorer.php
Unescape View File

@ -2107,38 +2107,36 @@ class CourseRestorer
$tab_test_category_id_old_new = array(); // used to build the quiz_question_rel_category table
if ($this->course->has_resources(RESOURCE_TEST_CATEGORY)) {
$resources = $this->course->resources;
foreach ($resources[RESOURCE_TEST_CATEGORY] as $id => $CourseCopyTestCategory ) {
$tab_test_category_id_old_new[$CourseCopyTestCategory->source_id] = $id;
$destinationCourseId = $this->destination_course_info['real_id'];
foreach ($resources[RESOURCE_TEST_CATEGORY] as $id => $courseCopyTestCategory) {
$tab_test_category_id_old_new[$courseCopyTestCategory->source_id] = $id;
// check if this test_category already exist in the destination BDD
// do not Database::escape_string $title and $description, it will be done later
$title = $CourseCopyTestCategory->title;
$description = $CourseCopyTestCategory->description;
if (TestCategory::categoryTitleExists($title)) {
$title = $courseCopyTestCategory->title;
$description = $courseCopyTestCategory->description;
if (TestCategory::categoryTitleExists($title, $destinationCourseId)) {
switch ($this->file_option) {
case FILE_SKIP:
//Do nothing
break;
case FILE_RENAME:
$new_title = $title."_";
while (TestCategory::categoryTitleExists(
$new_title
)) {
$new_title = $title.'_';
while (TestCategory::categoryTitleExists($new_title, $destinationCourseId)) {
$new_title .= '_';
}
$test_category = new TestCategory();
$test_category->name = $new_title;
$test_category->description = $description;
$new_id = $test_category->save();
$tab_test_category_id_old_new[$CourseCopyTestCategory->source_id] = $new_id;
$new_id = $test_category->save($destinationCourseId);
$tab_test_category_id_old_new[$courseCopyTestCategory->source_id] = $new_id;
break;
case FILE_OVERWRITE:
$id = TestCategory::get_category_id_for_title($title);
$my_cat = new TestCategory();
$my_cat = $my_cat->getCategory($id);
$my_cat->name = $title;
$my_cat->modifyCategory();
$tab_test_category_id_old_new[$CourseCopyTestCategory->source_id] = $id;
$my_cat->modifyCategory($destinationCourseId);
$tab_test_category_id_old_new[$courseCopyTestCategory->source_id] = $id;
break;
}
} else {
@ -2146,10 +2144,10 @@ class CourseRestorer
$test_category = new TestCategory();
$test_category->name = $title;
$test_category->description = $description;
$new_id = $test_category->save();
$tab_test_category_id_old_new[$CourseCopyTestCategory->source_id] = $new_id;
$new_id = $test_category->save($destinationCourseId);
$tab_test_category_id_old_new[$courseCopyTestCategory->source_id] = $new_id;
}
$this->course->resources[RESOURCE_TEST_CATEGORY][$id]->destination_id = $tab_test_category_id_old_new[$CourseCopyTestCategory->source_id];
$this->course->resources[RESOURCE_TEST_CATEGORY][$id]->destination_id = $tab_test_category_id_old_new[$courseCopyTestCategory->source_id];
}
}
// lets check if quizzes-question are restored too, to redo the link between test_category and quizzes question for questions restored

Write Preview
Loading…
Cancel
Save