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

* Tracker CRM bugfixes

Browse Source 
- fix tracker CRM view switching to all tickets when changing single/multi queue
- Fix wrong selectbox options in tracker nm when there are no rows for the entry
- Fix tracker CRM view stops working after filtering
This commit is contained in:
Nathan Gray 2015-09-29 17:06:53 +00:00
parent 5ac8ef6193
commit 90e5e91271
2 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addressbook/js/app.js
View File

@ -51,7 +51,7 @@ app.classes.addressbook = AppJS.extend(
// r49769 let's CRM view run under currentapp == "addressbook", which causes // r49769 let's CRM view run under currentapp == "addressbook", which causes
// app.addressbook.et2_ready called before app.infolog.et2_ready and therefore // app.addressbook.et2_ready called before app.infolog.et2_ready and therefore
// app.addressbook.et2 would point to infolog template, if we not stop here // app.addressbook.et2 would point to infolog template, if we not stop here
if (name.match(/^infolog\./)) return; if (name.match(/^infolog|tracker\./)) return;
// call parent // call parent
this._super.apply(this, arguments); this._super.apply(this, arguments);

12
etemplate/inc/class.etemplate_widget_nextmatch.inc.php
View File

@ -659,17 +659,7 @@ class etemplate_widget_nextmatch extends etemplate_widget
{ {
foreach($row as &$options) foreach($row as &$options)
{ {
foreach($options as &$label) etemplate_widget_menupopup::fix_encoded_options($options, true);
{
if(!is_array($label))
{
$label = html_entity_decode($label, ENT_NOQUOTES,'utf-8');
}
else if ($label['label'])
{
$label['label'] = html_entity_decode($label['label'], ENT_NOQUOTES,'utf-8');
}
}
} }
} }
$rows[$n] = $row; $rows[$n] = $row;