fixed buttons in list and details view

This commit is contained in:
Cornelius Weiß 2005-10-09 10:13:10 +00:00
parent 09201c7ecb
commit afa3e63895
3 changed files with 46 additions and 26 deletions

View File

@ -1,5 +1,4 @@
TODO: TODO:
- advanced search dialog, accessable via sideboxmenu
- some artwork : general resource pictures like (room, car, beamer ...) (Benkom) - some artwork : general resource pictures like (room, car, beamer ...) (Benkom)
- sitemgr module - sitemgr module
@ -24,5 +23,6 @@ TODO:
Long Term todo's: Long Term todo's:
--------------------------- ---------------------------
advanced search dialog, accessable via sideboxmenu
add prize functionality add prize functionality
add location functionality add location functionality

View File

@ -52,10 +52,11 @@ class ui_resources
*/ */
function index($content='') function index($content='')
{ {
// _debug_array($content);
if (is_array($content)) if (is_array($content))
{ {
$sessiondata = $content['nm']; $sessiondata = $content['nm'];
unset($sessiondata['rows']);
$GLOBALS['egw']->session->appsession('session_data','resources_index_nm',$sessiondata);
if (isset($content['back'])) if (isset($content['back']))
{ {
@ -64,31 +65,29 @@ class ui_resources
return $this->index(); return $this->index();
} }
if (isset($content['btn_delete_selected'])) if (isset($content['btn_delete_selected']))
{ {
foreach($content['nm']['rows']['checkbox'] as $res_id) foreach($content['nm']['rows'] as $row)
{ {
$msg .= '<p>'. $this->bo->delete($res_id). '</p><br>'; if($res_id = $row['checkbox'][0])
{
$msg .= '<p>'. $this->bo->delete($res_id). '</p><br>';
}
} }
return $this->index($msg); return $this->index($msg);
} }
if (isset($content['nm']['rows'])) foreach($content['nm']['rows'] as $row)
{ {
unset($sessiondata['rows']); if(isset($row['delete']))
$GLOBALS['egw']->session->appsession('session_data','resources_index_nm',$sessiondata);
unset($content['nm']['rows']['checkbox']);
switch (key($content['nm']['rows']))
{ {
case 'delete': $res_id = array_search('pressed',$row['delete']);
list($id) = each($content['nm']['rows']['delete']); return $this->index($this->bo->delete($res_id));
return $this->index($this->bo->delete($id)); }
case 'view_acc': if(isset($row['view_acc']))
list($id) = each($content['nm']['rows']['view_acc']); {
$sessiondata['view_accs_of'] = $id; $sessiondata['view_accs_of'] = array_search('pressed',$row['view_acc']);
$GLOBALS['egw']->session->appsession('session_data','resources_index_nm',$sessiondata); $GLOBALS['egw']->session->appsession('session_data','resources_index_nm',$sessiondata);
return $this->index(); return $this->index();
case 'buyable':
} }
} }
} }
@ -175,7 +174,7 @@ class ui_resources
* @param $content Content from the eTemplate Exec call or id on inital call * @param $content Content from the eTemplate Exec call or id on inital call
*/ */
function edit($content=0,$accessory_of = -1) function edit($content=0,$accessory_of = -1)
{ {
if (is_array($content)) if (is_array($content))
{ {
if(isset($content['save']) || isset($content['delete'])) if(isset($content['save']) || isset($content['delete']))
@ -243,7 +242,7 @@ class ui_resources
$sel_options['cat_id'] = array($catofmaster => $sel_options['cat_id'][$catofmaster]); $sel_options['cat_id'] = array($catofmaster => $sel_options['cat_id'][$catofmaster]);
} }
$content['general|page|pictures|links'] = 'resources.edit_tabs.page'; //debug // $content['general|page|pictures|links'] = 'resources.edit_tabs.page'; //debug
$no_button = array(); // TODO: show delete button only if allowed to delete resource $no_button = array(); // TODO: show delete button only if allowed to delete resource
$preserv = $content; $preserv = $content;
$this->tmpl->read('resources.edit'); $this->tmpl->read('resources.edit');
@ -283,6 +282,27 @@ class ui_resources
*/ */
function show($res_id=0) function show($res_id=0)
{ {
if (is_array($content = $res_id))
{
if(isset($content['btn_delete']))
{
$content['msg'] = $this->bo->delete($content['res_id']);
if($content['msg'])
{
return $this->show($content);
}
$js = "opener.location.href='".$GLOBALS['egw']->link('/index.php',
array('menuaction' => 'resources.ui_resources.index'))."';";
$js .= 'window.close();';
echo "<html><body><script>$js</script></body></html>\n";
$GLOBALS['egw']->common->egw_exit();
}
if(isset($content['btn_edit']))
{
return $this->edit($content['res_id']);
}
}
if (isset($_GET['res_id'])) $res_id = $_GET['res_id']; if (isset($_GET['res_id'])) $res_id = $_GET['res_id'];
$content = array('res_id' => $res_id); $content = array('res_id' => $res_id);
@ -329,7 +349,7 @@ class ui_resources
$this->tmpl->exec('resources.ui_resources.show',$content,$sel_options,$no_button,$preserv,2); $this->tmpl->exec('resources.ui_resources.show',$content,$sel_options,$no_button,$preserv,2);
} }
/** /**
* select resources * select resources
* *

File diff suppressed because one or more lines are too long