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

* Infolog: Add filter by contact to export filters

Browse Source
This commit is contained in:
nathangray 2020-07-10 13:13:04 -06:00
parent bc253e0bd7
commit 13842ffb79
3 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/js/etemplate/et2_extension_customfields.js
View File

@ -490,7 +490,7 @@ var et2_customfields_list = /** @class */ (function (_super) {
// No label on the widget itself // No label on the widget itself
delete (attrs.label); delete (attrs.label);
attrs.type = "link-entry"; attrs.type = "link-entry";
attrs.only_app = field.type; attrs.only_app = typeof field.only_app == "undefined" ? field.type : field.only_app;
return true; return true;
}; };
et2_customfields_list.prototype._setup_filemanager = function (field_name, field, attrs) { et2_customfields_list.prototype._setup_filemanager = function (field_name, field, attrs) {

2
api/js/etemplate/et2_extension_customfields.ts
View File

@ -666,7 +666,7 @@ export class et2_customfields_list extends et2_valueWidget implements et2_IDetac
delete(attrs.label); delete(attrs.label);
attrs.type = "link-entry"; attrs.type = "link-entry";
attrs.only_app = field.type; attrs.only_app = typeof field.only_app == "undefined" ? field.type : field.only_app;
return true; return true;
} }

8
infolog/inc/class.infolog_export_csv.inc.php
View File

@ -294,6 +294,14 @@ class infolog_export_csv implements importexport_iface_export_plugin
// Infolog can't handle ranges in custom fields due to the way searching is done. // Infolog can't handle ranges in custom fields due to the way searching is done.
if(strpos($field_name, '#') === 0 && strpos($settings['type'],'date') === 0) unset($filters[$field_name]); if(strpos($field_name, '#') === 0 && strpos($settings['type'],'date') === 0) unset($filters[$field_name]);
} }
// Add in filtering by contact
$filters['info_contact'] = array(
'name' => 'info_contact',
'label' => 'Contact',
'type' => 'link-entry',
'only_app' => ''
);
} }
/** /**