From 7e57531dae4ef31437ff4cafba16bc9bd7f3a3aa Mon Sep 17 00:00:00 2001 From: erickson Date: Wed, 25 Mar 2009 16:57:04 +0000 Subject: [PATCH] when non-IDL fields are added to the grid and a field order is defined, plop the explicit columns onto the end git-svn-id: svn://svn.open-ils.org/ILS/trunk@12667 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- Open-ILS/web/js/dojo/openils/widget/AutoGrid.js | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/Open-ILS/web/js/dojo/openils/widget/AutoGrid.js b/Open-ILS/web/js/dojo/openils/widget/AutoGrid.js index cef19da353..060a67ef8c 100644 --- a/Open-ILS/web/js/dojo/openils/widget/AutoGrid.js +++ b/Open-ILS/web/js/dojo/openils/widget/AutoGrid.js @@ -72,7 +72,6 @@ if(!dojo._hasResource['openils.widget.AutoGrid']) { if(fields.filter(function(i){return (i.field == field.name)})[0]) continue; - if(!this.showSequenceFields && field.name == this.fmIDL.pkey && this.fmIDL.pkey_sequence) continue; var entry = existing.filter(function(i){return (i.field == field.name)})[0]; @@ -81,6 +80,18 @@ if(!dojo._hasResource['openils.widget.AutoGrid']) { pushEntry(entry); } + if(this.fieldOrder) { + /* append any explicit non-IDL grid fields to the end */ + for(var e in existing) { + var entry = existing[e]; + var field = fields.filter( + function(i){return (i.field == entry.field)})[0]; + if(field) continue; // don't duplicate + pushEntry(entry); + } + } + + return [{cells: [fields]}]; }, -- 2.11.0