From e6685702b814884a36c39f3f0afbb4b448dd93fa Mon Sep 17 00:00:00 2001 From: Bill Erickson Date: Wed, 25 Jun 2014 17:03:45 -0400 Subject: [PATCH] record bucket title links recovered Signed-off-by: Bill Erickson --- .../src/templates/staff/cat/bucket/record/t_view.tt2 | 9 +++++++++ Open-ILS/web/js/ui/default/staff/services/grid.js | 18 +++++++++++------- 2 files changed, 20 insertions(+), 7 deletions(-) diff --git a/Open-ILS/src/templates/staff/cat/bucket/record/t_view.tt2 b/Open-ILS/src/templates/staff/cat/bucket/record/t_view.tt2 index d3d95d391c..6943d59122 100644 --- a/Open-ILS/src/templates/staff/cat/bucket/record/t_view.tt2 +++ b/Open-ILS/src/templates/staff/cat/bucket/record/t_view.tt2 @@ -16,4 +16,13 @@ + + + + + {{item.title}} + + + + 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 fd71ac4213..3660eec306 100644 --- a/Open-ILS/web/js/ui/default/staff/services/grid.js +++ b/Open-ILS/web/js/ui/default/staff/services/grid.js @@ -74,6 +74,9 @@ angular.module('egGridMod', // link() is called after page compilation, which means our // eg-grid-field's have been parsed and loaded. Now it's // safe to perform our initial page load. + + // load auto fields after eg-grid-field's so they are not clobbered + scope.handleAutoFields(); scope.collect(); }, @@ -122,13 +125,15 @@ angular.module('egGridMod', defaultToNoMultiSort : (features.indexOf('-multisort') > -1) }); - if ($scope.autoFields) { - if (grid.autoLabel) { - $scope.mainLabel = - egCore.idl.classes[grid.idlClass].label; + $scope.handleAutoFields = function() { + if ($scope.autoFields) { + if (grid.autoLabel) { + $scope.mainLabel = + egCore.idl.classes[grid.idlClass].label; + } + grid.columnsProvider.compileAutoColumns(); + delete $scope.autoFields; } - grid.columnsProvider.compileAutoColumns(); - delete $scope.autoFields; } if (!grid.dataProvider) { @@ -920,7 +925,6 @@ angular.module('egGridMod', } cols.compileAutoColumns = function() { - var idl_class = egCore.idl.classes[cols.idlClass]; angular.forEach( -- 2.11.0