holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

added copy function to infolog and action box, more actions will follow

Browse Source
This commit is contained in:
Stefan Becker 2009-12-11 08:34:47 +00:00
parent 77c889f907
commit d11469f91f
5 changed files with 34 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -242,7 +242,7 @@ class infolog_ui
{
$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";
$arrayToStore = array(
'search' => $values['search'],
'start' => $values['start'],
@ -258,7 +258,7 @@ class infolog_ui
'col_filter' => $values['col_filter'],
'session_for' => $for
);
if ($values['filter']=='bydate')
if ($values['filter']=='bydate')
{
$arrayToStore['startdate'] = $values['startdate'];
$arrayToStore['enddate'] = $values['enddate'];
@ -298,8 +298,8 @@ class infolog_ui
{
$query['header_left'] = 'infolog.index.dates';
$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['enddate'])) $query['col_filter'][] = 'info_startdate < '.$GLOBALS['egw']->db->quote($query['enddate']);
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']);
//unset($query['startdate']);
//unset($query['enddate']);
}
@ -846,9 +846,20 @@ class infolog_ui
$content['info_custom_from'] = (int)$content['info_custom_from'];
list($button) = @each($content['button']);
if (!$button && $action) $button = $action; // action selectbox
unset($content['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);
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_status' => $this->bo->status[$content['info_type']],
'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
'info_id' => $info_id,
'action' => $action,

3
infolog/lang/egw_de.lang
View File

@ -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
accept infolog de bei Annahme
action infolog de Befehle
actions... infolog de Befehle...
actual date and time infolog de aktuelles Datum und Uhrzeit
add infolog de Hinzufügen
add a file infolog de Datei anhängen
@ -74,6 +75,7 @@ completed infolog de Erledigt
configuration infolog de Konfiguration
confirm infolog de Bestätigung
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.
create new links infolog de Neue Verknüpfung erzeugen
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 subproject infolog de InfoLog - Anlegen Teilprojekt
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 saved infolog de InfoLog Eintrag gespeichert
infolog filter for the main screen infolog de InfoLog Filter für Startseite

3
infolog/lang/egw_en.lang
View File

@ -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
accept infolog en accept
action infolog en Action
actions... infolog en Actions...
actual date and time infolog en actual date and time
add infolog en Add
add a file infolog en Add a file
@ -74,6 +75,7 @@ completed infolog en Completed
configuration infolog en Configuration
confirm infolog en Confirm
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.
create new links infolog en Create new links
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 subproject infolog en InfoLog - New Subproject
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 saved infolog en InfoLog entry saved
infolog filter for the main screen infolog en InfoLog filter for the main screen

9
infolog/setup/etemplates.inc.php
View File

File diff suppressed because one or more lines are too long

9
infolog/templates/default/edit.xet
View File

@ -44,7 +44,7 @@
</grid>
</template>
<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>
<column width="100"/>
<column/>
@ -131,7 +131,7 @@
</grid>
</template>
<template id="infolog.edit.history" template="" lang="" group="0" version="1.3.002">
<grid width="100%">
<grid width="100%" height="245" overflow="auto">
<columns>
<column/>
</columns>
@ -142,7 +142,7 @@
</rows>
</grid>
</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%">
<columns>
<column width="103"/>
@ -255,6 +255,9 @@
<button label="Save" id="button[save]" statustext="Saves this entry"/>
<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();"/>
<menulist>
<menupopup id="action" statustext="Execute a further action for this entry" options="Actions..." onchange="this.form.submit(); this.value='';"/>
</menulist>
<html id="js"/>
</hbox>
<description/>