[Bug 11804] New: there should not be both a circ-menu.tt and a circ-menu.inc
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=11804 Bug ID: 11804 Summary: there should not be both a circ-menu.tt and a circ-menu.inc Change sponsored?: --- Product: Koha Version: master Hardware: All OS: All Status: NEW Severity: normal Priority: P5 - low Component: Architecture, internals, and plumbing Assignee: gmcharlt@gmail.com Reporter: gmcharlt@gmail.com QA Contact: testopia@bugs.koha-community.org koha/koha-tmpl/intranet-tmpl/prog/en/includes/ contains both a circ-menu.tt and a circ-menu.inc. circ-menu.tt contains the following comment: [%# duplicates circ-menu.inc but assumes all borrower attributes are in a borrower variable rather than in the global namespace %] circ-menu.tt is used only by the following templates: members/pay.tt members/paycollect.tt This is a blatant violation of the DRY principle, and some inconsistencies have appeared over the years: * the purchase suggestions tab doesn't show up when using the fine payment page * the logic for displaying the notices tab differs The duplication should be removed, perhaps as part of a larger project to make all of the patron and circulation pages use the same routine to grab information about the current patron. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=11804 paxed <pasi.kallinen@pttk.fi> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |pasi.kallinen@pttk.fi --- Comment #1 from paxed <pasi.kallinen@pttk.fi> --- Some additional differences have creeped into the files: -use of INCLUDE 'patron-title.inc' vs. hard-coded patron title. -IF-checking picture vs. checking has_picture. -TT filtering borrowernumber with uri vs. not filtering. Other stuff that could be improved: -Hard-coded css styles should be moved into external stylesheets. -patroncategory and patronlibrary do not separate field description from the field content, so impossible to style separately. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=11804 paxed <pasi.kallinen@pttk.fi> changed: What |Removed |Added ---------------------------------------------------------------------------- See Also| |http://bugs.koha-community. | |org/bugzilla3/show_bug.cgi? | |id=13543 -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=11804 Katrin Fischer <katrin.fischer@bsz-bw.de> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |katrin.fischer@bsz-bw.de --- Comment #2 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- Good catch, thx for linking to the other bug paxed. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=11804 Katrin Fischer <katrin.fischer@bsz-bw.de> changed: What |Removed |Added ---------------------------------------------------------------------------- See Also| |http://bugs.koha-community. | |org/bugzilla3/show_bug.cgi? | |id=13583 -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=11804 Katrin Fischer <katrin.fischer@bsz-bw.de> changed: What |Removed |Added ---------------------------------------------------------------------------- See Also| |http://bugs.koha-community. | |org/bugzilla3/show_bug.cgi? | |id=13582 -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=11804 Marc Véron <veron@veron.ch> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |veron@veron.ch --- Comment #3 from Marc Véron <veron@veron.ch> --- This bug seems to be resolved. Verifyed on current master: koha-tmpl/intranet-tmpl/prog/en/modules/members/paycollect.tt line 230: [% INCLUDE 'circ-menu.inc' %] koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt line 175: [% INCLUDE 'circ-menu.inc' %] git grep 'circ-menu.tt' members/boraccount.pl:#workaround for Bug 4041 to get rid of duplicated code in circ-menu.tt, use circ-menu.inc instad members/pay.pl: #workaround for Bug 4041 to get rid of duplicated code in circ-menu.tt, use circ-menu.inc instad members/paycollect.pl:#workaround for Bug 4041 to get rid of duplicated code in circ-menu.tt, use circ-menu.inc instad (...) -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=11804 --- Comment #4 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- Hi Mark, I think you are right, but it looks like we didn't remove the file. I will submit a patch. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=11804 Katrin Fischer <katrin.fischer@bsz-bw.de> changed: What |Removed |Added ---------------------------------------------------------------------------- Patch complexity|--- |Trivial patch Status|NEW |Needs Signoff -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=11804 --- Comment #5 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- Created attachment 39932 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=39932&action=edit Bug 11804: Remove unused circ-menu.tt The formerly used circ-menu.tt is no longer referenced in the templates and can be removed. To test: - Verify all tabs in the patron account still work as they should. - git grep circ-menu.tt -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=11804 --- Comment #6 from Bernardo Gonzalez Kriegel <bgkriegel@gmail.com> --- Created attachment 40316 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=40316&action=edit [SIGNED-OFF] Bug 11804: Remove unused circ-menu.tt The formerly used circ-menu.tt is no longer referenced in the templates and can be removed. To test: - Verify all tabs in the patron account still work as they should. - git grep circ-menu.tt Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com> No problems on patron pages, no more circ-menu.tt No errors -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=11804 Bernardo Gonzalez Kriegel <bgkriegel@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |bgkriegel@gmail.com Attachment #39932|0 |1 is obsolete| | -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=11804 Bernardo Gonzalez Kriegel <bgkriegel@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Signed Off -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=11804 Jonathan Druart <jonathan.druart@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Signed Off |Passed QA -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=11804 Jonathan Druart <jonathan.druart@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #40316|0 |1 is obsolete| | --- Comment #7 from Jonathan Druart <jonathan.druart@biblibre.com> --- Created attachment 40318 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=40318&action=edit Bug 14409: Remove references to circ-menu.tt Signed-off-by: Jonathan Druart <jonathan.druart@koha-community.org> Signed-off-by: Jonathan Druart <jonathan.druart@koha-community.org> -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=11804 Jonathan Druart <jonathan.druart@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #40318|0 |1 is obsolete| | --- Comment #8 from Jonathan Druart <jonathan.druart@biblibre.com> --- Created attachment 40319 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=40319&action=edit Bug 11804: Remove unused circ-menu.tt The formerly used circ-menu.tt is no longer referenced in the templates and can be removed. To test: - Verify all tabs in the patron account still work as they should. - git grep circ-menu.tt Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com> No problems on patron pages, no more circ-menu.tt No errors Signed-off-by: Jonathan Druart <jonathan.druart@koha-community.org> -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=11804 --- Comment #9 from Jonathan Druart <jonathan.druart@biblibre.com> --- Created attachment 40320 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=40320&action=edit Bug 11804: Remove references to circ-menu.tt Signed-off-by: Jonathan Druart <jonathan.druart@koha-community.org> -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=11804 Jonathan Druart <jonathan.druart@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Assignee|gmcharlt@gmail.com |katrin.fischer@bsz-bw.de CC| |jonathan.druart@biblibre.co | |m -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=11804 Tomás Cohen Arazi <tomascohen@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |tomascohen@gmail.com Status|Passed QA |Pushed to Master --- Comment #10 from Tomás Cohen Arazi <tomascohen@gmail.com> --- Patches pushed to master. Thanks Katrina and Jonathan! -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=11804 Chris Cormack <chris@bigballofwax.co.nz> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Pushed to Master |Pushed to Stable CC| |chris@bigballofwax.co.nz --- Comment #11 from Chris Cormack <chris@bigballofwax.co.nz> --- Pushed to 3.20.x will be in 3.20.2 -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=11804 Katrin Fischer <katrin.fischer@bsz-bw.de> changed: What |Removed |Added ---------------------------------------------------------------------------- Summary|there should not be both a |Merge circ-menu.tt and a |circ-menu.tt and a |circ-menu.inc |circ-menu.inc | -- You are receiving this mail because: You are watching all bug changes.
participants (1)
-
bugzilla-daemon＠bugs.koha-community.org