r56114 - /trunk/egroupware/api/js/etemplate/et2_extension_nextmatch.js

classic Classic list List threaded Threaded
1 message Options
nathangray nathangray
Reply | Threaded
Open this post in threaded view
|

r56114 - /trunk/egroupware/api/js/etemplate/et2_extension_nextmatch.js

Author: nathangray
Date: Tue May 10 19:12:39 2016
New Revision: 56114

URL: http://svn.stylite.de/viewvc/egroupware?rev=56114&view=rev
Log:
Fix customfield column sometimes disappearing from print

Modified:
    trunk/egroupware/api/js/etemplate/et2_extension_nextmatch.js

Modified: trunk/egroupware/api/js/etemplate/et2_extension_nextmatch.js
URL: http://svn.stylite.de/viewvc/egroupware/trunk/egroupware/api/js/etemplate/et2_extension_nextmatch.js?rev=56114&r1=56113&r2=56114&view=diff
==============================================================================
--- trunk/egroupware/api/js/etemplate/et2_extension_nextmatch.js (original)
+++ trunk/egroupware/api/js/etemplate/et2_extension_nextmatch.js Tue May 10 19:12:39 2016
@@ -2061,20 +2061,22 @@
  if(col.visibility === ET2_COL_VISIBILITY_VISIBLE) columns_selected.push(colName);
  }
  // Custom fields get listed separately
- if(widget.instanceOf(et2_nextmatch_customfields) && col.visibility === ET2_COL_VISIBILITY_VISIBLE)
- {
- if(jQuery.isEmptyObject(widget.customfields))
+ if(widget.instanceOf(et2_nextmatch_customfields))
+ {
+ delete(columns[colName]);
+ colName = widget.id;
+ if(col.visibility === ET2_COL_VISIBILITY_VISIBLE && !
+ jQuery.isEmptyObject(widget.customfields)
+ )
  {
- // No customfields defined, don't show column
- delete(columns[colName]);
- continue;
- }
- for(var field_name in widget.customfields)
- {
- columns[widget.prefix+field_name] = " - "+widget.customfields[field_name].label;
- if(widget.options.fields[field_name] && columns_selected.indexOf(colName) >= 0)
+ columns[colName] = col.caption;
+ for(var field_name in widget.customfields)
  {
- columns_selected.push(et2_customfields_list.prototype.prefix+field_name);
+ columns[widget.prefix+field_name] = " - "+widget.customfields[field_name].label;
+ if(widget.options.fields[field_name] && columns_selected.indexOf(colName) >= 0)
+ {
+ columns_selected.push(et2_customfields_list.prototype.prefix+field_name);
+ }
  }
  }
  }


------------------------------------------------------------------------------
Mobile security can be enabling, not merely restricting. Employees who
bring their own devices (BYOD) to work are irked by the imposition of MDM
restrictions. Mobile Device Manager Plus allows you to control only the
apps on BYO-devices by containerizing them, leaving personal data untouched!
https://ad.doubleclick.net/ddm/clk/304595813;131938128;j
_______________________________________________
eGroupWare-cvs mailing list
[hidden email]
https://lists.sourceforge.net/lists/listinfo/egroupware-cvs