mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-11-22 07:53:39 +01:00
- Fix reservation not finding any resources
- Hide planner close button when reserving
This commit is contained in:
parent
fc5e83bb37
commit
89f045a5c1
@ -80,7 +80,9 @@ class module_resources_reservation extends sitemgr_module
|
|||||||
$query = array(
|
$query = array(
|
||||||
// Resources uses filter, not cat_id
|
// Resources uses filter, not cat_id
|
||||||
'filter' => $this->block->arguments['category'],
|
'filter' => $this->block->arguments['category'],
|
||||||
'bookable' => true
|
'filter2' => -1,
|
||||||
|
'show_bookable' => true,
|
||||||
|
'csv_export' => true
|
||||||
);
|
);
|
||||||
|
|
||||||
// Add resources from selected category
|
// Add resources from selected category
|
||||||
@ -114,6 +116,7 @@ class module_resources_reservation extends sitemgr_module
|
|||||||
$extra .= "@import url(".$GLOBALS['egw_info']['server']['webserver_url'].
|
$extra .= "@import url(".$GLOBALS['egw_info']['server']['webserver_url'].
|
||||||
'/'.$app."/templates/default/app.css);\n";
|
'/'.$app."/templates/default/app.css);\n";
|
||||||
}
|
}
|
||||||
|
$extra .= '.calendar_plannerRowHeader > a { display: none; }';
|
||||||
$extra .= "-->\n</style>\n";
|
$extra .= "-->\n</style>\n";
|
||||||
$extra .= '<script src="'.$GLOBALS['egw_info']['server']['webserver_url'].'/etemplate/js/etemplate.js" type="text/javascript"></script>'."\n";
|
$extra .= '<script src="'.$GLOBALS['egw_info']['server']['webserver_url'].'/etemplate/js/etemplate.js" type="text/javascript"></script>'."\n";
|
||||||
$ret = false;
|
$ret = false;
|
||||||
|
Loading…
Reference in New Issue
Block a user