extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-07 08:34:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Allow to save entries with due date in the past

Browse Source
This commit is contained in:
Hadi Nategh 2018-07-19 16:10:34 +02:00
parent d5e0bc1615
commit 2742f257f2
5 changed files with 23 additions and 3 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

@ -213,6 +213,7 @@ class infolog_bo
);
if (($config_data = Api\Config::read('infolog')))
{
$this->allow_past_due_date = $config_data['allow_past_due_date'] === null ? 1 : $config_data['allow_past_due_date'];
if (isset($config_data['status']) && is_array($config_data['status']))
{
foreach(array_keys($config_data['status']) as $key)

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

@ -1797,6 +1797,14 @@ class infolog_ui
$status_only = $this->bo->is_responsible($old);
$undelete = $this->bo->check_access($old,infolog_bo::ACL_UNDELETE);
}
// enddate in the past gives warning
if (isset($content['info_enddate'])
&& $content['info_enddate'] < $this->bo->user_time_now
&& !$this->bo->allow_past_due_date && !($content['info_status'] == 'done'
|| $content['info_status'] == 'archive'))
{
$this->tmpl->set_validation_error('info_enddate', lang('Due date must be in the future!!!'));
}
}
if (($button == 'save' || $button == 'apply') && (!$info_id || $edit_acl || $status_only || $undelete))
{
@ -2492,7 +2500,7 @@ class infolog_ui
Api\Config::save_value('history', $this->bo->history = $content['history'], 'infolog');
Api\Config::save_value('index_load_cfs', implode(',', (array)$content['index_load_cfs']), 'infolog');
Api\Config::save_value('sub_prefix', $content['sub_prefix'], 'infolog');
Api\Config::save_value('allow_past_due_date', $content['allow_past_due_date'], 'infolog');
// Notifications
$notifications =& $config[infolog_tracking::CUSTOM_NOTIFICATION];
$notifications[$content['notification_type']] = $content['notification'];

4
infolog/lang/egw_de.lang
View File

@ -52,6 +52,7 @@ all infolog de alle
all links and attachments infolog de alle Verknüpfungen und Anhänge
all other %1 fields are valid infolog de Alle anderen %1 Felder sind gültig
all projects infolog de Alle Projekte
allow to save entries with due date in the past infolog de Erlaubt speichern von Einträgen mit Fälligkeitsdatum in der Vergangenheit
allows to set the status of an entry, eg. set a todo to done if it's finished (values depend on entry-typ) infolog de erlaubt den Status eines Eintrags zu setzen, z.B. eine Aufgabe auf erledigt wenn sie beendet ist (Werte hängen vom Type des Eintrags ab)
alternatives infolog de Alternativen
always show them infolog de Immer anzeigen
@ -168,6 +169,7 @@ done infolog de geschlossen
download infolog de Datei laden
download url for links infolog de Download Link für Verknüpfungen
due %1 infolog de %1 fällig
due date must be in the future!!! de Das Fälligkeitsdatum muss in der Zukunft liegen.
duration infolog de Dauer
e-mail: infolog de E-Mail
each value is a line like <id>[=<label>] infolog de jeder Wert ist eine Zeile im Format id=[angezeigter Wert]
@ -451,7 +453,7 @@ start a new search, cancel this link infolog de eine neue Suche starten, diese V
startdate infolog de Startdatum
startdate enddate infolog de Startdatum Fälligkeitsdatum
startdate for new entries infolog de Startdatum für neue Einträge
startdate must be before enddate!!! infolog de Startdatum muss vor dem Enddatum liegen!!!
startdate must be before enddate!!! infolog de Startdatum muss vor dem Fälligkeitsdatum liegen!!!
starting %1 infolog de %1 startet
startrecord infolog de Startdatensatz
status infolog de Status

4
infolog/lang/egw_en.lang
View File

@ -52,6 +52,7 @@ all infolog en All
all links and attachments infolog en All links and attachments
all other %1 fields are valid infolog en All other %1 fields are valid
all projects infolog en All projects
allow to save entries with due date in the past infolog en Allow to save entries with due date in the past
allows to set the status of an entry, eg. set a todo to done if it's finished (values depend on entry-typ) infolog en Allows to set the status of an entry, e.g. set a ToDo to done if it's finished. Values depend on entry type.
alternatives infolog en Alternatives
always show them infolog en Always show them
@ -168,6 +169,7 @@ done infolog en Done
download infolog en Download
download url for links infolog en Download url for links
due %1 infolog en Due %1
due date must be in the future!!! en Due date must be in the future!!!
duration infolog en Duration
e-mail: infolog en Email:
each value is a line like <id>[=<label>] infolog en Each value is a line like <id>[=<label>]
@ -451,7 +453,7 @@ start a new search, cancel this link infolog en Start a new search, cancel this
startdate infolog en Start date
startdate enddate infolog en Start date, Due date
startdate for new entries infolog en Start date for new entries
startdate must be before enddate!!! infolog en Startdate must be before Enddate!!!
startdate must be before enddate!!! infolog en Startdate must be before due date!!!
starting %1 infolog en Starting %1
startrecord infolog en Start record
status infolog en Status

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

@ -50,6 +50,13 @@
<description value="Fields to exclude when creating a sub-entry:"/>
<listbox id="sub_excludefields" rows="6"/>
</row>
<row>
<description value="Allow to save entries with due date in the past" label="%s:"/>
<select id="allow_past_due_date">
<option value="1">Yes</option>
<option value="0">No</option>
</select>
</row>
</rows>
</grid>
</template>