From 30bddfcf5f2318c8ab7d3ba3751be55e71e22ae8 Mon Sep 17 00:00:00 2001 From: Mike Rylander Date: Fri, 14 Aug 2020 10:35:06 -0400 Subject: [PATCH] LP#1858114: Record template filter values for aggregate columns Currently the "having" clause does not record template-level filter values in the template, but forces use of a report-level parameter. This commit allows "having" to receive a value in the same way that "where" does. Signed-off-by: Mike Rylander Signed-off-by: Angela Kilsdonk Signed-off-by: Jason Boyer --- Open-ILS/web/js/ui/default/staff/reporter/template/app.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Open-ILS/web/js/ui/default/staff/reporter/template/app.js b/Open-ILS/web/js/ui/default/staff/reporter/template/app.js index aa5ca37619..07a39bf9bb 100644 --- a/Open-ILS/web/js/ui/default/staff/reporter/template/app.js +++ b/Open-ILS/web/js/ui/default/staff/reporter/template/app.js @@ -230,7 +230,11 @@ function($scope , $q , $routeParams , $location , $timeout , $window, egCore , return !!i.transform.aggregate; }).map(function (i) { var cond = {}; - cond[i.operator.op] = '::P' + param_counter++; + if (i.value === undefined) { + cond[i.operator.op] = '::P' + param_counter++; + }else { + cond[i.operator.op] = i.value; + } return { alias : i.label, path : i.path[i.path.length - 1].classname + '-' + i.name, -- 2.43.2