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

* all apps: custom field attribute length only sets visible length, to set maximum length specify rows=1

Browse Source
This commit is contained in:
Ralf Becker 2014-12-10 14:34:48 +00:00
parent e59e843707
commit d71fa725e5
4 changed files with 30 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
admin/inc/class.customfields.inc.php
View File

@ -68,8 +68,8 @@ class customfields
* @var Description of the options or value format for each cf_type * @var Description of the options or value format for each cf_type
*/ */
public static $type_option_help = array( public static $type_option_help = array(
'select' => 'each value is a line like id[=label], or use @<path> to read options from a file', 'select' => 'each value is a line like id[=label], or use @path to read options from a file in EGroupware directory',
'radio' => 'each value is a line like id[=label], or use @<path> to read options from a file', 'radio' => 'each value is a line like id[=label], or use @path to read options from a file in EGroupware directory',
'button' => 'each value is a line like label=[javascript]' 'button' => 'each value is a line like label=[javascript]'
); );
@ -177,7 +177,7 @@ class customfields
// save changes to repository // save changes to repository
$this->save_repository(); $this->save_repository();
} }
$content['nm']= $GLOBALS['egw']->session->appsession('customfield-index','admin'); $content['nm']= $GLOBALS['egw']->session->appsession('customfield-index','admin');
if (!is_array($content['nm'])) if (!is_array($content['nm']))
{ {
@ -195,7 +195,7 @@ class customfields
} }
$content['nm']['appname'] = $this->appname; $content['nm']['appname'] = $this->appname;
$content['nm']['use_private'] = $this->use_private; $content['nm']['use_private'] = $this->use_private;
// Set up sub-types // Set up sub-types
if($this->manage_content_types) if($this->manage_content_types)
{ {
@ -259,7 +259,7 @@ class customfields
// Some logic to make sure extending class (if there is one) gets called // Some logic to make sure extending class (if there is one) gets called
// when etemplate2 comes back instead of parent class // when etemplate2 comes back instead of parent class
$exec = get_class() == get_called_class() ? 'admin.customfields.index' : $this->appname . '.' . get_called_class() . '.index'; $exec = get_class() == get_called_class() ? 'admin.customfields.index' : $this->appname . '.' . get_called_class() . '.index';
$this->tmpl->exec($exec,$content,$sel_options,$readonlys,$preserve); $this->tmpl->exec($exec,$content,$sel_options,$readonlys,$preserve);
} }
@ -413,7 +413,7 @@ class customfields
{ {
$this->tmpl->setElementAttribute($field, 'disabled', !self::$type_attribute_flags[$content['cf_type']][$field]); $this->tmpl->setElementAttribute($field, 'disabled', !self::$type_attribute_flags[$content['cf_type']][$field]);
} }
$this->tmpl->exec('admin.customfields.edit',$content,$sel_options,$readonlys,array( $this->tmpl->exec('admin.customfields.edit',$content,$sel_options,$readonlys,array(
'cf_id' => $cf_id, 'cf_id' => $cf_id,
'cf_app' => $this->appname, 'cf_app' => $this->appname,

11
admin/lang/egw_de.lang
View File

@ -67,6 +67,7 @@ add new application admin de Neue Anwendung hinzufügen
add peer server admin de Server zu Serververbund hinzufügen add peer server admin de Server zu Serververbund hinzufügen
add sub-category admin de Unterkategorie hinzufügen add sub-category admin de Unterkategorie hinzufügen
add user admin de Neuen Benutzer erstellen add user admin de Neuen Benutzer erstellen
add user or group admin de Benutzer oder Gruppen eingeben
admin email admin de E-Mail-Administration admin email admin de E-Mail-Administration
admin email addresses (comma-separated) to be notified about the blocking (empty for no notify) admin de E-Mail-Adressen der Administratoren (mit Komma getrennt) die über eine Sperre benachrichtigt werden sollen ('leer' für keine Benachrichtigung) admin email addresses (comma-separated) to be notified about the blocking (empty for no notify) admin de E-Mail-Adressen der Administratoren (mit Komma getrennt) die über eine Sperre benachrichtigt werden sollen ('leer' für keine Benachrichtigung)
admin name admin de Name des Administrators admin name admin de Name des Administrators
@ -115,6 +116,7 @@ attribute accountstatus explained admin de Dies betrifft das Attribut <b>-accoun
attribute mail explained admin de Dies betrifft das Attribut <b><i>-mail-</i></b> aus dem CORE Schema. Dieses Attribut darf nicht leer sein und wird gleichzeitig als E-Mail-Adresse innerhalb eGW verwendet. attribute mail explained admin de Dies betrifft das Attribut <b><i>-mail-</i></b> aus dem CORE Schema. Dieses Attribut darf nicht leer sein und wird gleichzeitig als E-Mail-Adresse innerhalb eGW verwendet.
attribute mailalternateaddress explained admin de Dies betrifft das Attribut <b>-mailAlternateAddress-</b> aus dem QMAIL Schema. Das experimentelle Schema verwendet dies auch als Alias für mailLocalAddress. attribute mailalternateaddress explained admin de Dies betrifft das Attribut <b>-mailAlternateAddress-</b> aus dem QMAIL Schema. Das experimentelle Schema verwendet dies auch als Alias für mailLocalAddress.
attribute mailforwardingaddress explained admin de Dies betrifft das Attribut <b>-mailForwardingAddress-</b> aus dem QMAIL Schema. Darf nicht leer sein. Der Begriff mailRoutingAddress wurde hierfür früher als Alias verwendet. attribute mailforwardingaddress explained admin de Dies betrifft das Attribut <b>-mailForwardingAddress-</b> aus dem QMAIL Schema. Darf nicht leer sein. Der Begriff mailRoutingAddress wurde hierfür früher als Alias verwendet.
attributes admin de Einstellungen
authentication / accounts admin de Benutzerauthentifizierung / Benutzerkonten authentication / accounts admin de Benutzerauthentifizierung / Benutzerkonten
auto create account records for authenticated users admin de Automatisch Benutzerkonten für authentifizierte Benutzer anlegen auto create account records for authenticated users admin de Automatisch Benutzerkonten für authentifizierte Benutzer anlegen
available placeholders admin de Verfügbare Platzhalter available placeholders admin de Verfügbare Platzhalter
@ -230,6 +232,7 @@ disable minifying of javascript and css files admin de Komprimierung von Javascr
disable wysiwyg-editor admin de WYSIWYG Editor (formatierter Text) abschalten disable wysiwyg-editor admin de WYSIWYG Editor (formatierter Text) abschalten
disabled (not recomended) admin de abgeschaltet (nicht empfohlen) disabled (not recomended) admin de abgeschaltet (nicht empfohlen)
display admin de anzeigen display admin de anzeigen
displayed length of input field (set rows=1 to limit length) admin de angezeigte Länge des Eingabefelds (setze Zeilen=1 um die Eingabe zu beschränken)
do not delete the category and return back to the list admin de Kategorie NICHT löschen und zurück zur Liste gehen do not delete the category and return back to the list admin de Kategorie NICHT löschen und zurück zur Liste gehen
do you also want to delete all global subcategories ? admin de Wollen Sie auch alle globalen Unterkategorien löschen? do you also want to delete all global subcategories ? admin de Wollen Sie auch alle globalen Unterkategorien löschen?
do you want to delete all global subcategories ? admin de Möchten Sie alle globale Unterkategorien löschen? do you want to delete all global subcategories ? admin de Möchten Sie alle globale Unterkategorien löschen?
@ -237,8 +240,8 @@ do you want to move all global subcategories one level down ? admin de Wollen Si
document root (default) admin de Wurzelverzeichnis des Webservers (Vorgabe) document root (default) admin de Wurzelverzeichnis des Webservers (Vorgabe)
down admin de unten down admin de unten
download csv admin de CSV herunterladen download csv admin de CSV herunterladen
each value is a line like <id>[=<label>] admin de jeder Wert ist ein Zeile <id>[=<label>] each value is a line like id[=label], or use @path to read options from a file in egroupware directory admin de jeder Wert ist eine Zeile im Format Wert[=Anzeige], oder benutzen Sie @Pfad um die Optionen aus einer Datei aus dem EGroupware Verzeichnis zu lesen
each value is a line like id[=label] admin de jeder Wert ist eine Zeile id[=label] each value is a line like label=[javascript] admin de jeder Wert ist eine Zeile im Format Anzeige[=Javascript]
edit account admin de Benutzerkonto bearbeiten edit account admin de Benutzerkonto bearbeiten
edit application admin de Anwendung bearbeiten edit application admin de Anwendung bearbeiten
edit email settings admin de E-Mail-Einstellungen bearbeiten edit email settings admin de E-Mail-Einstellungen bearbeiten
@ -400,6 +403,7 @@ leave the group untouched and return back to the list admin de Gruppe unverände
leave unchanged admin de unverändert lassen leave unchanged admin de unverändert lassen
leave without saveing the entry admin de beendet ohne den Eintrag zu speichern leave without saveing the entry admin de beendet ohne den Eintrag zu speichern
leaves without saveing admin de beendet ohne zu speichern leaves without saveing admin de beendet ohne zu speichern
length admin de Länge
length<br>rows admin de Länge<br>Zeilen length<br>rows admin de Länge<br>Zeilen
limit global category to members of a certain group admin de Beschränkt die global Kategorie auf der Mitglieder einer bestimmten Gruppe limit global category to members of a certain group admin de Beschränkt die global Kategorie auf der Mitglieder einer bestimmten Gruppe
limit to members of admin de beschränken auf Mitglieder von limit to members of admin de beschränken auf Mitglieder von
@ -423,7 +427,6 @@ main email-address admin de Stamm-E-Mail-Adresse
main screen message admin de Nachricht der Startseite main screen message admin de Nachricht der Startseite
manage mapping admin de Feldzuordnung verwalten manage mapping admin de Feldzuordnung verwalten
manager admin de Manager manager admin de Manager
max length of the input [, length of the inputfield (optional)] admin de maximale Länge für die Ausgabe [. Länge des Feldes (optional)]
maximum account id (e.g. 65535 or 1000000) admin de Maximum für Benutzer-ID (z.B. 65535 oder 1000000) maximum account id (e.g. 65535 or 1000000) admin de Maximum für Benutzer-ID (z.B. 65535 oder 1000000)
maximum entries in click path history admin de Max. Anzahl Einträge in der Click-Path-Historie maximum entries in click path history admin de Max. Anzahl Einträge in der Click-Path-Historie
members admin de Mitglieder members admin de Mitglieder
@ -527,6 +530,7 @@ return to admin mainscreen admin de zum Administrationsmenü zurückkehren
return to view account admin de Zurück zum Anzeigen des Benutzerkontos return to view account admin de Zurück zum Anzeigen des Benutzerkontos
rights admin de Rechte rights admin de Rechte
route all mails to admin de Alle E-Mails senden an route all mails to admin de Alle E-Mails senden an
rows admin de Zeilen
rpm or debian package admin de RPM oder Debian Pakete rpm or debian package admin de RPM oder Debian Pakete
run admin de Ausführen run admin de Ausführen
run asynchronous services admin de Asynchrone Dienste ausführen run asynchronous services admin de Asynchrone Dienste ausführen
@ -633,6 +637,7 @@ two months admin de zwei Monate
two weeks admin de zwei Wochen two weeks admin de zwei Wochen
type '%1' already exists !!! admin de Typ '%1' existiert bereits !!! type '%1' already exists !!! admin de Typ '%1' existiert bereits !!!
type of customfield admin de Typ des Benutzerdefinierten Feldes type of customfield admin de Typ des Benutzerdefinierten Feldes
type of field admin de Feldtyp
under windows you need to install the asyncservice %1manually%2 or use the fallback mode. fallback means the jobs get only checked after each page-view !!! admin de Unter Windows muß der asynchrone Service %1von Hand%2 installiert werden oder es wird nur die Ausweichmöglichkeit benutzt. Bei der Ausweichmöglichkeit werden die Jobs nur nach jedem Seitenaufbau überprüft!!! under windows you need to install the asyncservice %1manually%2 or use the fallback mode. fallback means the jobs get only checked after each page-view !!! admin de Unter Windows muß der asynchrone Service %1von Hand%2 installiert werden oder es wird nur die Ausweichmöglichkeit benutzt. Bei der Ausweichmöglichkeit werden die Jobs nur nach jedem Seitenaufbau überprüft!!!
unknown account: %1 !!! admin de Unbekanntes Benutzerkonto: %1 !!! unknown account: %1 !!! admin de Unbekanntes Benutzerkonto: %1 !!!
unknown command %1! admin de Unbekannter Befehl %1 ! unknown command %1! admin de Unbekannter Befehl %1 !

11
admin/lang/egw_en.lang
View File

@ -67,6 +67,7 @@ add new application admin en Add new application
add peer server admin en Add Peer Server add peer server admin en Add Peer Server
add sub-category admin en Add sub category add sub-category admin en Add sub category
add user admin en Add user add user admin en Add user
add user or group admin en Add user or group
admin email admin en Admin email admin email admin en Admin email
admin email addresses (comma-separated) to be notified about the blocking (empty for no notify) admin en Admin email addresses, comma-separated, to be notified about the blocked user accounts and IP. Empty = no notification. admin email addresses (comma-separated) to be notified about the blocking (empty for no notify) admin en Admin email addresses, comma-separated, to be notified about the blocked user accounts and IP. Empty = no notification.
admin name admin en Admin name admin name admin en Admin name
@ -115,6 +116,7 @@ attribute accountstatus explained admin en This handles the attribute <b><i>-acc
attribute mail explained admin en This handles the attribute <b><i>-mail-</i></b> from the QMAIL schema and should never be empty. It is also the eGW internal email field. attribute mail explained admin en This handles the attribute <b><i>-mail-</i></b> from the QMAIL schema and should never be empty. It is also the eGW internal email field.
attribute mailalternateaddress explained admin en This handles the attribute <b><i>-mailAlternateAddress-</i></b> from the QMAIL schema and can be handled as virtual maps or aliases. attribute mailalternateaddress explained admin en This handles the attribute <b><i>-mailAlternateAddress-</i></b> from the QMAIL schema and can be handled as virtual maps or aliases.
attribute mailforwardingaddress explained admin en This handles the attribute <b><i>-mailForwardingAddress-</i></b> from QMAIL Schema and must not be empty if assigned. attribute mailforwardingaddress explained admin en This handles the attribute <b><i>-mailForwardingAddress-</i></b> from QMAIL Schema and must not be empty if assigned.
attributes admin en Attributes
authentication / accounts admin en Authentication | Accounts authentication / accounts admin en Authentication | Accounts
auto create account records for authenticated users admin en Auto create account records for authenticated users. auto create account records for authenticated users admin en Auto create account records for authenticated users.
available placeholders admin en Available placeholders available placeholders admin en Available placeholders
@ -230,6 +232,7 @@ disable minifying of javascript and css files admin en Disable minifying of java
disable wysiwyg-editor admin en Disable WYSIWYG-editor disable wysiwyg-editor admin en Disable WYSIWYG-editor
disabled (not recomended) admin en Disabled (not recommended) disabled (not recomended) admin en Disabled (not recommended)
display admin en Display display admin en Display
displayed length of input field (set rows=1 to limit length) admin en displayed length of input field (set rows=1 to limit length)
do not delete the category and return back to the list admin en Do NOT delete the category and return back to the list do not delete the category and return back to the list admin en Do NOT delete the category and return back to the list
do you also want to delete all global subcategories ? admin en Do you also want to delete all global sub categories? do you also want to delete all global subcategories ? admin en Do you also want to delete all global sub categories?
do you want to delete all global subcategories ? admin en Do you want to delete all global sub categories? do you want to delete all global subcategories ? admin en Do you want to delete all global sub categories?
@ -237,8 +240,8 @@ do you want to move all global subcategories one level down ? admin en Do you wa
document root (default) admin en Document root (default) document root (default) admin en Document root (default)
down admin en Down down admin en Down
download csv admin en Download CSV download csv admin en Download CSV
each value is a line like <id>[=<label>] admin en Each value is a line like <id>[=<label>] each value is a line like id[=label], or use @path to read options from a file in egroupware directory admin en each value is a line like id[=label], or use @path to read options from a file in EGroupware directory
each value is a line like id[=label] admin en Each value is a line like id[=label] each value is a line like label=[javascript] admin en each value is a line like label=[javascript]
edit account admin en Edit account edit account admin en Edit account
edit application admin en Edit application edit application admin en Edit application
edit email settings admin en Edit email settings edit email settings admin en Edit email settings
@ -400,6 +403,7 @@ leave the group untouched and return back to the list admin en Leave the group u
leave unchanged admin en Leave unchanged leave unchanged admin en Leave unchanged
leave without saveing the entry admin en Leave without saving the entry leave without saveing the entry admin en Leave without saving the entry
leaves without saveing admin en Leaves without saving leaves without saveing admin en Leaves without saving
length admin en Length
length<br>rows admin en Length<br>Rows length<br>rows admin en Length<br>Rows
limit global category to members of a certain group admin en Limit global category to members of a certain group. limit global category to members of a certain group admin en Limit global category to members of a certain group.
limit to members of admin en Limit to members of limit to members of admin en Limit to members of
@ -423,7 +427,6 @@ main email-address admin en Main email address
main screen message admin en Main screen message main screen message admin en Main screen message
manage mapping admin en Manage mapping manage mapping admin en Manage mapping
manager admin en Manager manager admin en Manager
max length of the input [, length of the inputfield (optional)] admin en Max length of the input [, length of the input field (optional)]
maximum account id (e.g. 65535 or 1000000) admin en Maximum account id, e.g. 65535 or 1000000 maximum account id (e.g. 65535 or 1000000) admin en Maximum account id, e.g. 65535 or 1000000
maximum entries in click path history admin en Maximum entries in click path history maximum entries in click path history admin en Maximum entries in click path history
members admin en Members members admin en Members
@ -527,6 +530,7 @@ return to admin mainscreen admin en Return to admin main screen
return to view account admin en Return to view account return to view account admin en Return to view account
rights admin en Rights rights admin en Rights
route all mails to admin en Route all Mails to route all mails to admin en Route all Mails to
rows admin en Rows
rpm or debian package admin en RPM or Debian package rpm or debian package admin en RPM or Debian package
run admin en run run admin en run
run asynchronous services admin en Run Asynchronous services run asynchronous services admin en Run Asynchronous services
@ -633,6 +637,7 @@ two months admin en Two months
two weeks admin en Two weeks two weeks admin en Two weeks
type '%1' already exists !!! admin en Type '%1' already exists! type '%1' already exists !!! admin en Type '%1' already exists!
type of customfield admin en Type of custom field type of customfield admin en Type of custom field
type of field admin en Type of field
under windows you need to install the asyncservice %1manually%2 or use the fallback mode. fallback means the jobs get only checked after each page-view !!! admin en Under windows you need to install the async service %1manually%2 or use the fallback mode. Fallback means the jobs get only checked after each page view! under windows you need to install the asyncservice %1manually%2 or use the fallback mode. fallback means the jobs get only checked after each page-view !!! admin en Under windows you need to install the async service %1manually%2 or use the fallback mode. Fallback means the jobs get only checked after each page view!
unknown account: %1 !!! admin en Unknown account: %1 ! unknown account: %1 !!! admin en Unknown account: %1 !
unknown command %1! admin en Unknown command %1! unknown command %1! admin en Unknown command %1!

16
admin/templates/default/customfield_edit.xet
View File

@ -4,10 +4,10 @@
<template id="admin.customfield_edit" template="" lang="" group="0" version="1.9.001"> <template id="admin.customfield_edit" template="" lang="" group="0" version="1.9.001">
<grid width="450px"> <grid width="450px">
<columns> <columns>
<column width="110"/> <column width="100"/>
<column width="350"/> <column width="350"/>
<column width="45"/> <column width="45"/>
<column width="30"/> <column width="50"/>
</columns> </columns>
<rows> <rows>
<row class="dialogHeader" height="28"> <row class="dialogHeader" height="28">
@ -28,7 +28,7 @@
</row> </row>
<row> <row>
<description value="Type of field"/> <description value="Type of field"/>
<customfields-types statustext="Type of customfield" id="cf_type" class="et2_fullWidth" span="2" onchange="widget.getRoot().getWidgetById('cf_values').set_statustext(widget.getArrayMgr('content').getEntry('options['+widget.getValue()+']')||''); <customfields-types statustext="Type of customfield" id="cf_type" class="et2_fullWidth" span="2" onchange="widget.getRoot().getWidgetById('cf_values').set_statustext(widget.egw().lang(widget.getArrayMgr('content').getEntry('options['+widget.getValue()+']'))||'');
widget.getRoot().getWidgetById('cf_len').set_disabled(!widget.getArrayMgr('content').getEntry('attributes['+widget.getValue()+'][cf_len]')); widget.getRoot().getWidgetById('cf_len').set_disabled(!widget.getArrayMgr('content').getEntry('attributes['+widget.getValue()+'][cf_len]'));
widget.getRoot().getWidgetById('cf_rows').set_disabled(!widget.getArrayMgr('content').getEntry('attributes['+widget.getValue()+'][cf_rows]')); widget.getRoot().getWidgetById('cf_rows').set_disabled(!widget.getArrayMgr('content').getEntry('attributes['+widget.getValue()+'][cf_rows]'));
widget.getRoot().getWidgetById('cf_values').set_disabled(!widget.getArrayMgr('content').getEntry('attributes['+widget.getValue()+'][cf_values]'));"/> widget.getRoot().getWidgetById('cf_values').set_disabled(!widget.getArrayMgr('content').getEntry('attributes['+widget.getValue()+'][cf_values]'));"/>
@ -42,17 +42,17 @@ widget.getRoot().getWidgetById('cf_values').set_disabled(!widget.getArrayMgr('co
<taglist-account class="et2_fullWidth" statustext="Select accounts for which the custom field should be visible" id="cf_private" rows="3" account_type="both" span="3" empty_label="Add user or group"/> <taglist-account class="et2_fullWidth" statustext="Select accounts for which the custom field should be visible" id="cf_private" rows="3" account_type="both" span="3" empty_label="Add user or group"/>
</row> </row>
<row> <row>
<description statustext="each value is a line like &lt;id&gt;[=&lt;label&gt;]" value="Options"/> <description statustext="each value is a line like id[=label], or use @path to read options from a file in EGroupware directory" value="Options"/>
<textbox multiline="true" statustext="@statustext" id="cf_values" rows="5" cols="30" span="3" width="99%"/> <textbox multiline="true" statustext="@statustext" id="cf_values" rows="5" cols="30" span="3" width="99%"/>
</row> </row>
<row> <row>
<description value="Attributes"/> <description value="Attributes"/>
<box span="3" class="attributes"> <box span="3" class="attributes">
<description value="Length:"/> <description value="Length"/>
<textbox statustext="max length of the input [, length of the inputfield (optional)]" id="cf_len" size="4"/> <textbox type="integer" statustext="displayed length of input field (set rows=1 to limit length)" id="cf_len" size="4"/>
<description value="Rows:"/> <description value="Rows"/>
<textbox type="integer" blur="1" statustext="number of row for a multiline inputfield or line of a multi-select-box" id="cf_rows" min="0" max="10" size="4"/> <textbox type="integer" blur="1" statustext="number of row for a multiline inputfield or line of a multi-select-box" id="cf_rows" min="0" max="10" size="4"/>
<description value="Order:"/> <description value="Order"/>
<textbox type="integer" statustext="determines the order the fields are displayed" id="cf_order" min="1" size="4"/> <textbox type="integer" statustext="determines the order the fields are displayed" id="cf_order" min="1" size="4"/>
</box> </box>
<description/> <description/>