extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-23 07:09:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

- missing target for new button in sidebox

Browse Source 
- adding message to opener.location.search, instead using referer (which points to toplevel frame and reloads framework)
This commit is contained in:
Ralf Becker 2010-06-10 17:24:22 +00:00
parent 7006bbd457
commit 3289d93605
2 changed files with 15 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
calendar/inc/class.calendar_ui.inc.php
View File

@ -511,7 +511,7 @@ class calendar_ui
function popup($link,$target='_blank',$width=750,$height=410) function popup($link,$target='_blank',$width=750,$height=410)
{ {
return 'egw_openWindowCentered2('.($link == 'this.href' ? $link : "'".$link."'").','. return 'egw_openWindowCentered2('.($link == 'this.href' ? $link : "'".$link."'").','.
($target == 'this.target' ? $target : "'".$target."'").",$width,$height,'yes')"; ($target == 'this.target' ? $target : "'".$target."'").",$width,$height,'yes','calendar')";
} }
/** /**

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

@ -172,7 +172,6 @@ class calendar_uiforms extends calendar_ui
} }
$messages = null; $messages = null;
$msg_permission_denied_added = false; $msg_permission_denied_added = false;
$referer = !empty($content['referer']) ? $content['referer'] : '/index.php?menuaction='.$this->view_menuaction;
list($button) = @each($content['button']); list($button) = @each($content['button']);
if (!$button && $content['action']) $button = $content['action']; // action selectbox if (!$button && $content['action']) $button = $content['action']; // action selectbox
unset($content['button']); unset($content['action']); unset($content['button']); unset($content['action']);
@ -216,9 +215,8 @@ class calendar_uiforms extends calendar_ui
{ {
$msg = lang('Alarm deleted'); $msg = lang('Alarm deleted');
unset($content['alarm'][$id]); unset($content['alarm'][$id]);
$js = 'opener.location.href=\''.addslashes(egw::link($referer,array( $js = "opener.location.search += (opener.location.search?'&msg=':'?msg=')+'".
'msg' => $msg, addslashes($msg)."';";
))).'\';';
} }
else else
{ {
@ -398,9 +396,8 @@ class calendar_uiforms extends calendar_ui
} }
if (!$content['no_popup']) if (!$content['no_popup'])
{ {
$js = 'opener.location.href=\''.addslashes(egw::link($referer,array( $js = "opener.location.search += (opener.location.search?'&msg=':'?msg=')+'".
'msg' => $msg, addslashes($msg)."';";
))).'\';';
} }
} }
} }
@ -421,7 +418,6 @@ class calendar_uiforms extends calendar_ui
'reference' => $content['reference'], 'reference' => $content['reference'],
'recurrence' => $content['recurrence'], 'recurrence' => $content['recurrence'],
'actual_date' => $content['actual_date'], 'actual_date' => $content['actual_date'],
'referer' => $referer,
'no_popup' => $content['no_popup'], 'no_popup' => $content['no_popup'],
$this->tabs => $content[$this->tabs], $this->tabs => $content[$this->tabs],
'template' => $content['template'], 'template' => $content['template'],
@ -615,7 +611,6 @@ class calendar_uiforms extends calendar_ui
htmlspecialchars(egw::link('/index.php',array( htmlspecialchars(egw::link('/index.php',array(
'menuaction' => 'calendar.calendar_uiforms.edit', 'menuaction' => 'calendar.calendar_uiforms.edit',
'cal_id' => $content['id'], 'cal_id' => $content['id'],
'referer' => $referer,
))).'">','</a>'); ))).'">','</a>');
$noerror = false; $noerror = false;
$event = $orig_event; $event = $orig_event;
@ -661,7 +656,6 @@ class calendar_uiforms extends calendar_ui
htmlspecialchars(egw::link('/index.php',array( htmlspecialchars(egw::link('/index.php',array(
'menuaction' => 'calendar.calendar_uiforms.edit', 'menuaction' => 'calendar.calendar_uiforms.edit',
'cal_id' => $content['id'], 'cal_id' => $content['id'],
'referer' => $referer,
))).'">','</a>'); ))).'">','</a>');
$noerror = false; $noerror = false;
} }
@ -718,9 +712,8 @@ class calendar_uiforms extends calendar_ui
{ {
egw_link::link('calendar',$event['id'],$content['link_to']['to_id']); egw_link::link('calendar',$event['id'],$content['link_to']['to_id']);
} }
$js = 'opener.location.href=\''.addslashes(egw::link($referer,array( $js = "opener.location.search += (opener.location.search?'&msg=':'?msg=')+'".
'msg' => $msg, addslashes($msg)."';";
))).'\';';
if ($button == 'print') if ($button == 'print')
{ {
@ -741,9 +734,8 @@ class calendar_uiforms extends calendar_ui
case 'cancel': case 'cancel':
if($content['cancel_needs_refresh']) if($content['cancel_needs_refresh'])
{ {
$js = 'opener.location.href=\''.addslashes(egw::link($referer,array( $js = "opener.location.search += (opener.location.search?'&msg=':'?msg=')+'".
'msg' => $msg, addslashes($msg)."';";
))).'\';';
} }
break; break;
@ -783,9 +775,8 @@ class calendar_uiforms extends calendar_ui
{ {
$msg = lang('Event deleted'); $msg = lang('Event deleted');
} }
$js = 'opener.location.href=\''.addslashes(egw::link($referer,array( $js = "opener.location.search += (opener.location.search?'&msg=':'?msg=')+'".
'msg' => $msg, addslashes($msg)."';";
))).'\';';
} }
break; break;
@ -823,9 +814,8 @@ class calendar_uiforms extends calendar_ui
$event['alarm'][$alarm_id] = $alarm; $event['alarm'][$alarm_id] = $alarm;
$msg = lang('Alarm added'); $msg = lang('Alarm added');
$js = 'opener.location.href=\''.addslashes(egw::link($referer,array( $js = "opener.location.search += (opener.location.search?'&msg=':'?msg=')+'".
'msg' => $msg, addslashes($msg)."';";
))).'\';';
} }
else else
{ {
@ -852,7 +842,8 @@ class calendar_uiforms extends calendar_ui
} }
if ($content['no_popup']) if ($content['no_popup'])
{ {
$GLOBALS['egw']->redirect_link($referer,array( egw::redirect_link('/index.php',array(
'menuaction' => 'calendar.calendar_uiviews.index',
'msg' => $msg, 'msg' => $msg,
)); ));
} }
@ -982,7 +973,6 @@ class calendar_uiforms extends calendar_ui
* @param array $perserv=null following keys: * @param array $perserv=null following keys:
* view boolean view-mode, if no edit-access we automatic fallback to view-mode * view boolean view-mode, if no edit-access we automatic fallback to view-mode
* hide_delete boolean hide delete button * hide_delete boolean hide delete button
* referer string menuaction of the referer
* no_popup boolean use a popup or not * no_popup boolean use a popup or not
* edit_single int timestamp of single event edited, unset/null otherwise * edit_single int timestamp of single event edited, unset/null otherwise
* @param string $msg='' msg to display * @param string $msg='' msg to display
@ -1008,7 +998,6 @@ class calendar_uiforms extends calendar_ui
{ {
$preserv = array( $preserv = array(
'no_popup' => isset($_GET['no_popup']), 'no_popup' => isset($_GET['no_popup']),
'referer' => common::get_referer('/index.php?menuaction='.$this->view_menuaction),
'template' => isset($_GET['template']) ? $_GET['template'] : (isset($_REQUEST['print']) ? 'calendar.print' : 'calendar.edit'), 'template' => isset($_GET['template']) ? $_GET['template'] : (isset($_REQUEST['print']) ? 'calendar.print' : 'calendar.edit'),
); );
$cal_id = (int) $_GET['cal_id']; $cal_id = (int) $_GET['cal_id'];