From 68f549fbb6e4be28c7b73f6b79fa87a1034c2e3a Mon Sep 17 00:00:00 2001 From: Tomas Cohen Arazi Date: Mon, 1 Jul 2019 14:13:15 -0300 Subject: [PATCH] Bug 23246: (follow-up) Hardcoding tab position is not enough There are many conditions that determine the tab number for 'media'. Translated into variables that hold the tabs count on each condition, it is clear that '3' was not good enough: [%- holdings = (SeparateHoldings) ? 2 : 1 notes = (MARCNOTES || notes) ? 1 : 0 acq = (Koha.Preference('AcquisitionDetails')) ? 1 : 0 frbr = (FRBRizeEditions && XISBNS) ? 1 : 0 local_covers = (LocalCoverImages && (localimages || CAN_user_tools_upload_local_cover_images)) ? 1 : 0 media_tab = holdings + notes + acq + frbr + local_covers -%] This patch gets rid of the hardcoded value, adds an id to the 'media' tab (i.e. 'media_tab') and uses JS to get the right index. To test: - Play with the different options governing those variables => FAIL: 3 is not always the 'media' tab - Apply this patch - Repeat your tests => SUCCESS: It always picks the 'media' tab - Sign off :-D Sponsored-by: American Numismatics Society Signed-off-by: Maryse Simard Signed-off-by: Marcel de Rooy Signed-off-by: Martin Renvoize Signed-off-by: Joy Nelson (cherry picked from commit 0e21de15d61999183ea17624465ab0bc1a6c867e) Signed-off-by: Lucas Gass --- koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt index e21d1d7221..5efb32526b 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt @@ -171,7 +171,7 @@ [% END %] [% END %] -[% IF ( HTML5MediaEnabled ) %][% IF ( HTML5MediaSets ) %]
  • Play media
  • [% END %][% END %] +[% IF ( HTML5MediaEnabled ) %][% IF ( HTML5MediaSets ) %]
  • Play media
  • [% END %][% END %] [% IF ( Koha.Preference('NovelistSelectStaffEnabled') && Koha.Preference('NovelistSelectStaffProfile') && Koha.Preference('NovelistSelectStaffView') == 'tab' ) %] [% END %] @@ -903,7 +903,7 @@ $(document).ready(function() { $('#bibliodetails').tabs(); [% IF count == 0 and ( Koha.Preference('HTML5MediaEnabled') == 'staff' or Koha.Preference('HTML5MediaEnabled') == 'both' ) %] - $('#bibliodetails').tabs("option", "active", 3); + $('#bibliodetails').tabs("option", "active", $('#media_tab').index() ); [% END %] $('#search-form').focus(); $('.thumbnails > li > .remove').click(function() { -- 2.20.1