Attachment #165810 for bug #36064

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




              });
            });

            var hash = document.location.hash;
            if( hash !== "" ){
                /* The existence of location.hash means someone clicked a link which targets a specific tab */
                $( hash ).tab("show");
            } else {
                /* If no specific tab was linked to, use the last active tab */
                var activeTab = localStorage.getItem("waitingreserves_activetab");
                if( activeTab ){
                    $("div#resultlist li:eq(" + activeTab + ") a").tab("show");
                }
            }

            $("div#resultlist a[data-toggle='tab']").on("shown.bs.tab", function (e) {
                var thisTab = $(e.target).parent();
                var activeTab = thisTab.index();

Lines 268-277 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt (-3 / +2 lines)
268	<span class="pending-number-link">[% new_curbside_pickups.count \| html %]</span>	268	<span class="pending-number-link">[% new_curbside_pickups.count \| html %]</span>
269	</div>	269	</div>
270	[% END %]	270	[% END %]
271		271
272	[% IF holds_with_cancellation_requests && CAN_user_circulate_circulate_remaining_permissions %]	272	[% IF holds_with_cancellation_requests && CAN_user_circulate_circulate_remaining_permissions %]
273	<div class="pending-info" id="holds_with_cancellation_requests">	273	<div class="pending-info" id="holds_with_cancellation_requests">
274	<a href="/cgi-bin/koha/circ/waitingreserves.pl?allbranches=1#holdscancelled_panel">Holds with cancellation requests</a>:	274	<a href="/cgi-bin/koha/circ/waitingreserves.pl?allbranches=1#holdscancelled-tab">Holds with cancellation requests</a>:
275	<span class="pending-number-link">[% holds_with_cancellation_requests \| html %]</span>	275	<span class="pending-number-link">[% holds_with_cancellation_requests \| html %]</span>
276	</div>	276	</div>
277	[% END %]	277	[% END %]
278	-

Return to bug 36064

Lines 300-309 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt (-3 / +11 lines)
300	});	300	});
301	});	301	});
302		302
303	var activeTab = localStorage.getItem("waitingreserves_activetab");	303	var hash = document.location.hash;
304	if( activeTab ){	304	if( hash !== "" ){
305	$("div#resultlist li:eq(" + activeTab + ") a").tab("show");	305	/* The existence of location.hash means someone clicked a link which targets a specific tab */
		306	$( hash ).tab("show");
		307	} else {
		308	/* If no specific tab was linked to, use the last active tab */
		309	var activeTab = localStorage.getItem("waitingreserves_activetab");
		310	if( activeTab ){
		311	$("div#resultlist li:eq(" + activeTab + ") a").tab("show");
		312	}
306	}	313	}
		314
307	$("div#resultlist a[data-toggle='tab']").on("shown.bs.tab", function (e) {	315	$("div#resultlist a[data-toggle='tab']").on("shown.bs.tab", function (e) {
308	var thisTab = $(e.target).parent();	316	var thisTab = $(e.target).parent();
309	var activeTab = thisTab.index();	317	var activeTab = thisTab.index();