merge from 1.2

This commit is contained in:
Cornelius Weiß 2006-05-18 16:14:35 +00:00
parent 87dcfb1c10
commit 0decebd55b

View File

@ -361,6 +361,12 @@ class ui_resources
*/ */
function select($content='') function select($content='')
{ {
if (!is_object($GLOBALS['phpgw']->js))
{
$GLOBALS['phpgw']->js = CreateObject('phpgwapi.javascript');
}
$GLOBALS['phpgw']->js->set_onload("copyOptions('exec[resources][selectbox]');");
$GLOBALS['egw_info']['flags']['java_script'] .= "<script LANGUAGE=\"JavaScript\"> $GLOBALS['egw_info']['flags']['java_script'] .= "<script LANGUAGE=\"JavaScript\">
window.focus(); window.focus();
@ -462,12 +468,6 @@ class ui_resources
window.close(); window.close();
}</script>"; }</script>";
if (!is_object($GLOBALS['phpgw']->js))
{
$GLOBALS['phpgw']->js = CreateObject('phpgwapi.javascript');
}
$GLOBALS['phpgw']->js->set_onload("copyOptions('exec[resources][selectbox]');");
$content['nm']['header_left'] = 'resources.resource_select.header'; $content['nm']['header_left'] = 'resources.resource_select.header';
$content['nm']['show_bookable'] = true; $content['nm']['show_bookable'] = true;
$content['nm']['get_rows'] = 'resources.bo_resources.get_rows'; $content['nm']['get_rows'] = 'resources.bo_resources.get_rows';