extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-22 06:30:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

also replace <description/> and remove unnecessary empty <description/> from infolog.index

Browse Source
This commit is contained in:
ralf 2022-06-08 18:26:42 +02:00
parent 7268cde359
commit 136b6e82d0
2 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
api/etemplate.php
View File

@ -151,7 +151,8 @@ function send_template()
'<et2-$1-expose $2 $3></et2-$1-expose>', $str); '<et2-$1-expose $2 $3></et2-$1-expose>', $str);
// modify <(vfs-mime|link-string|link-list) --> <et2-* // modify <(vfs-mime|link-string|link-list) --> <et2-*
$str = preg_replace(ADD_ET2_PREFIX_LEGACY_REGEXP, '<et2-$1 $2></et2-$1>', $str); $str = preg_replace(ADD_ET2_PREFIX_LEGACY_REGEXP, '<et2-$1 $2></et2-$1>',
str_replace('<description/>', '<et2-description></et2-description>', $str));
// ^^^^^^^^^^^^^^^^ above widgets get transformed independent of legacy="true" set in overlay ^^^^^^^^^^^^^^^^^^ // ^^^^^^^^^^^^^^^^ above widgets get transformed independent of legacy="true" set in overlay ^^^^^^^^^^^^^^^^^^

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

@ -99,13 +99,10 @@
<date-time id="${row}[info_datecompleted]" readonly="true" class="infolog_fixedHeight"/> <date-time id="${row}[info_datecompleted]" readonly="true" class="infolog_fixedHeight"/>
</vbox> </vbox>
<vbox> <vbox>
<hbox readonly="true"> <hbox>
<hbox readonly="true"> <date-duration id="${row}[info_used_time]" readonly="true" select_unit="true" display_format="@@duration_format" disabled="!$row_cont[info_used_time]"/>
<date-duration id="${row}[info_used_time]" readonly="true" select_unit="true" display_format="@@duration_format" disabled="!$row_cont[info_used_time]"/> <date-duration id="${row}[info_sum_timesheets]" readonly="true" select_unit="true" display_format="@@duration_format" class="timesheet"/>
<date-duration id="${row}[info_sum_timesheets]" readonly="true" select_unit="true" display_format="@@duration_format" class="timesheet"/> </hbox>
</hbox>
<description/>
</hbox>
<date-duration id="${row}[info_planned_time]" readonly="true" display_format="@@duration_format" select_unit="true" span="all" class="infolog_planned"/> <date-duration id="${row}[info_planned_time]" readonly="true" display_format="@@duration_format" select_unit="true" span="all" class="infolog_planned"/>
</vbox> </vbox>
<vbox> <vbox>
@ -212,7 +209,6 @@
</vbox> </vbox>
</box> </box>
</hbox> </hbox>
<description/>
</row> </row>
</rows> </rows>
</grid> </grid>