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

* Addressbook/Tracker/other apps: custom-fields were not saved (existing custom-fields and InfoLog worked)

Browse Source
This commit is contained in:
Ralf Becker 2014-10-02 09:28:02 +00:00
parent 3cee4332ee
commit 00725d776c
2 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -70,7 +70,7 @@ class customfields
if(!$this->appname) die(lang('Error! No appname found')); if(!$this->appname) die(lang('Error! No appname found'));
translation::add_app('infolog'); // til we move the translations translation::add_app('infolog'); // til we move the translations
$this->tmpl = new etemplate(); $this->tmpl = new etemplate_new();
// do we manage content-types? // do we manage content-types?
if($this->tmpl->read($this->appname.'.admin.types')) $this->manage_content_types = true; if($this->tmpl->read($this->appname.'.admin.types')) $this->manage_content_types = true;
$this->fields = egw_customfields::get($this->appname,true); $this->fields = egw_customfields::get($this->appname,true);
@ -125,7 +125,7 @@ class customfields
{ {
break; break;
} }
//fall through //fall through
case 'cancel': case 'cancel':
egw::redirect_link('/index.php', array('menuaction'=>'admin.admin_ui.index','ajax'=>'true'), 'admin'); egw::redirect_link('/index.php', array('menuaction'=>'admin.admin_ui.index','ajax'=>'true'), 'admin');
} }

19
admin/templates/default/customfields.xet
View File

@ -18,7 +18,7 @@
<menulist> <menulist>
<menupopup id="types" no_lang="1" onchange="1"/> <menupopup id="types" no_lang="1" onchange="1"/>
</menulist> </menulist>
<button label="Delete" id="delete" onclick="et2_dialog.confirm(widget,'WARNING: You are about to delete this type. Entries of this type won\'t be accessable then.','Delete')"/> <button label="Delete" id="delete" onclick="return confirm('WARNING: You are about to delete this type. Entries of this type won\'t be accessable then.');"/>
<textbox blur="new name" id="name"/> <textbox blur="new name" id="name"/>
<button label="Create" id="create"/> <button label="Create" id="create"/>
</row> </row>
@ -40,10 +40,10 @@
</columns> </columns>
<rows> <rows>
<row class="th"> <row class="th">
<description value="Type"/>
<description statustext="the name used internaly (&lt;= 20 chars), changeing it makes existing data unavailible" value="Name"/> <description statustext="the name used internaly (&lt;= 20 chars), changeing it makes existing data unavailible" value="Name"/>
<description value="Label"/> <description value="Label"/>
<description value="Subtype"/> <description value="Type of field"/>
<description value="Type"/>
<description value="Private"/> <description value="Private"/>
<description statustext="each value is a line like &lt;id&gt;[=&lt;label&gt;]" value="Options"/> <description statustext="each value is a line like &lt;id&gt;[=&lt;label&gt;]" value="Options"/>
<vbox> <vbox>
@ -54,19 +54,17 @@
<description align="center" statustext="deletes this field" value="Action"/> <description align="center" statustext="deletes this field" value="Action"/>
</row> </row>
<row class="row" valign="top"> <row class="row" valign="top">
<listbox statustext="for which types should this field be used" id="${row}[type2]" no_lang="1" rows="3"/>
<textbox statustext="the name used internaly (&lt;= 20 chars), changeing it makes existing data unavailible" id="${row}[name]" size="20" maxlength="32"/> <textbox statustext="the name used internaly (&lt;= 20 chars), changeing it makes existing data unavailible" id="${row}[name]" size="20" maxlength="32"/>
<vbox> <vbox>
<textbox statustext="the text displayed to the user" id="${row}[label]" maxlength="255"/> <textbox statustext="the text displayed to the user" id="${row}[label]" maxlength="255"/>
<description id="${row}[label]"/> <description id="${row}[label]"/>
</vbox> </vbox>
<menulist> <vbox>
<menupopup id="${row}[type2]" no_lang="1" options="All"/>
</menulist>
<vbox options="0,0">
<customfields-types statustext="Type of customfield" id="{$row}[type]"/> <customfields-types statustext="Type of customfield" id="{$row}[type]"/>
<checkbox label="required" id="${row}[needed]"/> <checkbox label="required" id="${row}[needed]"/>
</vbox> </vbox>
<listbox type="select-account" align="center" statustext="Select accounts for which the custom field should be visible" id="${row}[private]" rows="3" options="both"/> <taglist-account statustext="Select accounts for which the custom field should be visible" id="${row}[private]" rows="3" account_type="both"/>
<textbox multiline="true" statustext="each value is a line like id[=label]" id="${row}[values]" rows="4" cols="30"/> <textbox multiline="true" statustext="each value is a line like id[=label]" id="${row}[values]" rows="4" cols="30"/>
<vbox> <vbox>
<textbox statustext="max length of the input [, length of the inputfield (optional)]" id="${row}[len]" size="5"/> <textbox statustext="max length of the input [, length of the inputfield (optional)]" id="${row}[len]" size="5"/>
@ -94,7 +92,7 @@
</columns> </columns>
<rows> <rows>
<row> <row>
<description align="center" id="error_msg" no_lang="1" span="all" class="redItalic"/> <description align="center" id="error_msg" no_lang="1" span="all" class="msg"/>
<description/> <description/>
<description/> <description/>
<description/> <description/>
@ -120,8 +118,5 @@
</row> </row>
</rows> </rows>
</grid> </grid>
<styles>
.redItalic { color: red; font-style: italics; }
</styles>
</template> </template>
</overlay> </overlay>