bug hunting and a (small) new set of widget code
[Evergreen.git] / Open-ILS / src / reporter / templates / widget_manip
index a470b5b..62af297 100644 (file)
@@ -18,9 +18,9 @@ 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') _ "']";
+                       link_text_xpath = '../../links/link[@field="' _ c.findvalue('@name') _ '" and (not(@hidden) or @hidden!="false")]';
                        NEXT IF c.findnodes(link_text_xpath);
                        columns.push(c);
                END;
@@ -41,7 +41,7 @@ BLOCK widget_selector;
                                INCLUDE $column_input_type
                                        name="filter:$linkid"
                                        value=column_name
-                                       checked=1
+                                       checked=0
                                column.findvalue('label');
                        END;
                        WRAPPER html/cell;