extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-03 04:29:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Change history accessory_of widget to match current template

Browse Source
This commit is contained in:
Nathan Gray 2013-07-08 21:34:02 +00:00
parent 13e593a7f1
commit 5a6ed7c407
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
resources/inc/class.resources_ui.inc.php
View File

@ -510,7 +510,8 @@ class resources_ui
$msg = $this->bo->delete($content['res_id']); $msg = $this->bo->delete($content['res_id']);
break; break;
} }
$js = "opener.egw_refresh('".str_replace("'","\\'",$msg)."','resources',{$content['res_id']});"; $js = "var win = opener || egw.window; win.egw_refresh('".str_replace("'","\\'",$msg)."','resources',{$content['res_id']}, '" .
($button == 'delete' ? 'delete' : 'edit') . "');";
if($button != 'apply' && !$msg) if($button != 'apply' && !$msg)
{ {
$js .= 'window.close();'; $js .= 'window.close();';
@ -570,14 +571,6 @@ class resources_ui
{ {
$content['acc_count'] = count($this->bo->get_acc_list($content['res_id'])); $content['acc_count'] = count($this->bo->get_acc_list($content['res_id']));
} }
$content['history'] = array(
'id' => $res_id,
'app' => 'resources',
'status-widgets' => array(
'accessory_of' => 'link-entry:resources',
'long_description' => 'html'
)
);
$sel_options['status'] = resources_bo::$field2label; $sel_options['status'] = resources_bo::$field2label;
$sel_options['gen_src_list'] = $this->bo->get_genpicturelist(); $sel_options['gen_src_list'] = $this->bo->get_genpicturelist();
@ -590,6 +583,15 @@ class resources_ui
} }
$search_options = array('accessory_of' => -1); $search_options = array('accessory_of' => -1);
$sel_options['accessory_of'] = array(-1 => lang('none')) + (array)$this->bo->link_query('',$search_options); $sel_options['accessory_of'] = array(-1 => lang('none')) + (array)$this->bo->link_query('',$search_options);
$content['history'] = array(
'id' => $res_id,
'app' => 'resources',
'status-widgets' => array(
'accessory_of' => $sel_options['accessory_of'],
'long_description' => 'html'
)
);
if($res_id) unset($sel_options['accessory_of'][$res_id]); if($res_id) unset($sel_options['accessory_of'][$res_id]);
// $content['general|page|pictures|links'] = 'resources.edit_tabs.page'; //debug // $content['general|page|pictures|links'] = 'resources.edit_tabs.page'; //debug