From 9fa24c53fc97c5144550905dfdbe78ad83b07518 Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Tue, 9 Oct 2007 09:39:40 +0000 Subject: [PATCH] New pref to select which type(s) to show in the calendar --- infolog/inc/class.boinfolog.inc.php | 6 +++++- infolog/inc/hook_settings.inc.php | 21 +++++++++------------ infolog/setup/phpgw_de.lang | 5 ++--- infolog/setup/phpgw_en.lang | 4 ++-- 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/infolog/inc/class.boinfolog.inc.php b/infolog/inc/class.boinfolog.inc.php index 154720aba1..06680ad619 100644 --- a/infolog/inc/class.boinfolog.inc.php +++ b/infolog/inc/class.boinfolog.inc.php @@ -1054,7 +1054,11 @@ class boinfolog 'filter'=> "user$user".($do_events ? 'date' : 'opentoday').$date_wanted, 'start' => 0, ); - if ($this->customfields && !$GLOBALS['egw_info']['user']['preferences']['infolog']['cal_show_custom']) + if ($GLOBALS['egw_info']['user']['preferences']['infolog']['cal_show']) + { + $query['col_filter']['info_type'] = explode(',',$GLOBALS['egw_info']['user']['preferences']['infolog']['cal_show']); + } + elseif ($this->customfields && !$GLOBALS['egw_info']['user']['preferences']['infolog']['cal_show_custom']) { $query['col_filter']['info_type'] = array('task','phone','note','email'); } diff --git a/infolog/inc/hook_settings.inc.php b/infolog/inc/hook_settings.inc.php index d96196cc82..33ac77b88d 100644 --- a/infolog/inc/hook_settings.inc.php +++ b/infolog/inc/hook_settings.inc.php @@ -17,8 +17,6 @@ foreach($ui->filters as $key => $label) { $show_home[$key] = $filters[$key] = lang($label); } -$have_custom_fields = count($ui->bo->customfields) > 0; -unset($ui); // migrage old filter-pref 1,2 to the filter one 'own-open-today' if (isset($GLOBALS['type']) && in_array($GLOBALS['egw']->preferences->{$GLOBALS['type']}['homeShowEvents'],array('1','2'))) @@ -114,18 +112,17 @@ $GLOBALS['settings'] = array( 'xmlrpc' => True, 'admin' => False ), -); -if ($have_custom_fields) -{ - $GLOBALS['settings']['cal_show_custom'] = array( - 'type' => 'check', - 'label' => 'Should the calendar show custom types too', - 'name' => 'cal_show_custom', - 'help' => 'Do you want to see custom InfoLog types in the calendar?', + 'cal_show' => array( + 'type' => 'multiselect', + 'label' => 'Which types should the calendar show', + 'name' => 'cal_show', + 'values' => $ui->bo->enums['type'], + 'help' => 'Can be used to show further InfoLog types in the calendar or limit it to show eg. only tasks.', 'xmlrpc' => True, 'admin' => False - ); -} + ), +); +unset($ui); unset($show_home); unset($show_details); unset($filters); diff --git a/infolog/setup/phpgw_de.lang b/infolog/setup/phpgw_de.lang index 5197684edf..700457ef4a 100644 --- a/infolog/setup/phpgw_de.lang +++ b/infolog/setup/phpgw_de.lang @@ -51,6 +51,7 @@ back to main list infolog de Zur billed infolog de abgerechnet both infolog de Annahme+erledigt call infolog de anrufen +can be used to show further infolog types in the calendar or limit it to show eg. only tasks. infolog de Kann dazu benutzt werden um weitere InfoLog Typen im Kalender anzuzeigen oder zu begrenzen dass z.B. nur noch Aufgaben angezeigt werden. cancel infolog de Abbruch cancelled infolog de abgesagt categories infolog de Kategorien @@ -116,7 +117,6 @@ do you want a notification, if items you created get updated? infolog de Wollen do you want a notification, if items you delegated are about to start? infolog de Wollen Sie eine Benachrichtigung, wenn Einträge die Sie delegiert haben beginnen sollen? do you want a notification, if items you delegated are due? infolog de Wollen Sie eine Benachrichtigung, wenn Einträge die Sie delegiert haben fällig werden? do you want to receive notifications as html-mails or plain text? infolog de Wollen Sie die Benachrichtigungen als HTML Mail oder reinen Text empfangen? -do you want to see custom infolog types in the calendar? infolog de Wollen Sie benutzerdefinierte Typen auch im Kalender sehen? don't show infolog infolog de InfoLog NICHT anzeigen done infolog de erledigt download infolog de Datei laden @@ -282,7 +282,6 @@ should infolog show subtasks, -calls or -notes in the normal view or not. you ca should infolog show the links to other applications and/or the file-attachments in the infolog list (normal view when you enter infolog). infolog de Soll InfoLog die Verknüpfungen zu anderen Anwendungen und/oder die Datei-Anhänge in der InfoLog Liste (normale Ansicht wenn InfoLog aufgerufen wird) anzeigen. should infolog show up on the main screen and with which filter. works only if you dont selected an application for the main screen (in your preferences). infolog de Soll InfoLog auf der Startseite angezeigt werden und mit welchem Filter. Funktioniert nur, wenn Sie keine (einzelne) Anwendung für die Startseite ausgewählt haben (in Ihren Einstellungen). should infolog use full names (surname and familyname) or just the loginnames. infolog de Soll InfoLog den vollen Namen (Vor- und Familienname) oder nur die Benutzerkennung verwenden. -should the calendar show custom types too infolog de Soll der Kalender auch benutzerdefinierte Typen anzeigen should the infolog list show a unique numerical id, which can be used eg. as ticket id. infolog de Soll die InfoLog Liste eine eindeutige Nummer anzeigen, die zB. als Ticketnummer verwendet werden kann. should the infolog list show the column "last modified". infolog de Soll die InfoLog Liste die Spalte "Zuletzt geändert" anzeigen. should the infolog list show the percent done only for status ongoing or two separate icons. infolog de Soll die InfoLog Liste Prozent erledigt nur für den Status "in Arbeit" anzeigen oder zwei separate Icons. @@ -333,7 +332,6 @@ urgent infolog de Dringend used time infolog de benötigte Zeit valid path on clientside
eg. \\server\share or e:\ infolog de gültiger Pfad clientseitig
zB. \\Server\Share oder e:\ valid path on clientside
eg. \servershare or e: infolog de gültiger Pfad clientseitig
zB. \\Server\Share oder e:\ -valid path on clientside
eg. servershare or e: infolog de gültiger Pfad clientseitig
zB. \\Server\Share oder e:\ values for selectbox infolog de Werte für die Auswahlbox view all subs of this entry infolog de alle Untereinträge dieses Eintrag anzeigen view other subs infolog de andere Untereinträge anzeigen @@ -344,6 +342,7 @@ view this linked entry in its application infolog de diesen verkn when should the todo or phonecall be started, it shows up from that date in the filter open or own open (startpage) infolog de wann soll mit dem Auftrag oder Anruf begonnen werden, ab diesem Datum wird er beim Filter offen oder eigene offen angezeigt (Startseite) which additional fields should the responsible be allowed to edit without having edit rights?
status, percent and date completed are always allowed. infolog de Welche zusätzlichen Felder soll der Verantwortliche bearbeiten können ohne Bearbeitungsrechte zu haben?
Status, Prozent und Datum erledigt sind immer erlaubt. which implicit acl rights should the responsible get? infolog de Welche impliziten Zugriffsrechte soll der Verantwortliche bekommen? +which types should the calendar show infolog de Welche Typen soll der Kalender anzeigen will-call infolog de ruft zurück write (add or update) a record by passing its fields. infolog de Schreiben (zufügen oder aktualisieren) eines Datensatzes durch Angabe seiner Felder. yes - delete infolog de Ja - Löschen diff --git a/infolog/setup/phpgw_en.lang b/infolog/setup/phpgw_en.lang index 0ca931df7e..9b108652a9 100644 --- a/infolog/setup/phpgw_en.lang +++ b/infolog/setup/phpgw_en.lang @@ -51,6 +51,7 @@ back to main list infolog en Back to main list billed infolog en billed both infolog en both call infolog en call +can be used to show further infolog types in the calendar or limit it to show eg. only tasks. infolog en Can be used to show further InfoLog types in the calendar or limit it to show eg. only tasks. cancel infolog en Cancel cancelled infolog en cancelled categories infolog en Categories @@ -116,7 +117,6 @@ do you want a notification, if items you created get updated? infolog en Do you do you want a notification, if items you delegated are about to start? infolog en Do you want a notification, if items you delegated are about to start? do you want a notification, if items you delegated are due? infolog en Do you want a notification, if items you delegated are due? do you want to receive notifications as html-mails or plain text? infolog en Do you want to receive notifications as html-mails or plain text? -do you want to see custom infolog types in the calendar? infolog en Do you want to see custom InfoLog types in the calendar? don't show infolog infolog en DON'T show InfoLog done infolog en done download infolog en Download @@ -281,7 +281,6 @@ should infolog show subtasks, -calls or -notes in the normal view or not. you ca should infolog show the links to other applications and/or the file-attachments in the infolog list (normal view when you enter infolog). infolog en Should InfoLog show the links to other applications and/or the file-attachments in the InfoLog list (normal view when you enter InfoLog). should infolog show up on the main screen and with which filter. works only if you dont selected an application for the main screen (in your preferences). infolog en Should InfoLog show up on the main screen and with which filter. Works only if you dont selected an application for the main screen (in your preferences). should infolog use full names (surname and familyname) or just the loginnames. infolog en Should InfoLog use full names (surname and familyname) or just the loginnames. -should the calendar show custom types too infolog en Should the calendar show custom types too should the infolog list show a unique numerical id, which can be used eg. as ticket id. infolog en Should the Infolog list show a unique numerical Id, which can be used eg. as ticket Id. should the infolog list show the column "last modified". infolog en Should the Infolog list show the column "last modified". should the infolog list show the percent done only for status ongoing or two separate icons. infolog en Should the Infolog list show the percent done only for status ongoing or two separate icons. @@ -341,6 +340,7 @@ view this linked entry in its application infolog en view this linked entry in i when should the todo or phonecall be started, it shows up from that date in the filter open or own open (startpage) infolog en when should the ToDo or Phone call be started, it shows up from that date in the filter open or own open (startpage) which additional fields should the responsible be allowed to edit without having edit rights?
status, percent and date completed are always allowed. infolog en Which additional fields should the responsible be allowed to edit without having edit rights?
Status, percent and date completed are always allowed. which implicit acl rights should the responsible get? infolog en Which implicit ACL rights should the responsible get? +which types should the calendar show infolog en Which types should the calendar show will-call infolog en will call write (add or update) a record by passing its fields. infolog en Write (add or update) a record by passing its fields. yes - delete infolog en Yes - Delete