extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-22 14:41:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Thumbnails (and handling) of uploaded files on new entries that have not yet been saved

Browse Source
This commit is contained in:
nathangray 2017-04-10 11:21:03 -06:00
parent d5c24a2c8e
commit 9eaf1f20ef
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
calendar/inc/class.calendar_so.inc.php
View File

@ -1342,7 +1342,7 @@ ORDER BY cal_user_type, cal_usre_id
* @param int &$etag etag=null etag to check or null, on return new etag * @param int &$etag etag=null etag to check or null, on return new etag
* @return boolean|int false on error, 0 if etag does not match, cal_id otherwise * @return boolean|int false on error, 0 if etag does not match, cal_id otherwise
*/ */
function save($event,&$set_recurrences,&$set_recurrences_start=0,$change_since=0,&$etag=null) function save(&$event,&$set_recurrences,&$set_recurrences_start=0,$change_since=0,&$etag=null)
{ {
if (isset($GLOBALS['egw_info']['user']['preferences']['syncml']['minimum_uid_length'])) if (isset($GLOBALS['egw_info']['user']['preferences']['syncml']['minimum_uid_length']))
{ {
@ -1632,6 +1632,8 @@ ORDER BY cal_user_type, cal_usre_id
$this->participants($cal_id,$event['cal_participants'],!$cal_id ? false : $change_since); $this->participants($cal_id,$event['cal_participants'],!$cal_id ? false : $change_since);
} }
// Custom fields // Custom fields
Api\Etemplate\Widget\Customfields::handle_files('calendar', $cal_id, $event);
foreach($event as $name => $value) foreach($event as $name => $value)
{ {
if ($name[0] == '#') if ($name[0] == '#')

1
calendar/inc/class.calendar_uiforms.inc.php
View File

@ -1585,6 +1585,7 @@ class calendar_uiforms extends calendar_ui
} }
} }
$content = array_merge($event,array( $content = array_merge($event,array(
'cal_id' => $event['id'],
'link_to' => array( 'link_to' => array(
'to_id' => $link_to_id, 'to_id' => $link_to_id,
'to_app' => 'calendar', 'to_app' => 'calendar',