extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-10-08 11:02:56 +02:00
Code Issues Packages Projects Releases Wiki Activity

Last / Next date

Browse Source 
- Fix list title back to just date
- Link leads to actual recurrence for recurring events
This commit is contained in:
nathangray 2018-10-12 10:51:31 -06:00
parent 97eb04e75c
commit 289e6079f7
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/js/etemplate/et2_widget_link.js
View File

@ -1298,7 +1298,7 @@ var et2_link = (function(){ "use strict"; return et2_valueWidget.extend([et2_IDe
{ {
this.link.addClass("et2_link"); this.link.addClass("et2_link");
this.link.click( function(e){ this.link.click( function(e){
self.egw().open(_value, "", self.options.link_hook,null,_value.app,_value.app); self.egw().open(_value, "", self.options.link_hook,_value.extra_args,_value.app,_value.app);
e.stopImmediatePropagation(); e.stopImmediatePropagation();
}); });
} }

9
api/src/Contacts.php
View File

@ -1730,16 +1730,17 @@ class Contacts extends Contacts\Storage
if (!$contacts) return array(); if (!$contacts) return array();
// Extract the event info and generate what is needed for next/last event // Extract the event info and generate what is needed for next/last event
$do_event = function($key, $contact) use (&$bocal, &$calendars, $type) $do_event = function($key, $contact) use (&$bocal, &$calendars, $type, $extra_title)
{ {
list($start, $cal_id, $recur_date) = explode(':', $contact[$key.'_event']); list($start, $cal_id, $recur_date) = explode(':', $contact[$key.'_event']);
$link = array( $link = array(
'id' => $cal_id, 'id' => $cal_id,//.':'.$start,
'app' => 'calendar', 'app' => 'calendar',
'title' => $bocal->link_title($cal_id . ($recur_date ? '-'.$recur_date : '')), 'title' => $bocal->link_title($cal_id . ($start ? '-'.$start : '')),
'extra_args' => array( 'extra_args' => array(
'date' => date('Ymd',$start), 'date' => \EGroupware\Api\DateTime::server2user($start,\EGroupware\Api\DateTime::ET2),
'exception'=> 1
), ),
); );
if ($extra_title) if ($extra_title)