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

Adding course info array in the function api_set_default_visibility()

Browse Source
skala
Julio Montoya 13 years ago
parent 1aac12bc6f
commit 23c1544b1a
7 changed files with 16 additions and 16 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. 2
      main/exercice/exercise.class.php
  2. 7
      main/forum/forumfunction.inc.php
  3. 6
      main/inc/lib/fileManager.lib.php
  4. 3
      main/inc/lib/link.lib.php
  5. 6
      main/inc/lib/main_api.lib.php
  6. 2
      main/newscorm/learnpath.class.php
  7. 6
      tests/datafiller/fill_exe.php

2
main/exercice/exercise.class.php
Unescape View File

@ -1236,7 +1236,7 @@ class Exercise
// insert into the item_property table // insert into the item_property table
api_item_property_update($this->course, TOOL_QUIZ, $this->id, 'QuizAdded', api_get_user_id()); api_item_property_update($this->course, TOOL_QUIZ, $this->id, 'QuizAdded', api_get_user_id());
api_set_default_visibility($this->id, TOOL_QUIZ); api_set_default_visibility($this->course, $this->id, TOOL_QUIZ);
if (api_get_setting('search_enabled') == 'true' && extension_loaded('xapian')) { if (api_get_setting('search_enabled') == 'true' && extension_loaded('xapian')) {
$this->search_engine_save(); $this->search_engine_save();

7
main/forum/forumfunction.inc.php
Unescape View File

@ -481,7 +481,6 @@ function show_edit_forumcategory_form($inputvalues = array())
function store_forumcategory($values) function store_forumcategory($values)
{ {
$_course = api_get_course_info(); $_course = api_get_course_info();
global $_user;
$course_id = api_get_course_int_id(); $course_id = api_get_course_int_id();
@ -528,7 +527,7 @@ function store_forumcategory($values)
'ForumCategoryAdded', 'ForumCategoryAdded',
api_get_user_id() api_get_user_id()
); );
api_set_default_visibility($last_id, TOOL_FORUM_CATEGORY); api_set_default_visibility($_course, $last_id, TOOL_FORUM_CATEGORY);
} }
$return_message = get_lang('ForumCategoryAdded'); $return_message = get_lang('ForumCategoryAdded');
} }
@ -710,7 +709,7 @@ function store_forum($values)
$last_id = Database::insert_id(); $last_id = Database::insert_id();
if ($last_id > 0) { if ($last_id > 0) {
api_item_property_update($_course, TOOL_FORUM, $last_id, 'ForumAdded', api_get_user_id(), $group_id); api_item_property_update($_course, TOOL_FORUM, $last_id, 'ForumAdded', api_get_user_id(), $group_id);
api_set_default_visibility($last_id, TOOL_FORUM, $group_id); api_set_default_visibility($_course, $last_id, TOOL_FORUM, $group_id);
} }
$return_message = get_lang('ForumAdded'); $return_message = get_lang('ForumAdded');
} }
@ -2180,7 +2179,7 @@ function store_thread($values)
// to make the thread visible AND the post. // to make the thread visible AND the post.
//Default behaviour //Default behaviour
api_set_default_visibility($last_thread_id, TOOL_FORUM_THREAD); api_set_default_visibility($_course, $last_thread_id, TOOL_FORUM_THREAD);
if ($visible == 0) { if ($visible == 0) {
api_item_property_update($_course, TOOL_FORUM_THREAD, $last_thread_id, 'invisible', api_get_user_id()); api_item_property_update($_course, TOOL_FORUM_THREAD, $last_thread_id, 'invisible', api_get_user_id());

6
main/inc/lib/fileManager.lib.php
Unescape View File

@ -991,7 +991,7 @@ class FileManager
); );
//Redo visibility //Redo visibility
api_set_default_visibility(TOOL_DOCUMENT, $document_id); api_set_default_visibility($_course, TOOL_DOCUMENT, $document_id);
} }
// If the file is in a folder, we need to update all parent folders // If the file is in a folder, we need to update all parent folders
self::item_property_update_on_folder($_course, $upload_path, $user_id); self::item_property_update_on_folder($_course, $upload_path, $user_id);
@ -1611,7 +1611,7 @@ class FileManager
$document_id = Database::insert_id(); $document_id = Database::insert_id();
if ($document_id) { if ($document_id) {
if ($save_visibility) { if ($save_visibility) {
api_set_default_visibility($document_id, TOOL_DOCUMENT, $group_id); api_set_default_visibility($_course, $document_id, TOOL_DOCUMENT, $group_id);
} }
} }
@ -2121,4 +2121,4 @@ class FileManager
} }
} }
} }
} }

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

@ -58,6 +58,7 @@ function addlinkcategory($type) {
$ok = true; $ok = true;
$course_id = api_get_course_int_id(); $course_id = api_get_course_int_id();
$courseInfo = api_get_course_info();
if ($type == 'link') { if ($type == 'link') {
$tbl_link = Database :: get_course_table(TABLE_LINK); $tbl_link = Database :: get_course_table(TABLE_LINK);
@ -118,7 +119,7 @@ function addlinkcategory($type) {
$link_id = Database :: insert_id(); $link_id = Database :: insert_id();
if ($link_id) { if ($link_id) {
api_set_default_visibility($link_id, TOOL_LINK); api_set_default_visibility($courseInfo, $link_id, TOOL_LINK);
} }
if ((api_get_setting('search_enabled') == 'true') && $link_id && extension_loaded('xapian')) { if ((api_get_setting('search_enabled') == 'true') && $link_id && extension_loaded('xapian')) {

6
main/inc/lib/main_api.lib.php
Unescape View File

@ -6179,7 +6179,7 @@ function api_is_global_chat_enabled(){
/** /**
* @todo Fix tool_visible_by_default_at_creation labels * @todo Fix tool_visible_by_default_at_creation labels
*/ */
function api_set_default_visibility($item_id, $tool_id, $group_id = null) { function api_set_default_visibility($courseInfo, $item_id, $tool_id, $group_id = null) {
$original_tool_id = $tool_id; $original_tool_id = $tool_id;
switch ($tool_id) { switch ($tool_id) {
@ -6215,13 +6215,13 @@ function api_set_default_visibility($item_id, $tool_id, $group_id = null) {
if (empty($group_id)) { if (empty($group_id)) {
$group_id = api_get_group_id(); $group_id = api_get_group_id();
} }
api_item_property_update(api_get_course_info(), $original_tool_id, $item_id, $visibility, api_get_user_id(), $group_id, null, null, null, api_get_session_id()); api_item_property_update($courseInfo, $original_tool_id, $item_id, $visibility, api_get_user_id(), $group_id, null, null, null, api_get_session_id());
//Fixes default visibility for tests //Fixes default visibility for tests
switch ($original_tool_id) { switch ($original_tool_id) {
case TOOL_QUIZ: case TOOL_QUIZ:
$objExerciseTmp = new Exercise(); $objExerciseTmp = new Exercise($courseInfo['real_id']);
$objExerciseTmp->read($item_id); $objExerciseTmp->read($item_id);
if ($visibility == 'visible') { if ($visibility == 'visible') {
$objExerciseTmp->enable(); $objExerciseTmp->enable();

2
main/newscorm/learnpath.class.php
Unescape View File

@ -797,7 +797,7 @@ class learnpath
$course_info = api_get_course_info(); $course_info = api_get_course_info();
// Insert into item_property. // Insert into item_property.
api_item_property_update($course_info, TOOL_LEARNPATH, $id, 'LearnpathAdded', api_get_user_id()); api_item_property_update($course_info, TOOL_LEARNPATH, $id, 'LearnpathAdded', api_get_user_id());
api_set_default_visibility($id, TOOL_LEARNPATH); api_set_default_visibility($course_info, $id, TOOL_LEARNPATH);
return $id; return $id;
} }

6
tests/datafiller/fill_exe.php
Unescape View File

@ -27,16 +27,16 @@ function fill_exe()
require_once $lib.'exercice/question.class.php'; require_once $lib.'exercice/question.class.php';
require_once $lib.'exercice/answer.class.php'; require_once $lib.'exercice/answer.class.php';
foreach ($courses as $i => $course) { foreach ($courses as $i => $course) {
$res = 0;
//first check that the first item doesn't exist already //first check that the first item doesn't exist already
$output[$i]['line-init'] = $course['title']; $output[$i]['line-init'] = $course['title'];
$res = CourseManager::create_course($course); $res = CourseManager::create_course($course);
$output[$i]['line-info'] = ($res ? $res : get_lang('NotInserted')); $output[$i]['line-info'] = ($res ? $res : get_lang('NotInserted'));
$i++; $i++;
if (is_array($res)) { if (is_array($res)) {
//now insert an exercise //now insert an exercise
foreach ($course['exes'] as $exe) { foreach ($course['exes'] as $exe) {
$objExercise = new Exercise();
$objExercise = new Exercise($res['real_id']);
$objExercise->id = 0; $objExercise->id = 0;
$objExercise->course_id = $res['real_id']; $objExercise->course_id = $res['real_id'];
$objExercise->exercise = $exe['title']; $objExercise->exercise = $exe['title'];

Write Preview
Loading…
Cancel
Save