extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-27 09:09:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixed not shown customfields in addressbook index, if a not set one is in before

Browse Source
This commit is contained in:
Ralf Becker 2006-10-26 13:40:47 +00:00
parent 5bb1444e90
commit ff137bd345
3 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addressbook/inc/class.uicontacts.inc.php
View File

@ -708,7 +708,7 @@ class uicontacts extends bocontacts
{ {
foreach($this->customfields as $name => $data) foreach($this->customfields as $name => $data)
{ {
$row['customfields'][] = $customfields[$row['id']][$name]; $row['customfields'][] = $customfields[$row['id']][$name] ? $customfields[$row['id']][$name] : ' ';
} }
} }
if ($this->prefs['home_column'] != 'never' && !$homeaddress) if ($this->prefs['home_column'] != 'never' && !$homeaddress)

4
addressbook/setup/etemplates.inc.php
View File

File diff suppressed because one or more lines are too long

24
addressbook/templates/default/index.xet
View File

@ -2,7 +2,7 @@
<!-- $Id$ --> <!-- $Id$ -->
<overlay> <overlay>
<template id="addressbook.index.left" template="" lang="" group="0" version="1.3.001"> <template id="addressbook.index.left" template="" lang="" group="0" version="1.3.001">
<menulist span=",bold"> <menulist class="bold">
<menupopup data="" rows="1" cols="1" id="org_view" no_lang="1" statustext="Select a view" onchange="1" options="All contacts"/> <menupopup data="" rows="1" cols="1" id="org_view" no_lang="1" statustext="Select a view" onchange="1" options="All contacts"/>
</menulist> </menulist>
</template> </template>
@ -59,12 +59,12 @@
<description value="Photo"/> <description value="Photo"/>
<description value="Business address"/> <description value="Business address"/>
<description value="Home address"/> <description value="Home address"/>
<vbox orient=",0,0"> <vbox options="0,0">
<description id="tel_work" value="Business phone"/> <description id="tel_work" value="Business phone"/>
<description value="Mobile phone" id="tel_cell"/> <description value="Mobile phone" id="tel_cell"/>
<description id="tel_home" value="Home phone"/> <description id="tel_home" value="Home phone"/>
</vbox> </vbox>
<vbox orient=",0,0"> <vbox options="0,0">
<description id="url" value="Url"/> <description id="url" value="Url"/>
<description value="Business email" id="email"/> <description value="Business email" id="email"/>
<description id="email_home" value="Home email"/> <description id="email_home" value="Home email"/>
@ -86,7 +86,7 @@
</row> </row>
<row class="row" valign="top"> <row class="row" valign="top">
<image label="$row_cont[type_label]" src="${row}[type]" align="center" no_lang="1"/> <image label="$row_cont[type_label]" src="${row}[type]" align="center" no_lang="1"/>
<vbox id="${row}[id]" orient=",0,0"> <vbox options="0,0" id="${row}[id]">
<description id="${row}[line1]" no_lang="1"/> <description id="${row}[line1]" no_lang="1"/>
<description id="${row}[line2]" no_lang="1"/> <description id="${row}[line2]" no_lang="1"/>
<description id="${row}[org_unit]" no_lang="1"/> <description id="${row}[org_unit]" no_lang="1"/>
@ -94,36 +94,36 @@
<description id="${row}[first_org]" no_lang="1"/> <description id="${row}[first_org]" no_lang="1"/>
</vbox> </vbox>
<image src="${row}[photo]"/> <image src="${row}[photo]"/>
<vbox orient=",0,0"> <vbox options="0,0">
<description id="${row}[adr_one_countryname]" no_lang="1"/> <description id="${row}[adr_one_countryname]" no_lang="1"/>
<hbox orient="0,0,0"> <hbox options="0,0" orient="0">
<description no_lang="1" id="${row}[adr_one_locality]"/> <description no_lang="1" id="${row}[adr_one_locality]"/>
<description id="${row}[adr_one_postalcode]" class="leftPad5" value=" " no_lang="1"/> <description id="${row}[adr_one_postalcode]" class="leftPad5" value=" " no_lang="1"/>
</hbox> </hbox>
<description no_lang="1" id="${row}[adr_one_street]"/> <description no_lang="1" id="${row}[adr_one_street]"/>
<description id="${row}[adr_one_street2]" no_lang="1"/> <description id="${row}[adr_one_street2]" no_lang="1"/>
</vbox> </vbox>
<vbox orient=",0,0"> <vbox options="0,0">
<description id="${row}[adr_two_countryname]" no_lang="1"/> <description id="${row}[adr_two_countryname]" no_lang="1"/>
<hbox orient=",0,0"> <hbox options="0,0">
<description no_lang="1" id="${row}[adr_two_locality]"/> <description no_lang="1" id="${row}[adr_two_locality]"/>
<description id="${row}[adr_two_postalcode]" class="leftPad5" value=" " no_lang="1"/> <description id="${row}[adr_two_postalcode]" class="leftPad5" value=" " no_lang="1"/>
</hbox> </hbox>
<description no_lang="1" id="${row}[adr_two_street]"/> <description no_lang="1" id="${row}[adr_two_street]"/>
<description id="${row}[adr_two_street2]" no_lang="1"/> <description id="${row}[adr_two_street2]" no_lang="1"/>
</vbox> </vbox>
<vbox orient=",0,0"> <vbox options="0,0">
<description no_lang="1" id="${row}[tel_work]" class="telNumbers" options=",$row_cont[tel_work_link],,,calling,$cont[call_popup]"/> <description no_lang="1" id="${row}[tel_work]" class="telNumbers" options=",$row_cont[tel_work_link],,,calling,$cont[call_popup]"/>
<description id="${row}[tel_cell]" no_lang="1" class="telNumbers" options=",$row_cont[tel_cell_link],,,calling,$cont[call_popup]"/> <description id="${row}[tel_cell]" no_lang="1" class="telNumbers" options=",$row_cont[tel_cell_link],,,calling,$cont[call_popup]"/>
<description id="${row}[tel_home]" no_lang="1" class="telNumbers" options=",$row_cont[tel_home_link],,,calling,$cont[call_popup]"/> <description id="${row}[tel_home]" no_lang="1" class="telNumbers" options=",$row_cont[tel_home_link],,,calling,$cont[call_popup]"/>
<description id="${row}[tel_prefered]" no_lang="1" options=",$row_cont[tel_prefered_link],,,calling,$cont[call_popup]"/> <description id="${row}[tel_prefered]" no_lang="1" options=",$row_cont[tel_prefered_link],,,calling,$cont[call_popup]"/>
</vbox> </vbox>
<vbox orient=",0,0"> <vbox options="0,0">
<description options=",,1" class="fixedHeight" no_lang="1" id="${row}[url]"/> <description options=",,1" class="fixedHeight" no_lang="1" id="${row}[url]"/>
<description options=",@${row}[email_link],,,_blank,$row_cont[email_popup]" class="fixedHeight" id="${row}[email]" no_lang="1"/> <description options=",@${row}[email_link],,,_blank,$row_cont[email_popup]" class="fixedHeight" id="${row}[email]" no_lang="1"/>
<description options=",@${row}[email_home_link],,,_blank,$row_cont[email_home_popup]" class="fixedHeight" id="${row}[email_home]" no_lang="1"/> <description options=",@${row}[email_home_link],,,_blank,$row_cont[email_home_popup]" class="fixedHeight" id="${row}[email_home]" no_lang="1"/>
</vbox> </vbox>
<grid height="45" border="0" spacing="0" padding="0" overflow="auto"> <grid height="48" border="0" spacing="0" padding="0" overflow="auto">
<columns> <columns>
<column/> <column/>
</columns> </columns>
@ -133,7 +133,7 @@
</row> </row>
</rows> </rows>
</grid> </grid>
<hbox class="noPrint" orient="0,0"> <hbox options="0" class="noPrint" orient="0">
<image options="addressbook.uicontacts.view&amp;contact_id=$row_cont[id]" label="View" src="view"/> <image options="addressbook.uicontacts.view&amp;contact_id=$row_cont[id]" label="View" src="view"/>
<button image="edit" label="Edit" onclick="window.open(egw::link('/index.php','menuaction=addressbook.uicontacts.edit&amp;contact_id=$row_cont[id]'),'_blank','dependent=yes,width=850,height=440,scrollbars=yes,status=yes'); return false;" id="edit[$row_cont[id]]"/> <button image="edit" label="Edit" onclick="window.open(egw::link('/index.php','menuaction=addressbook.uicontacts.edit&amp;contact_id=$row_cont[id]'),'_blank','dependent=yes,width=850,height=440,scrollbars=yes,status=yes'); return false;" id="edit[$row_cont[id]]"/>
<button id="delete[$row_cont[id]]" image="delete" label="Delete" statustext="Delete this contact" onclick="return confirm('Delete this contact');"/> <button id="delete[$row_cont[id]]" image="delete" label="Delete" statustext="Delete this contact" onclick="return confirm('Delete this contact');"/>