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

Fixing edit agenda see BT#8857

Browse Source
1.9.x
Julio Montoya 11 years ago
parent a4b1f2c934
commit 6be3d16b79
3 changed files with 99 additions and 39 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. 70
      main/calendar/agenda.lib.php
  2. 5
      main/calendar/agenda.php
  3. 63
      main/inc/lib/main_api.lib.php

70
main/calendar/agenda.lib.php
Unescape View File

@ -597,7 +597,11 @@ class Agenda
$this->tbl_course_agenda,
$attributes,
array(
'id = ? AND c_id = ? AND session_id = ? ' => array($id, $course_id, $this->sessionId)
'id = ? AND c_id = ? AND session_id = ? ' => array(
$id,
$course_id,
$this->sessionId
)
)
);
@ -611,41 +615,34 @@ class Agenda
$groupToAdd = array_diff($sendTo['groups'], $eventInfo['send_to']['groups']);
if ($sendTo['everyone']) {
// Delete all:
if (!empty($eventInfo['send_to']['groups']) &&
isset($eventInfo['send_to']['groups'])
// Delete all from group
if (isset($eventInfo['send_to']['groups']) &&
!empty($eventInfo['send_to']['groups'])
) {
foreach ($eventInfo['send_to']['groups'] as $group) {
api_item_property_update(
api_item_property_delete(
$this->course,
TOOL_CALENDAR_EVENT,
$id,
"delete",
api_get_user_id(),
$group,
0,
$start,
$end,
$group,
$this->sessionId
);
}
}
// storing the selected users
if (!empty($eventInfo['send_to']['users']) &&
isset($eventInfo['send_to']['users'])
// Storing the selected users.
if (isset($eventInfo['send_to']['users']) &&
!empty($eventInfo['send_to']['users'])
) {
foreach ($eventInfo['send_to']['users'] as $userId) {
api_item_property_update(
api_item_property_delete(
$this->course,
TOOL_CALENDAR_EVENT,
$id,
"delete",
api_get_user_id(),
$groupId,
$userId,
$start,
$end,
$groupId,
$this->sessionId
);
}
@ -659,13 +656,24 @@ class Agenda
"visible",
api_get_user_id(),
$groupId,
'',
null,
$start,
$end,
$this->sessionId
);
} else {
// Groups
// Delete "everyone".
api_item_property_delete(
$this->course,
TOOL_CALENDAR_EVENT,
$id,
0,
0,
$this->sessionId
);
// Add groups
if (!empty($groupToAdd)) {
foreach ($groupToAdd as $group) {
api_item_property_update(
@ -683,24 +691,21 @@ class Agenda
}
}
// Delete groups.
if (!empty($groupsToDelete)) {
foreach ($groupsToDelete as $group) {
api_item_property_update(
api_item_property_delete(
$this->course,
TOOL_CALENDAR_EVENT,
$id,
"delete",
api_get_user_id(),
$group,
0,
$start,
$end,
$group,
$this->sessionId
);
}
}
// Users.
// Add users.
if (!empty($usersToAdd)) {
foreach ($usersToAdd as $userId) {
api_item_property_update(
@ -718,18 +723,15 @@ class Agenda
}
}
// Delete users.
if (!empty($usersToDelete)) {
foreach ($usersToDelete as $userId) {
api_item_property_update(
api_item_property_delete(
$this->course,
TOOL_CALENDAR_EVENT,
$id,
"delete",
api_get_user_id(),
$groupId,
$userId,
$start,
$end,
$groupId,
$this->sessionId
);
}

5
main/calendar/agenda.php
Unescape View File

@ -1,12 +1,10 @@
<?php
/* For licensing terms, see /license.txt */
/**
* @package chamilo.calendar
*/
/**
* INIT SECTION
*/
use \ChamiloSession as Session;
// name of the language file that needs to be included
@ -202,7 +200,6 @@ if (api_is_allowed_to_edit(false, true) OR
}
// Editing normal event.
$agenda->edit_event(
$eventId,
$startDate,

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

@ -3346,6 +3346,67 @@ function api_get_item_visibility($_course, $tool, $id, $session = 0)
return $row['visibility'];
}
/**
* Delete a row in the c_item_property table
*
* @param array $courseInfo
* @param string $tool
* @param int $itemId
* @param int $userId
* @param int $groupId
* @param int $sessionId
*/
function api_item_property_delete(
$courseInfo,
$tool,
$itemId,
$userId,
$groupId = 0,
$sessionId = 0
) {
if (empty($courseInfo)) {
return false;
}
$courseId = intval($courseInfo['real_id']);
if (empty($courseId) || empty($tool) || empty($itemId)) {
return false;
}
$table = Database::get_course_table(TABLE_ITEM_PROPERTY);
$tool = Database::escape_string($tool);
$itemId = intval($itemId);
$userId = intval($userId);
$groupId = intval($groupId);
$sessionId = intval($sessionId);
$groupCondition = " AND to_group_id = $groupId ";
if (empty($groupId)) {
$groupCondition = " AND (to_group_id is NULL OR to_group_id = 0) ";
}
$userCondition = " AND to_user_id = $userId ";
if (empty($userId)) {
$userCondition = " AND (to_user_id is NULL OR to_user_id = 0) ";
}
$sql = "DELETE FROM $table
WHERE
c_id = $courseId AND
tool = '$tool' AND
ref = $itemId AND
id_session = $sessionId
$userCondition
$groupCondition
";
Database::query($sql);
}
/**
* Updates or adds item properties to the Item_propetry table
* Tool and lastedit_type are language independant strings (langvars->get_lang!)
@ -3494,6 +3555,7 @@ function api_item_property_update(
lastedit_user_id = '$user_id',
visibility='$visibility' $set_type
WHERE $filter";
}
break;
case 'visible' : // Change item to visible.
@ -3833,7 +3895,6 @@ function api_display_language_form($hide_if_no_choice = false) {
}
//-->
</script>';
// var_dump($user_selected_language);
$html .= '<form id="lang_form" name="lang_form" method="post" action="'.api_get_self().'">';
$html .= '<label style="display: none;" for="language_list">' . get_lang('Language') . '</label>';
$html .= '<select id="language_list" class="chzn-select" name="language_list" onchange="javascript: jumpMenu(\'parent\',this,0);">';

Write Preview
Loading…
Cancel
Save