https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=41439 Martin Renvoize (ashimema) <martin.renvoize@openfifth.co.uk> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Patch doesn't apply |Signed Off --- Comment #50 from Martin Renvoize (ashimema) <martin.renvoize@openfifth.co.uk> --- Rebased on current main. Notes on the rebase: - Bug 31391 changed UseRecalls from a yes/no to a choice (off/opac/staff/opac_and_staff), and the circulation rules table now tests for != "off". I adapted the patches to match: the recalls column headers, the recalls column group and the Recalls toggle button are only shown when UseRecalls is not "off" (the JS check is Koha.prefs.UseRecalls != "off" instead of == 1, which would never be true for the new values). - The first patch conflicted on the headers (data-colname vs the new UseRecalls condition). The 'script tag tidying' and 'Make strings translatable' follow-ups needed their context adjusted for the same reason; their intent is unchanged. - Signed-off-by lines from Emmanuel Betemps and Michaela Sieber are carried over on the commits they were on. I rendered admin/smart-rules.pl in KTD with UseRecalls = staff and off: no template errors, and the recalls headers / column group / toggle appear only when enabled. koha-qa passes. Restoring status to Signed Off. The tabs-vs-filters question from comments 35-43 is still open and not changed by this rebase. -- You are receiving this mail because: You are watching all bug changes.