mirror of
https://github.com/EGroupware/egroupware.git
synced 2025-02-15 09:49:45 +01:00
added copy function to infolog and action box, more actions will follow
This commit is contained in:
parent
77c889f907
commit
d11469f91f
@ -242,7 +242,7 @@ class infolog_ui
|
|||||||
{
|
{
|
||||||
$for = @$values['session_for'] ? $values['session_for'] : @$this->called_by;
|
$for = @$values['session_for'] ? $values['session_for'] : @$this->called_by;
|
||||||
//echo "<p>$for: ".__METHOD__.'('.print_r($values,True).") called_by='$this->called_by', for='$for'<br />".function_backtrace()."</p>\n";
|
//echo "<p>$for: ".__METHOD__.'('.print_r($values,True).") called_by='$this->called_by', for='$for'<br />".function_backtrace()."</p>\n";
|
||||||
|
|
||||||
$arrayToStore = array(
|
$arrayToStore = array(
|
||||||
'search' => $values['search'],
|
'search' => $values['search'],
|
||||||
'start' => $values['start'],
|
'start' => $values['start'],
|
||||||
@ -258,7 +258,7 @@ class infolog_ui
|
|||||||
'col_filter' => $values['col_filter'],
|
'col_filter' => $values['col_filter'],
|
||||||
'session_for' => $for
|
'session_for' => $for
|
||||||
);
|
);
|
||||||
if ($values['filter']=='bydate')
|
if ($values['filter']=='bydate')
|
||||||
{
|
{
|
||||||
$arrayToStore['startdate'] = $values['startdate'];
|
$arrayToStore['startdate'] = $values['startdate'];
|
||||||
$arrayToStore['enddate'] = $values['enddate'];
|
$arrayToStore['enddate'] = $values['enddate'];
|
||||||
@ -298,8 +298,8 @@ class infolog_ui
|
|||||||
{
|
{
|
||||||
$query['header_left'] = 'infolog.index.dates';
|
$query['header_left'] = 'infolog.index.dates';
|
||||||
$GLOBALS['egw']->js->set_onload("set_style_by_class('table','custom_hide','visibility','visible');");
|
$GLOBALS['egw']->js->set_onload("set_style_by_class('table','custom_hide','visibility','visible');");
|
||||||
if (is_int($query['startdate'])) $query['col_filter'][] = 'info_startdate > '.$GLOBALS['egw']->db->quote($query['startdate']);
|
if (is_int($query['startdate'])) $query['col_filter'][] = 'info_startdate > '.$GLOBALS['egw']->db->quote($query['startdate']);
|
||||||
if (is_int($query['enddate'])) $query['col_filter'][] = 'info_startdate < '.$GLOBALS['egw']->db->quote($query['enddate']);
|
if (is_int($query['enddate'])) $query['col_filter'][] = 'info_startdate < '.$GLOBALS['egw']->db->quote($query['enddate']);
|
||||||
//unset($query['startdate']);
|
//unset($query['startdate']);
|
||||||
//unset($query['enddate']);
|
//unset($query['enddate']);
|
||||||
}
|
}
|
||||||
@ -846,9 +846,20 @@ class infolog_ui
|
|||||||
$content['info_custom_from'] = (int)$content['info_custom_from'];
|
$content['info_custom_from'] = (int)$content['info_custom_from'];
|
||||||
|
|
||||||
list($button) = @each($content['button']);
|
list($button) = @each($content['button']);
|
||||||
|
if (!$button && $action) $button = $action; // action selectbox
|
||||||
unset($content['button']);
|
unset($content['button']);
|
||||||
if ($button)
|
if ($button)
|
||||||
{
|
{
|
||||||
|
//Copy Infolog
|
||||||
|
if (($button == 'copy'))
|
||||||
|
{
|
||||||
|
unset($content['info_id']);
|
||||||
|
unset($content['info_datemodified']);
|
||||||
|
unset($contentt['info_modifier']);
|
||||||
|
$content['info_owner'] = !(int)$this->owner || !$this->bo->check_perms(EGW_ACL_ADD,0,$this->owner) ? $this->user : $this->owner;
|
||||||
|
$content['msg'] = lang('Infolog copied - the copy can now be edited');
|
||||||
|
$content['info_subject'] = lang('Copy of:').' '.$content['info_subject'];
|
||||||
|
}
|
||||||
//echo "<p>infolog_ui::edit(info_id=$info_id) '$button' button pressed, content="; _debug_array($content);
|
//echo "<p>infolog_ui::edit(info_id=$info_id) '$button' button pressed, content="; _debug_array($content);
|
||||||
if (($button == 'save' || $button == 'apply') && isset($content['info_subject']) && empty($content['info_subject']))
|
if (($button == 'save' || $button == 'apply') && isset($content['info_subject']) && empty($content['info_subject']))
|
||||||
{
|
{
|
||||||
@ -1275,6 +1286,10 @@ class infolog_ui
|
|||||||
'info_confirm' => $this->bo->enums['confirm'],
|
'info_confirm' => $this->bo->enums['confirm'],
|
||||||
'info_status' => $this->bo->status[$content['info_type']],
|
'info_status' => $this->bo->status[$content['info_type']],
|
||||||
'status' => $history_stati,
|
'status' => $history_stati,
|
||||||
|
'action' => array(
|
||||||
|
'copy' => array('label' => 'Copy', 'title' => 'Copy this Infolog'),
|
||||||
|
// 'print' => array('label' => 'Print', 'title' => 'Print this Infolog'),
|
||||||
|
),
|
||||||
),$readonlys,$preserv+array( // preserved values
|
),$readonlys,$preserv+array( // preserved values
|
||||||
'info_id' => $info_id,
|
'info_id' => $info_id,
|
||||||
'action' => $action,
|
'action' => $action,
|
||||||
|
@ -26,6 +26,7 @@ a short subject for the entry infolog de einen kurzen Titel für diesen Eintrag
|
|||||||
abort without deleting infolog de Abruch ohne zu Löschen
|
abort without deleting infolog de Abruch ohne zu Löschen
|
||||||
accept infolog de bei Annahme
|
accept infolog de bei Annahme
|
||||||
action infolog de Befehle
|
action infolog de Befehle
|
||||||
|
actions... infolog de Befehle...
|
||||||
actual date and time infolog de aktuelles Datum und Uhrzeit
|
actual date and time infolog de aktuelles Datum und Uhrzeit
|
||||||
add infolog de Hinzufügen
|
add infolog de Hinzufügen
|
||||||
add a file infolog de Datei anhängen
|
add a file infolog de Datei anhängen
|
||||||
@ -74,6 +75,7 @@ completed infolog de Erledigt
|
|||||||
configuration infolog de Konfiguration
|
configuration infolog de Konfiguration
|
||||||
confirm infolog de Bestätigung
|
confirm infolog de Bestätigung
|
||||||
contact infolog de Kontakt
|
contact infolog de Kontakt
|
||||||
|
copy of: infolog de Kopie von:
|
||||||
copy your changes to the clipboard, %1reload the entry%2 and merge them. infolog de Kopieren Sie ihre Änderungen in die Zwischenablage, %1laden den Eintrag neu%2 und fügen diese wieder ein.
|
copy your changes to the clipboard, %1reload the entry%2 and merge them. infolog de Kopieren Sie ihre Änderungen in die Zwischenablage, %1laden den Eintrag neu%2 und fügen diese wieder ein.
|
||||||
create new links infolog de Neue Verknüpfung erzeugen
|
create new links infolog de Neue Verknüpfung erzeugen
|
||||||
creates a new field infolog de erstellt ein neues Feld
|
creates a new field infolog de erstellt ein neues Feld
|
||||||
@ -177,6 +179,7 @@ infolog - import csv-file infolog de InfoLog - Import CSV-Datei
|
|||||||
infolog - new infolog de InfoLog - Anlegen
|
infolog - new infolog de InfoLog - Anlegen
|
||||||
infolog - new subproject infolog de InfoLog - Anlegen Teilprojekt
|
infolog - new subproject infolog de InfoLog - Anlegen Teilprojekt
|
||||||
infolog - subprojects from infolog de InfoLog - Teilprojekte von
|
infolog - subprojects from infolog de InfoLog - Teilprojekte von
|
||||||
|
infolog copied - the copy can now be edited infolog de Infolog Kopie - Diese Kopie kann jetzt bearbeitet werden
|
||||||
infolog entry deleted infolog de InfoLog Eintrag gelöscht
|
infolog entry deleted infolog de InfoLog Eintrag gelöscht
|
||||||
infolog entry saved infolog de InfoLog Eintrag gespeichert
|
infolog entry saved infolog de InfoLog Eintrag gespeichert
|
||||||
infolog filter for the main screen infolog de InfoLog Filter für Startseite
|
infolog filter for the main screen infolog de InfoLog Filter für Startseite
|
||||||
|
@ -26,6 +26,7 @@ a short subject for the entry infolog en a short subject for the entry
|
|||||||
abort without deleting infolog en Abort without deleting
|
abort without deleting infolog en Abort without deleting
|
||||||
accept infolog en accept
|
accept infolog en accept
|
||||||
action infolog en Action
|
action infolog en Action
|
||||||
|
actions... infolog en Actions...
|
||||||
actual date and time infolog en actual date and time
|
actual date and time infolog en actual date and time
|
||||||
add infolog en Add
|
add infolog en Add
|
||||||
add a file infolog en Add a file
|
add a file infolog en Add a file
|
||||||
@ -74,6 +75,7 @@ completed infolog en Completed
|
|||||||
configuration infolog en Configuration
|
configuration infolog en Configuration
|
||||||
confirm infolog en Confirm
|
confirm infolog en Confirm
|
||||||
contact infolog en Contact
|
contact infolog en Contact
|
||||||
|
copy of: infolog en Copy of:
|
||||||
copy your changes to the clipboard, %1reload the entry%2 and merge them. infolog en Copy your changes to the clipboard, %1reload the entry%2 and merge them.
|
copy your changes to the clipboard, %1reload the entry%2 and merge them. infolog en Copy your changes to the clipboard, %1reload the entry%2 and merge them.
|
||||||
create new links infolog en Create new links
|
create new links infolog en Create new links
|
||||||
creates a new field infolog en creates a new field
|
creates a new field infolog en creates a new field
|
||||||
@ -177,6 +179,7 @@ infolog - import csv-file infolog en InfoLog - Import CSV-File
|
|||||||
infolog - new infolog en InfoLog - New
|
infolog - new infolog en InfoLog - New
|
||||||
infolog - new subproject infolog en InfoLog - New Subproject
|
infolog - new subproject infolog en InfoLog - New Subproject
|
||||||
infolog - subprojects from infolog en InfoLog - Subprojects from
|
infolog - subprojects from infolog en InfoLog - Subprojects from
|
||||||
|
infolog copied - the copy can now be edited infolog en Infolog copied - the copy can now be edited
|
||||||
infolog entry deleted infolog en InfoLog entry deleted
|
infolog entry deleted infolog en InfoLog entry deleted
|
||||||
infolog entry saved infolog en InfoLog entry saved
|
infolog entry saved infolog en InfoLog entry saved
|
||||||
infolog filter for the main screen infolog en InfoLog filter for the main screen
|
infolog filter for the main screen infolog en InfoLog filter for the main screen
|
||||||
|
File diff suppressed because one or more lines are too long
@ -44,7 +44,7 @@
|
|||||||
</grid>
|
</grid>
|
||||||
</template>
|
</template>
|
||||||
<template id="infolog.edit.delegation" template="" lang="" group="0" version="1.3.001">
|
<template id="infolog.edit.delegation" template="" lang="" group="0" version="1.3.001">
|
||||||
<grid width="100%" border="0">
|
<grid width="100%" height="245" border="0">
|
||||||
<columns>
|
<columns>
|
||||||
<column width="100"/>
|
<column width="100"/>
|
||||||
<column/>
|
<column/>
|
||||||
@ -131,7 +131,7 @@
|
|||||||
</grid>
|
</grid>
|
||||||
</template>
|
</template>
|
||||||
<template id="infolog.edit.history" template="" lang="" group="0" version="1.3.002">
|
<template id="infolog.edit.history" template="" lang="" group="0" version="1.3.002">
|
||||||
<grid width="100%">
|
<grid width="100%" height="245" overflow="auto">
|
||||||
<columns>
|
<columns>
|
||||||
<column/>
|
<column/>
|
||||||
</columns>
|
</columns>
|
||||||
@ -142,7 +142,7 @@
|
|||||||
</rows>
|
</rows>
|
||||||
</grid>
|
</grid>
|
||||||
</template>
|
</template>
|
||||||
<template id="infolog.edit" template="" lang="" group="0" version="1.7.002">
|
<template id="infolog.edit" template="" lang="" group="0" version="1.7.003">
|
||||||
<grid width="100%">
|
<grid width="100%">
|
||||||
<columns>
|
<columns>
|
||||||
<column width="103"/>
|
<column width="103"/>
|
||||||
@ -255,6 +255,9 @@
|
|||||||
<button label="Save" id="button[save]" statustext="Saves this entry"/>
|
<button label="Save" id="button[save]" statustext="Saves this entry"/>
|
||||||
<button id="button[apply]" label="Apply" statustext="Apply the changes"/>
|
<button id="button[apply]" label="Apply" statustext="Apply the changes"/>
|
||||||
<button label="Cancel" id="button[cancel]" statustext="leave without saveing the entry" onclick="window.close();"/>
|
<button label="Cancel" id="button[cancel]" statustext="leave without saveing the entry" onclick="window.close();"/>
|
||||||
|
<menulist>
|
||||||
|
<menupopup id="action" statustext="Execute a further action for this entry" options="Actions..." onchange="this.form.submit(); this.value='';"/>
|
||||||
|
</menulist>
|
||||||
<html id="js"/>
|
<html id="js"/>
|
||||||
</hbox>
|
</hbox>
|
||||||
<description/>
|
<description/>
|
||||||
|
Loading…
Reference in New Issue
Block a user