forked from extern/egroupware
Allow to save entries with due date in the past
This commit is contained in:
parent
94162698c9
commit
924340106f
@ -213,6 +213,7 @@ class infolog_bo
|
|||||||
);
|
);
|
||||||
if (($config_data = Api\Config::read('infolog')))
|
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']))
|
if (isset($config_data['status']) && is_array($config_data['status']))
|
||||||
{
|
{
|
||||||
foreach(array_keys($config_data['status']) as $key)
|
foreach(array_keys($config_data['status']) as $key)
|
||||||
|
@ -1797,6 +1797,14 @@ class infolog_ui
|
|||||||
$status_only = $this->bo->is_responsible($old);
|
$status_only = $this->bo->is_responsible($old);
|
||||||
$undelete = $this->bo->check_access($old,infolog_bo::ACL_UNDELETE);
|
$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))
|
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('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('index_load_cfs', implode(',', (array)$content['index_load_cfs']), 'infolog');
|
||||||
Api\Config::save_value('sub_prefix', $content['sub_prefix'], '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
|
||||||
$notifications =& $config[infolog_tracking::CUSTOM_NOTIFICATION];
|
$notifications =& $config[infolog_tracking::CUSTOM_NOTIFICATION];
|
||||||
$notifications[$content['notification_type']] = $content['notification'];
|
$notifications[$content['notification_type']] = $content['notification'];
|
||||||
|
@ -52,6 +52,7 @@ all infolog de alle
|
|||||||
all links and attachments infolog de alle Verknüpfungen und Anhänge
|
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 other %1 fields are valid infolog de Alle anderen %1 Felder sind gültig
|
||||||
all projects infolog de Alle Projekte
|
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)
|
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
|
alternatives infolog de Alternativen
|
||||||
always show them infolog de Immer anzeigen
|
always show them infolog de Immer anzeigen
|
||||||
@ -168,6 +169,7 @@ done infolog de geschlossen
|
|||||||
download infolog de Datei laden
|
download infolog de Datei laden
|
||||||
download url for links infolog de Download Link für Verknüpfungen
|
download url for links infolog de Download Link für Verknüpfungen
|
||||||
due %1 infolog de %1 fällig
|
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
|
duration infolog de Dauer
|
||||||
e-mail: infolog de E-Mail
|
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]
|
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 infolog de Startdatum
|
||||||
startdate enddate infolog de Startdatum Fälligkeitsdatum
|
startdate enddate infolog de Startdatum Fälligkeitsdatum
|
||||||
startdate for new entries infolog de Startdatum für neue Einträge
|
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
|
starting %1 infolog de %1 startet
|
||||||
startrecord infolog de Startdatensatz
|
startrecord infolog de Startdatensatz
|
||||||
status infolog de Status
|
status infolog de Status
|
||||||
|
@ -52,6 +52,7 @@ all infolog en All
|
|||||||
all links and attachments infolog en All links and attachments
|
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 other %1 fields are valid infolog en All other %1 fields are valid
|
||||||
all projects infolog en All projects
|
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.
|
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
|
alternatives infolog en Alternatives
|
||||||
always show them infolog en Always show them
|
always show them infolog en Always show them
|
||||||
@ -168,6 +169,7 @@ done infolog en Done
|
|||||||
download infolog en Download
|
download infolog en Download
|
||||||
download url for links infolog en Download url for links
|
download url for links infolog en Download url for links
|
||||||
due %1 infolog en Due %1
|
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
|
duration infolog en Duration
|
||||||
e-mail: infolog en Email:
|
e-mail: infolog en Email:
|
||||||
each value is a line like <id>[=<label>] infolog en Each value is a line like <id>[=<label>]
|
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 infolog en Start date
|
||||||
startdate enddate infolog en Start date, Due date
|
startdate enddate infolog en Start date, Due date
|
||||||
startdate for new entries infolog en Start date for new entries
|
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
|
starting %1 infolog en Starting %1
|
||||||
startrecord infolog en Start record
|
startrecord infolog en Start record
|
||||||
status infolog en Status
|
status infolog en Status
|
||||||
|
@ -50,6 +50,13 @@
|
|||||||
<description value="Fields to exclude when creating a sub-entry:"/>
|
<description value="Fields to exclude when creating a sub-entry:"/>
|
||||||
<listbox id="sub_excludefields" rows="6"/>
|
<listbox id="sub_excludefields" rows="6"/>
|
||||||
</row>
|
</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>
|
</rows>
|
||||||
</grid>
|
</grid>
|
||||||
</template>
|
</template>
|
||||||
|
Loading…
Reference in New Issue
Block a user