Attachment #173460 for bug #33484

View | Details | Raw Unified | Return to bug 33484
Collapse All | Expand All




            $("#[% table_id | html %]_search_results").show();

            let table_dt = patrons_table.DataTable();
            let loaded_from_state = table_dt.settings()[0].loaded_from_state;
            if ( !loaded_from_state ) {
                [% FOR c IN columns %]
                    [% SWITCH c %]
                    [% CASE 'branch' %]
                        let library_id = patron_search_form.find(".branchcode_filter").val() || "";
                        patrons_table.find('thead tr:eq(1) th[data-filter="libraries"] select').val(library_id);
                        table_dt.column([% loop.count - 1 %]).search(library_id ? '^'+library_id+'$' : '');
                    [% CASE 'category' %]
                        let category_id = patron_search_form.find(".categorycode_filter").val() || "";
                        patrons_table.find('thead tr:eq(1) th[data-filter="categories"] select').val(category_id.toLowerCase());
                        table_dt.column([% loop.count - 1 %]).search(category_id ? '^'+category_id+'$' : '');
                    [% END %]
                [% END %]
                table_dt.search("");
            }
            first_draw = 1; // Only redirect if we are coming from here
            table_dt.draw();
            [% IF display_search_description %]




        const url = new URL(window.location.href);
        let state_from_url = url.searchParams.get( settings.nTable.id + '_state');
        if ( state_from_url ) {
            settings.loaded_from_state = true;
            return JSON.parse(atob(state_from_url));
        }


            delete state.search;
            state.columns.forEach(c => delete c.search );
        }
        settings.loaded_from_state = true;
        return state;
    }


                            'emptyTable': (options.emptyTable) ? options.emptyTable : __("No data available in table")
                        },
                        'ajax': _dt_default_ajax({default_filters, options}),
                        loaded_from_state: false,
                    }, options);
        }

- 

Return to bug 33484

Lines 869-887 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc (-12 / +15 lines)
869	$("#[% table_id \| html %]_search_results").show();	869	$("#[% table_id \| html %]_search_results").show();
870		870
871	let table_dt = patrons_table.DataTable();	871	let table_dt = patrons_table.DataTable();
872	[% FOR c IN columns %]	872	let loaded_from_state = table_dt.settings()[0].loaded_from_state;
873	[% SWITCH c %]	873	if ( !loaded_from_state ) {
874	[% CASE 'branch' %]	874	[% FOR c IN columns %]
875	let library_id = patron_search_form.find(".branchcode_filter").val() \|\| "";	875	[% SWITCH c %]
876	patrons_table.find('thead tr:eq(1) th[data-filter="libraries"] select').val(library_id);	876	[% CASE 'branch' %]
877	table_dt.column([% loop.count - 1 %]).search(library_id ? '^'+library_id+'$' : '');	877	let library_id = patron_search_form.find(".branchcode_filter").val() \|\| "";
878	[% CASE 'category' %]	878	patrons_table.find('thead tr:eq(1) th[data-filter="libraries"] select').val(library_id);
879	let category_id = patron_search_form.find(".categorycode_filter").val() \|\| "";	879	table_dt.column([% loop.count - 1 %]).search(library_id ? '^'+library_id+'$' : '');
880	patrons_table.find('thead tr:eq(1) th[data-filter="categories"] select').val(category_id.toLowerCase());	880	[% CASE 'category' %]
881	table_dt.column([% loop.count - 1 %]).search(category_id ? '^'+category_id+'$' : '');	881	let category_id = patron_search_form.find(".categorycode_filter").val() \|\| "";
		882	patrons_table.find('thead tr:eq(1) th[data-filter="categories"] select').val(category_id.toLowerCase());
		883	table_dt.column([% loop.count - 1 %]).search(category_id ? '^'+category_id+'$' : '');
		884	[% END %]
882	[% END %]	885	[% END %]
883	[% END %]	886	table_dt.search("");
884	table_dt.search("");	887	}
885	first_draw = 1; // Only redirect if we are coming from here	888	first_draw = 1; // Only redirect if we are coming from here
886	table_dt.draw();	889	table_dt.draw();
887	[% IF display_search_description %]	890	[% IF display_search_description %]

Lines 979-984 function _dt_save_restore_state(table_settings){ Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/js/datatables.js (-1 / +3 lines)
979	const url = new URL(window.location.href);	979	const url = new URL(window.location.href);
980	let state_from_url = url.searchParams.get( settings.nTable.id + '_state');	980	let state_from_url = url.searchParams.get( settings.nTable.id + '_state');
981	if ( state_from_url ) {	981	if ( state_from_url ) {
		982	settings.loaded_from_state = true;
982	return JSON.parse(atob(state_from_url));	983	return JSON.parse(atob(state_from_url));
983	}	984	}
984		985
Lines 993-998 function _dt_save_restore_state(table_settings){ Link Here
993	delete state.search;	994	delete state.search;
994	state.columns.forEach(c => delete c.search );	995	state.columns.forEach(c => delete c.search );
995	}	996	}
		997	settings.loaded_from_state = true;
996	return state;	998	return state;
997	}	999	}
998		1000
Lines 1040-1045 function _dt_save_restore_state(table_settings){ Link Here
1040	'emptyTable': (options.emptyTable) ? options.emptyTable : __("No data available in table")	1042	'emptyTable': (options.emptyTable) ? options.emptyTable : __("No data available in table")
1041	},	1043	},
1042	'ajax': _dt_default_ajax({default_filters, options}),	1044	'ajax': _dt_default_ajax({default_filters, options}),
		1045	loaded_from_state: false,
1043	}, options);	1046	}, options);
1044	}	1047	}
1045		1048
1046	-