support filtering on primary key of dims
authormiker <miker@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Fri, 2 Dec 2005 21:26:47 +0000 (21:26 +0000)
committermiker <miker@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Fri, 2 Dec 2005 21:26:47 +0000 (21:26 +0000)
git-svn-id: svn://svn.open-ils.org/ILS/trunk@2175 dcc99617-32d9-48b4-a31d-7c20da2025e4

Open-ILS/src/reporter/templates/stage2.ttk
Open-ILS/src/reporter/templates/widget_manip

index e6865fb..3ce0a48 100644 (file)
@@ -510,13 +510,13 @@ BLOCK show_filter_atts;
                END;
        END;
 
-       fields_xpath = 'fields/field[not(@primary) or @primary != "true"]';
+       fields_xpath = 'fields/field[(not(@primary) or @primary != "true") or @filterable="true"]';
 
 
        count = 1;
 
        FOR field = table.findnodes(fields_xpath);
-               link_test = '../../links/link[@field="' _ field.findvalue('@name') _ '"]';
+               link_test = '../../links/link[@field="' _ field.findvalue('@name') _ '" and @hidden!="false"]';
                logme(['link_test',link_test]);
                NEXT IF field.findnodes( link_test );
 
index ffac035..fc82b56 100644 (file)
@@ -18,7 +18,7 @@ BLOCK widget_selector;
                choose_base_cols = 1;
                columns_xpath =
                        '/reporter/tables/table[@id="' _ tableid _
-                       '"]/fields/field[not(@primary) or @primary!="true"]';
+                       '"]/fields/field[(not(@primary) or @primary!="true") or @filterable="true"]';
                FOR c = config.findnodes(columns_xpath);
                        link_text_xpath = "../../links/link[@field='" _ c.findvalue('@name') _ "']";
                        NEXT IF c.findnodes(link_text_xpath);