extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-27 02:14:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

* Infolog / Tracker: Change timesheet total columns to ignore timesheet ACL

Browse Source 
Use "Respect timesheet run and read permissions for time totals" configuration setting for previous behaviour, which may exclude some timesheet entries
This commit is contained in:
nathan 2023-06-09 13:18:32 -06:00
parent 0e82fd3a15
commit 55a05c0e62
5 changed files with 110 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -200,36 +200,53 @@ class infolog_ui
{
$info['class'] .= 'rowNoCloseAll ';
}
if (!$this->bo->check_access($info,Acl::DELETE))
if(!$this->bo->check_access($info, Acl::DELETE))
{
$info['class'] .= 'rowNoDelete ';
}
if (!$this->bo->check_access($info,Acl::ADD))
if(!$this->bo->check_access($info, Acl::ADD))
{
$info['class'] .= 'rowNoSubs ';
}
if ($info['info_id_parent']) $info['class'] .= 'infolog_rowHasParent ';
if ($info['info_anz_subs'] > 0) $info['class'] .= 'infolog_rowHasSubs ';
if($info['info_id_parent'])
{
$info['class'] .= 'infolog_rowHasParent ';
}
if($info['info_anz_subs'] > 0)
{
$info['class'] .= 'infolog_rowHasSubs ';
}
$info['row_mod'] = $info['info_datemodified'];
$timesheet_bo = new timesheet_bo();
$config = Api\Config::read('infolog');
if (!$show_links) $show_links = $this->prefs['show_links'];
if (($show_links != 'none' && $show_links != 'no_describtion' ||
$this->prefs['show_times'] || isset($GLOBALS['egw_info']['user']['apps']['timesheet'])) &&
(isset($info['links']) || ($info['links'] = Link::get_links('infolog',$info['info_id'],'','link_lastmod DESC',true,true))))
if(!$show_links)
{
$show_links = $this->prefs['show_links'];
}
if(($show_links != 'none' && $show_links != 'no_describtion' ||
$this->prefs['show_times'] || isset($GLOBALS['egw_info']['user']['apps']['timesheet'])) &&
(isset($info['links']) || ($info['links'] = Link::get_links('infolog', $info['info_id'], '', 'link_lastmod DESC', true, true))))
{
$timesheets = array();
foreach ($info['links'] as $link)
foreach($info['links'] as $link)
{
// incl. link modification time into row_mod (link's lastmod is always in server-time!)
$link_mod = Api\DateTime::server2user($link['lastmod']);
if ($info['row_mod'] < $link_mod) $info['row_mod'] = $link_mod;
if($info['row_mod'] < $link_mod)
{
$info['row_mod'] = $link_mod;
}
if ($link['deleted']) continue; // skip deleted links, but incl. them in row_mod!
if($link['deleted'])
{
continue;
} // skip deleted links, but incl. them in row_mod!
if ($show_links != 'none' && $show_links != 'no_describtion' &&
if($show_links != 'none' && $show_links != 'no_describtion' &&
$link['link_id'] != $info['info_link_id'] &&
($link['app'] != $action || $link['id'] != $action_id) &&
($link['app'] != $action || $link['id'] != $action_id) &&
($show_links == 'all' || ($show_links == 'links') === ($link['app'] != Link::VFS_APPNAME)))
{
$info['filelinks'][] = $link;
@ -242,7 +259,7 @@ class infolog_ui
}
if ($this->prefs['show_times'] && isset($GLOBALS['egw_info']['user']['apps']['timesheet']) && $timesheets)
{
$sum = ExecMethod('timesheet.timesheet_bo.sum',$timesheets);
$sum = $timesheet_bo->sum($timesheets, !$config['respect_timesheet_rights']);
$info['info_sum_timesheets'] = $sum['duration'];
// incl. max timesheet modification in row_mod
if ($info['row_mod'] < $sum['max_modified']) $info['row_mod'] = $sum['max_modified'];
@ -446,12 +463,20 @@ class infolog_ui
$query['default_cols'] = '!cat_id,info_datemodified,info_used_time_info_planned_time,info_used_time_info_planned_time_info_replanned_time,info_id';
}
// set old show_times pref, that get_info calculates the cumulated time of the timesheets (we only check used&planned to work for both time cols)
$this->prefs['show_times'] = strpos($this->prefs[$query['columnselection_pref']],'info_used_time_info_planned_time') !== false;
$this->prefs['show_times'] = strpos($this->prefs[$query['columnselection_pref']], 'info_used_time_info_planned_time') !== false;
$reset_timesheet = false;
$config = Api\Config::read('infolog');
if(!$config['respect_timesheet_rights'] && !isset($GLOBALS['egw_info']['user']['apps']['timesheet']))
{
$reset_timesheet = true;
$GLOBALS['egw_info']['user']['apps']['timesheet'] = true;
}
// query all links and sub counts in one go
if ($infos && (!$query['csv_export'] || !is_array($query['csv_export'])))
if($infos && (!$query['csv_export'] || !is_array($query['csv_export'])))
{
$links = Link::get_links_multiple('infolog',array_keys($infos),true,'','link_lastmod DESC',true); // true=incl. deleted
$links = Link::get_links_multiple('infolog', array_keys($infos), true, '', 'link_lastmod DESC', true); // true=incl. deleted
$anzSubs = $this->bo->anzSubs(array_keys($infos));
}
$rows = array();
@ -460,25 +485,29 @@ class infolog_ui
if ($query['action_id'] && $query['csv_export'] !== 'children')
{
$parents = $query['action'] == 'sp' && $query['action_id'] ? (array)$query['action_id'] : array();
if (!empty($parents) && count($parents) == 1 && is_array($query['action_id']))
if(!empty($parents) && count($parents) == 1 && is_array($query['action_id']))
{
$query['action_id'] = array_shift($query['action_id']); // display single parent as app_header
$query['action_id'] = array_shift($query['action_id']); // display single parent as app_header
}
}
$parent_first = !empty($parents) && count($parents) == 1;
$parent_index = 0;
// et2 nextmatch listens to total, and only displays that many rows, so add parent in or we'll lose the last row
if($parent_first || $query['action'] == 'sp' && is_array($query['action_id'])) $query['total']++;
if($parent_first || $query['action'] == 'sp' && is_array($query['action_id']))
{
$query['total']++;
}
// Check to see if we need to remove description
foreach($infos as $id => $info)
{
if (!$query['csv_export'] || !is_array($query['csv_export']))
if(!$query['csv_export'] || !is_array($query['csv_export']))
{
$info['links'] =& $links[$id];
$info['info_anz_subs'] = (int)$anzSubs[$id];
$info = $this->get_info($info,$readonlys,null,null,false,$details);
$info = $this->get_info($info, $readonlys, null, null, false, $details);
}
// for subs view ('sp') add parent(s) in front of subs once(!)
if ( $parent_first && ($main = $this->bo->read($query['action_id'])) ||
@ -514,9 +543,19 @@ class infolog_ui
}
unset($links);
if ($query['cat_id']) $rows['no_cat_id'] = true;
if ($query['no_actions']) $rows['no_actions'] = true;
if($query['cat_id'])
{
$rows['no_cat_id'] = true;
}
if($query['no_actions'])
{
$rows['no_actions'] = true;
}
$rows['no_timesheet'] = !isset($GLOBALS['egw_info']['user']['apps']['timesheet']);
if($reset_timesheet)
{
unset($GLOBALS['egw_info']['user']['apps']['timesheet']);
}
if($clear_status_filter)
{
$rows['info_status'] = '';

1
infolog/lang/egw_de.lang
View File

@ -397,6 +397,7 @@ removed infolog de Entfernt
removed category infolog de Kategorie erfolgreich entfernt
replacement infolog de Platzhalter
replacements for inserting entries into documents infolog de Platzhalter für das Einfügen in Dokumente
respect timesheet run and read permissions for time totals infolog de Respektieren Sie die Ausführungs- und Leseberechtigungen für Zeittabellen
responsible infolog de verantwortlich
responsible open infolog de verantwortlich offen
responsible open and upcoming infolog de verantwortlich offene und zukünftige

1
infolog/lang/egw_en.lang
View File

@ -397,6 +397,7 @@ removed infolog en Removed.
removed category infolog en removed category
replacement infolog en Replacement
replacements for inserting entries into documents infolog en Replacements for inserting entries into documents
respect timesheet run and read permissions for time totals infolog en Respect timesheet run and read permissions for time totals
responsible infolog en Responsible
responsible open infolog en Responsible open
responsible open and upcoming infolog en Responsible open and upcoming

44
infolog/templates/default/config.xet
View File

@ -22,26 +22,30 @@
</et2-vbox>
<et2-select id="responsible_edit" rows="6" options=",,,,,,0" multiple="1"></et2-select>
</row>
<row class="th">
<et2-description value="History logging" span="all"></et2-description>
</row>
<row>
<et2-description value="History logging and deleting of items"></et2-description>
<et2-select id="history"></et2-select>
</row>
<row class="th">
<et2-description value="Other configurations" span="all"></et2-description>
</row>
<row>
<et2-description value="Fields to exclude when copying an infolog:"></et2-description>
<et2-select id="copy_excludefields" rows="6" multiple="1"></et2-select>
</row>
<row>
<et2-description value="Load custom fields in index, if filtered by selected types (eg. to display them in a type-specific index template)"></et2-description>
<et2-select id="index_load_cfs" rows="6" options=",,,,,,1" multiple="1"></et2-select>
</row>
<row>
<et2-description value="Prefix for sub-entries (default: Re:)"></et2-description>
<row class="th">
<et2-description value="History logging" span="all"></et2-description>
</row>
<row>
<et2-description value="History logging and deleting of items"></et2-description>
<et2-select id="history"></et2-select>
</row>
<row class="th">
<et2-description value="Other configurations" span="all"></et2-description>
</row>
<row>
<et2-description value="Respect timesheet run and read permissions for time totals" labelFor="respect_timesheet_rights"></et2-description>
<et2-checkbox id="respect_timesheet_rights"></et2-checkbox>
</row>
<row>
<et2-description value="Fields to exclude when copying an infolog:"></et2-description>
<et2-select id="copy_excludefields" rows="6" multiple="1"></et2-select>
</row>
<row>
<et2-description value="Load custom fields in index, if filtered by selected types (eg. to display them in a type-specific index template)"></et2-description>
<et2-select id="index_load_cfs" rows="6" options=",,,,,,1" multiple="1"></et2-select>
</row>
<row>
<et2-description value="Prefix for sub-entries (default: Re:)"></et2-description>
<et2-textbox id="sub_prefix" noLang="1"></et2-textbox>
</row>
<row>

34
timesheet/inc/class.timesheet_bo.inc.php
View File

@ -464,40 +464,43 @@ class timesheet_bo extends Api\Storage
}
else
{
if (!is_array($filter['ts_owner'])) $filter['ts_owner'] = array($filter['ts_owner']);
if(!is_array($filter['ts_owner']))
{
$filter['ts_owner'] = array($filter['ts_owner']);
}
foreach($filter['ts_owner'] as $key => $owner)
{
if (!isset($this->grants[$owner]))
if(!isset($this->grants[$owner]))
{
unset($filter['ts_owner'][$key]);
}
}
}
if (isset($filter['ts_status']) && $filter['ts_status'] && $filter['ts_status'] != self::DELETED_STATUS)
if(isset($filter['ts_status']) && $filter['ts_status'] && $filter['ts_status'] != self::DELETED_STATUS)
{
$filter['ts_status'] = $this->get_sub_status($filter['ts_status']);
}
else
{
$filter[] = '(ts_status ' . ($filter['ts_status'] == self::DELETED_STATUS ? '=':'!= ') . self::DELETED_STATUS .
($filter['ts_status'] == self::DELETED_STATUS ? '':' OR ts_status IS NULL') . ')';
$filter[] = '(ts_status ' . ($filter['ts_status'] == self::DELETED_STATUS ? '=' : '!= ') . self::DELETED_STATUS .
($filter['ts_status'] == self::DELETED_STATUS ? '' : ' OR ts_status IS NULL') . ')';
}
if (!count($filter['ts_owner']))
if(is_array($filter['ts_owner']) && !count($filter['ts_owner']))
{
$this->total = 0;
$this->summary = array();
return array();
}
if ($only_summary==false && $criteria && $this->show_sums)
if($only_summary == false && $criteria && $this->show_sums)
{
// if we have a criteria AND intend to show the sums we first query the affected ids,
// then we throw away criteria and filter, and replace the filter with the list of ids
$ids = parent::search($criteria,'egw_timesheet.ts_id as id','','',$wildcard,$empty,$op,false,$filter,$join);
$ids = parent::search($criteria, 'egw_timesheet.ts_id as id', '', '', $wildcard, $empty, $op, false, $filter, $join);
//_debug_array($ids);
if (empty($ids))
if(empty($ids))
{
$this->summary = array('duration'=>0,'price'=>null,'quantity'=>0);
$this->summary = array('duration' => 0, 'price' => null, 'quantity' => 0);
return array();
}
unset($criteria);
@ -779,13 +782,18 @@ class timesheet_bo extends Api\Storage
* @param array $ids array of timesheet id's
* @return array with values for keys "duration", "price", "max_modified" and "quantity"
*/
function sum($ids)
function sum($ids, $ignore_acl = false)
{
if (!$ids)
if(!$ids)
{
return array('duration' => 0, 'quantity' => 0, 'price' => 0, 'max_modified' => null);
}
return $this->search(array('ts_id'=>$ids),true,'','','',false,'AND',false,null,'',false,true);
$filter = [];
if($ignore_acl)
{
$filter['ts_owner'] = false;
}
return $this->search(array('ts_id' => $ids), true, '', '', '', false, 'AND', false, $filter, '', false, true);
}
/**