extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-21 23:43:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

new InfoLog status filter "Archived too"

Browse Source
This commit is contained in:
ralf 2024-04-03 07:58:33 +02:00
parent 9fd3443c60
commit 4ec14508ad
5 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
infolog/inc/class.infolog_bo.inc.php
View File

@ -298,6 +298,7 @@ class infolog_bo
if ($type !== 'defaults' && !isset($statis['archive'])) if ($type !== 'defaults' && !isset($statis['archive']))
{ {
$statis['archive'] = 'archive'; $statis['archive'] = 'archive';
$statis['archive_too'] = lang('Archived too');
} }
} }
} }

11
infolog/inc/class.infolog_so.inc.php
View File

@ -299,8 +299,8 @@ class infolog_so
* generate sql to filter based on the status of the log-entry * generate sql to filter based on the status of the log-entry
* *
* @param string $_filter done = done or billed, open = not (done, billed, cancelled or deleted), offer = offer * @param string $_filter done = done or billed, open = not (done, billed, cancelled or deleted), offer = offer
* @param boolean $prefix_and =true if true prefix the fileter with ' AND ' * @param boolean $prefix_and =true if true prefix the filter with ' AND '
* @return string the necesary sql * @return string the necessary sql
*/ */
function statusFilter($_filter = '',$prefix_and=true) function statusFilter($_filter = '',$prefix_and=true)
{ {
@ -883,6 +883,13 @@ class infolog_so
$filtermethod .= ' AND '.$this->db->expression($this->info_table,'main.',array('info_id' => $data)); $filtermethod .= ' AND '.$this->db->expression($this->info_table,'main.',array('info_id' => $data));
break; break;
case 'info_status':
if ($data === 'archive_too')
{
$filtermethod .= "AND info_status NOT IN ('deleted','template','nonactive')";
break;
}
// fall through
default: default:
$filtermethod .= ' AND '.$this->db->expression($this->info_table,array($col => $data)); $filtermethod .= ' AND '.$this->db->expression($this->info_table,array($col => $data));
break; break;

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

@ -821,11 +821,11 @@ class infolog_ui
/** /**
* Shows the infolog list * Shows the infolog list
* *
* @param array/string $values etemplate content or 'reset_action_view' if called by index.php to reset an action-view * @param array|string $values etemplate content or 'reset_action_view' if called by index.php to reset an action-view
* @param string $action if set only entries liked to that $action:$action_id are shown * @param string $action if set only entries liked to that $action:$action_id are shown
* @param string $action_id if set only entries liked to that $action:$action_id are shown * @param string $action_id if set only entries liked to that $action:$action_id are shown
* @param mixed $called_as is how we got called, for a hook eg. the call-params of that page containing the hook * @param mixed $called_as is how we got called, for a hook eg. the call-params of that page containing the hook
* @param boolean $e$extra_app_header * @param boolean $return_html=false * @param boolean $extra_app_header * @param boolean $return_html=false
* @param string $own_referer='' this is our own referer * @param string $own_referer='' this is our own referer
* @param string $action_title='' app_header for the action, if '' we try the link-title * @param string $action_title='' app_header for the action, if '' we try the link-title
*/ */

1
infolog/lang/egw_de.lang
View File

@ -60,6 +60,7 @@ application mail expected but got: %1 infolog de Mail-Applikation erwartet aber
apply the action on the whole query, not only the shown entries!!! infolog de Wendet den Befehl auf die gesamte Abfrage an, NICHT nur auf die angezeigten Datensätze! apply the action on the whole query, not only the shown entries!!! infolog de Wendet den Befehl auf die gesamte Abfrage an, NICHT nur auf die angezeigten Datensätze!
apply the changes infolog de Übernimmt die Änderungen apply the changes infolog de Übernimmt die Änderungen
archive infolog de Archiviert archive infolog de Archiviert
archived too infolog de Auch archiviert
are you shure you want to close this entry ? infolog de Wollen Sie wirklich den InfoLog schliessen? are you shure you want to close this entry ? infolog de Wollen Sie wirklich den InfoLog schliessen?
are you shure you want to delete this entry ? infolog de Wollen Sie diesen InfoLog wirklich löschen? are you shure you want to delete this entry ? infolog de Wollen Sie diesen InfoLog wirklich löschen?
attach a file infolog de Datei anhängen attach a file infolog de Datei anhängen

1
infolog/lang/egw_en.lang
View File

@ -60,6 +60,7 @@ application mail expected but got: %1 infolog en Application email expected but
apply the action on the whole query, not only the shown entries!!! infolog en Apply the action on the whole query, NOT only the shown entries! apply the action on the whole query, not only the shown entries!!! infolog en Apply the action on the whole query, NOT only the shown entries!
apply the changes infolog en Apply the changes apply the changes infolog en Apply the changes
archive infolog en Archive archive infolog en Archive
archived too infolog en Archived too
are you shure you want to close this entry ? infolog en Are you sure you want to close this entry? are you shure you want to close this entry ? infolog en Are you sure you want to close this entry?
are you shure you want to delete this entry ? infolog en Are you sure you want to delete this entry? are you shure you want to delete this entry ? infolog en Are you sure you want to delete this entry?
attach a file infolog en Attach a file attach a file infolog en Attach a file