holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed javascript error, which cause freetime search not to function on new events (page gets transmitted instead)

Browse Source
This commit is contained in:
Ralf Becker 2004-10-11 10:43:26 +00:00
parent 8cdc5262ad
commit c72227f203
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
calendar/inc/class.uicalendar.inc.php
View File

@ -4209,9 +4209,11 @@ return;
{ {
$GLOBALS['phpgw']->uiaccountsel = CreateObject('phpgwapi.uiaccountsel'); $GLOBALS['phpgw']->uiaccountsel = CreateObject('phpgwapi.uiaccountsel');
} }
$fts_link = $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>'calendar.uiforms.freetimesearch')); $get_args = array('menuaction'=>'calendar.uiforms.freetimesearch');
if ($event['id']) $get_args['cal_id'] = $event['id'];
$fts_link = $GLOBALS['phpgw']->link('/index.php',$get_args);
$fields = array('start[str]','start[hour]','start[min]','end[str]','end[hour]','end[min]','cal[id]','cal[recur_type]'); $fields = array('start[str]','start[hour]','start[min]','end[str]','end[hour]','end[min]','cal[recur_type]');
if ($this->bo->prefs['common']['timeformat'] == '12') if ($this->bo->prefs['common']['timeformat'] == '12')
{ {
$fields[] = 'start[ampm]'; $fields[] = 'start[ampm]';

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

@ -76,7 +76,7 @@ class uiforms extends uical
{ {
if ((int) $uid) $content['participants'][] = (int) $uid; if ((int) $uid) $content['participants'][] = (int) $uid;
} }
$content['cal_id'] = $_GET['cal']['id']; $content['cal_id'] = $_GET['cal_id'];
$content['recur_type'] = $_GET['cal']['recur_type']; $content['recur_type'] = $_GET['cal']['recur_type'];
// default search parameters // default search parameters
@ -96,7 +96,7 @@ class uiforms extends uical
if (is_array($content['freetime']['select'])) if (is_array($content['freetime']['select']))
{ {
list($selected) = each($content['freetime']['select']); list($selected) = each($content['freetime']['select']);
echo "$selected = ".date('D d.m.Y H:i',$content['freetime'][$selected]['start']); //echo "$selected = ".date('D d.m.Y H:i',$content['freetime'][$selected]['start']);
$start = (int) $content['freetime'][$selected]['start']; $start = (int) $content['freetime'][$selected]['start'];
$end = $start + $duration; $end = $start + $duration;
$fields_to_set = array( $fields_to_set = array(