From: Galen Charlton Date: Wed, 8 Jul 2015 21:35:43 +0000 (+0000) Subject: LP#1472787: fix expansion of wildcard eg-grid-field paths X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=6f3664ef41f354a7a7bfec15a77c4df1d4e0b147;p=evergreen%2Fmasslnc.git LP#1472787: fix expansion of wildcard eg-grid-field paths This fixes a bug where expansion of wildcard egGridField paths didn't handle a plain "*" correctly. To test: [1] In the web staff client, bring up the list of a patron's current loans. Add the grace period column to the grid, but note that the loans' grace period values are not actually displayed. [2] Apply the patch. [3] Refresh the browser and repeat step 1. This time, the grace period values are displayed. Signed-off-by: Galen Charlton Signed-off-by: Jason Stephenson --- diff --git a/Open-ILS/web/js/ui/default/staff/services/grid.js b/Open-ILS/web/js/ui/default/staff/services/grid.js index a3626e8cf5..e2c1c52553 100644 --- a/Open-ILS/web/js/ui/default/staff/services/grid.js +++ b/Open-ILS/web/js/ui/default/staff/services/grid.js @@ -1162,7 +1162,7 @@ angular.module('egGridMod', return; var col = cols.cloneFromScope(colSpec); - col.path = dotpath + '.' + field.name; + col.path = (dotpath ? dotpath + '.' + field.name : field.name); console.debug('egGrid: field: ' +field.name + '; parent field: ' + js2JSON(idl_field)); cols.add(col, false, true, {idl_parent : idl_field, idl_field : field, idl_class : class_obj});