holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

infolog view uses now the edit popup in a readonly mode, reverting r34950, as it does not solve the problem for entries without edit rights

Browse Source
This commit is contained in:
Ralf Becker 2011-05-18 14:18:37 +00:00
parent fe62956a96
commit 7de4e0108d
2 changed files with 17 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
infolog/inc/class.infolog_hooks.inc.php
View File

@ -50,10 +50,10 @@ class infolog_hooks
'title' => 'infolog.infolog_bo.link_title',
'titles' => 'infolog.infolog_bo.link_titles',
'view' => array(
'menuaction' => 'infolog.infolog_ui.index',
'action' => 'sp'
'menuaction' => 'infolog.infolog_ui.edit',
),
'view_id' => 'action_id',
'view_id' => 'info_id',
'view_popup' => '750x580',
'view_list' => 'infolog.infolog_ui.index',
'add' => array(
'menuaction' => 'infolog.infolog_ui.edit',
@ -435,7 +435,7 @@ class infolog_hooks
'help' => lang('If you specify an export definition, it will be used when you export'),
'run_lang' => false,
'xmlrpc' => True,
'admin' => False,
'admin' => False,
'default'=> isset($options[$default_def]) ? $default_def : false,
);
}

50
infolog/inc/class.infolog_ui.inc.php
View File

@ -375,16 +375,6 @@ class infolog_ui
{
$query['action_id'] = array_shift($query['action_id']); // display single parent as app_header
}
// Supposed to view parents + children, but there are no children
if(count($parents) == 1 && count($infos) == 0 && $main = $this->bo->read($parents[0]))
{
$main = $this->get_info($main, $readonlys);
$main['class'] .= 'th ';
array_splice($rows, $id, 0, array($main));
$query['total'] += count($parents);
unset($parents[0]);
}
foreach($infos as $id => $info)
{
if (!(strpos($info['info_addr'],',')===false) && strpos($info['info_addr'],', ')===false) $info['info_addr'] = str_replace(',',', ',$info['info_addr']);
@ -1572,21 +1562,7 @@ class infolog_ui
}
else
{
if ($info_id && !$this->bo->check_access($info_id,EGW_ACL_EDIT) &&
!($undelete = $this->bo->check_access($info_id,EGW_ACL_UNDELETE)) &&
!$this->bo->is_responsible($content))
{
if ($no_popup)
{
common::egw_header();
parse_navbar();
echo '<p class="redItalic" align="center">'.lang('Permission denied')."</p>\n";
common::egw_exit();
}
$js = "alert('".lang('Permission denied')."'); window.close();";
echo '<html><body onload="'.$js.'"></body></html>';
common::egw_exit();
}
$undelete = $this->bo->check_access($info_id,EGW_ACL_UNDELETE);
}
$content['links'] = $content['link_to'] = array(
'to_id' => $info_id,
@ -1608,7 +1584,8 @@ class infolog_ui
break;
case 'tracker':
if ($action_id) {
if ($action_id)
{
egw_link::link('infolog',$content['link_to']['to_id'],$action,$action_id);
$content['blur_title'] = egw_link::title($action,$action_id);
}
@ -1739,20 +1716,19 @@ class infolog_ui
}
}
$preserv = $content;
// for implizit edit of responsible user make all fields readonly, but status and percent
if ($info_id && !$this->bo->check_access($info_id,EGW_ACL_EDIT) && $this->bo->is_responsible($content) && !$undelete)
// for no edit rights or implizit edit of responsible user make all fields readonly, but status and percent
if ($info_id && !$this->bo->check_access($info_id,EGW_ACL_EDIT)/* && $this->bo->is_responsible($content)*/ && !$undelete)
{
$content['status_only'] = !in_array('link_to',$this->bo->responsible_edit);
foreach(array_diff(array_merge(array_keys($content),array('pm_id')),$this->bo->responsible_edit) as $name)
$readonlys['__ALL__'] = true; // make all fields not explicitly set readonly
if ($this->bo->is_responsible($content))
{
$readonlys[$name] = true;
}
unset($readonlys[$tabs]);
// need to set all customfields extra, as they are not set if empty
foreach($this->bo->customfields as $name => $value)
{
$readonlys['#'.$name] = true;
foreach($this->bo->responsible_edit as $name)
{
$readonlys[$name] = false;
}
$readonlys['button[edit]'] = $readonlys['button[apply]'] = $readonlys['no_notifications'] = false;
}
$readonlys['action'] = $readonlys['button[cancel]'] = false; // always allowed
}
// ToDo: use the old status before the delete
if ($undelete) $content['info_status'] = $this->bo->status['defaults'][$content['info_type']];