extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-16 21:13:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

- Allow app attribute to be specified in the template file, not just at run-time

Browse Source 
- Use app attribute to fix infolog customfields in addressbook CRM view
This commit is contained in:
Ralf Becker 2015-02-10 09:38:15 +00:00
parent 374dcb5d64
commit a964f2e8f2
2 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
etemplate/inc/class.etemplate_widget_customfields.inc.php
View File

@ -90,15 +90,23 @@ class etemplate_widget_customfields extends etemplate_widget_transformer
$form_name = self::form_name($cname, $this->id, $expand); $form_name = self::form_name($cname, $this->id, $expand);
// Store properties at top level, so all customfield widgets can share // Store properties at top level, so all customfield widgets can share
if($this->attrs['app'])
{
$app = $this->attrs['app'];
}
else
{
$app =& $this->getElementAttribute(self::GLOBAL_VALS, 'app'); $app =& $this->getElementAttribute(self::GLOBAL_VALS, 'app');
if($this->getElementAttribute($form_name, 'app')) if($this->getElementAttribute($form_name, 'app'))
{ {
$app =& $this->getElementAttribute($form_name, 'app'); $app =& $this->getElementAttribute($form_name, 'app');
} else }
else
{ {
// Checking creates it even if it wasn't there // Checking creates it even if it wasn't there
unset(self::$request->modifications[$form_name]['app']); unset(self::$request->modifications[$form_name]['app']);
} }
}
if($this->getElementAttribute($form_name, 'customfields')) if($this->getElementAttribute($form_name, 'customfields'))
{ {

4
infolog/templates/default/index.xet
View File

@ -55,7 +55,7 @@
</row> </row>
</rows> </rows>
</grid> </grid>
<nextmatch-customfields id="customfields"/> <nextmatch-customfields id="customfields" app="infolog"/>
<nextmatch-header label="Category" id="cat_id"/> <nextmatch-header label="Category" id="cat_id"/>
<vbox> <vbox>
<nextmatch-sortheader label="Startdate" id="info_startdate" sortmode="DESC"/> <nextmatch-sortheader label="Startdate" id="info_startdate" sortmode="DESC"/>
@ -95,7 +95,7 @@
</box> </box>
<link-string id="${row}[filelinks]"/> <link-string id="${row}[filelinks]"/>
</vbox> </vbox>
<customfields-list id="$row" class="customfields"/> <customfields-list id="$row" class="customfields" app="infolog"/>
<menulist> <menulist>
<menupopup type="select-cat" id="${row}[info_cat]" readonly="true"/> <menupopup type="select-cat" id="${row}[info_cat]" readonly="true"/>
</menulist> </menulist>