https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=24866 --- Comment #1 from didier <didier.gautheron@biblibre.com> --- Created attachment 100688 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=100688&action=edit Bug 24866 - Display budget hierarchy in the budget dropdown menu used when placing a new order The rendering of SELECT elements is up to the browser. But Bug 16123 CSS code 'style="padding-left: xx' doesn't work on modern browsers. This patch replace CSS style attribute with   html entity. On supported platforms TEST PLAN : 1. Go to the Administration module 2. Add a new budget (ie : Budget 2020) 3. Add a fund to this budget (ie : Book) 4. Add a child fund (ie : Adult fiction) You will have this hierarchy : Budget 2020 |____ Book |_____ Adult fiction 5. Go to the Acquisition module 6. Select a vendor and create a new basket 7. Place an order 8. Check the budget dropdown menu BEFORE PATCH Book Adult fiction OR Book Adult fiction AFTER PATCH Book Adult fiction -- You are receiving this mail because: You are watching all bug changes. You are the assignee for the bug.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=24866 --- Comment #2 from Bernardo Gonzalez Kriegel <bgkriegel@gmail.com> --- Created attachment 101633 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=101633&action=edit Bug 24886: Reindent reports template This patch reindents the template for saved reports, replacing tabs with spaces and making indentation consistent. Some lines have been split up. To test, apply the patch and go to Reports -> Use saved. - Test adding, editing, viewing, and running reports - Test filtering by group and subgroup - Test the process of adding a guided report Everything should work as expected. Use your preferred method for checking the differences between files while ignoring whitespace. I use diff with the "-w" flag, but I'm not your dad. The only changes you see should be split lines. Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com> -- You are receiving this mail because: You are watching all bug changes. You are the assignee for the bug.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=24866 Bernardo Gonzalez Kriegel <bgkriegel@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |bgkriegel@gmail.com Attachment #101633|0 |1 is obsolete| | --- Comment #4 from Bernardo Gonzalez Kriegel <bgkriegel@gmail.com> --- Comment on attachment 101633 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=101633 Bug 24886: Reindent reports template Sorry, wrong bug -- You are receiving this mail because: You are watching all bug changes. You are the assignee for the bug.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=24866 --- Comment #6 from didier <didier.gautheron@biblibre.com> --- Created attachment 102274 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=102274&action=edit Bug 24866: Display budget hierarchy in the budget dropdown menu used when placing a new order The rendering of SELECT elements is up to the browser. But Bug 16123 CSS code 'style="padding-left: xx' doesn't work on modern browsers. This patch replace CSS style attribute with   html entity. On supported platforms TEST PLAN : 1. Go to the Administration module 2. Add a new budget (ie : Budget 2020) 3. Add a fund to this budget (ie : Book) 4. Add a child fund (ie : Adult fiction) You will have this hierarchy : Budget 2020 |____ Book |_____ Adult fiction 5. Go to the Acquisition module 6. Select a vendor and create a new basket 7. Place an order 8. Check the budget dropdown menu BEFORE PATCH Book Adult fiction OR Book Adult fiction AFTER PATCH Book Adult fiction -- You are receiving this mail because: You are the assignee for the bug. You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=24866 didier <didier.gautheron@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |Needs Signoff -- You are receiving this mail because: You are the assignee for the bug. You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=24866 David Nind <david@davidnind.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #102274|0 |1 is obsolete| | --- Comment #7 from David Nind <david@davidnind.com> --- Created attachment 102399 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=102399&action=edit Bug 24866: Display budget hierarchy in the budget dropdown menu used when placing a new order The rendering of SELECT elements is up to the browser. But Bug 16123 CSS code 'style="padding-left: xx' doesn't work on modern browsers. This patch replace CSS style attribute with   html entity. On supported platforms TEST PLAN : 1. Go to the Administration module 2. Add a new budget (ie : Budget 2020) 3. Add a fund to this budget (ie : Book) 4. Add a child fund (ie : Adult fiction) You will have this hierarchy : Budget 2020 |____ Book |_____ Adult fiction 5. Go to the Acquisition module 6. Select a vendor and create a new basket 7. Place an order 8. Check the budget dropdown menu BEFORE PATCH Book Adult fiction OR Book Adult fiction AFTER PATCH Book Adult fiction Signed-off-by: David Nind <david@davidnind.com> -- You are receiving this mail because: You are the assignee for the bug. You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=24866 didier <didier.gautheron@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #102399|0 |1 is obsolete| | --- Comment #9 from didier <didier.gautheron@biblibre.com> --- Created attachment 102453 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=102453&action=edit Bug 24866: Display budget hierarchy in the budget dropdown menu used when placing a new order The rendering of SELECT elements is up to the browser. But Bug 16123 CSS code 'style="padding-left: xx' doesn't work on modern browsers. This patch replace CSS style attribute with   html entity. On supported platforms TEST PLAN : 1. Go to the Administration module 2. Add a new budget (ie : Budget 2020) 3. Add a fund to this budget (ie : Book) 4. Add a sub-fund to fund Book (ie : Adult fiction) You will have this hierarchy : Budget 2020 |____ Book |_____ Adult fiction 5. Go to the Acquisition module 6. Select a vendor and create a new basket 7. Place an order 8. Check the budget dropdown menu BEFORE PATCH Book Adult fiction OR Book Adult fiction AFTER PATCH Book Adult fiction Signed-off-by: David Nind <david@davidnind.com> -- You are receiving this mail because: You are watching all bug changes. You are the assignee for the bug.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=24866 --- Comment #11 from Devinim <kohadevinim@devinim.com.tr> --- (In reply to didier from comment #10)

(In reply to Devinim from comment #8)

...

This patch did not work for us when we applied it, in vagrant environment with Firefox 74 .

Hi Windows/Mac Firefox or Linux? I retested with linux firefox 74.0.1, 2020-04-06 kodadevbox and it works for me.

One point, do you remember if you could collapse the fund tree in /cgi-bin/koha/admin/aqbudgets.pl ?

I modified the test plan, replaced Add a child fund to fund Book With what is in the option: Book fund Actions: Edit, Delete, Add sub fund Add a sub-fund to fund Book

Hi Didier, We catched the problem. If the size of the name of subfund is larger than the fund's name, it doesn't show indentation correctly. -- You are receiving this mail because: You are watching all bug changes. You are the assignee for the bug.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=24866 Jon Knight <J.P.Knight@lboro.ac.uk> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |J.P.Knight@lboro.ac.uk --- Comment #13 from Jon Knight <J.P.Knight@lboro.ac.uk> --- So does this bug still need signing off, or is it being abandoned? -- You are receiving this mail because: You are watching all bug changes. You are the assignee for the bug.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=24866 --- Comment #15 from Florian <florian.bontemps@biblibre.com> --- Created attachment 127487 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=127487&action=edit Bug 24866: (follow-up) Replaced tabulations by dashes The rendering of SELECT elements is up to the browser. But Bug 16123 CSS code 'style="padding-left: xx' doesn't work on modern browsers. Based on the previous contribution, this fix replaces CSS style attribute with dashes, creating a leveled structure that should work with most browsers. Tested on Linux Ubuntu with Firefox 94.0, Chromium 95.0.4 and Opera 81.0.1 TEST PLAN : 1. Go to the Administration module 2. Add a new budget (ie : Budget 2022) 3. Add a fund to this budget (ie : Book) 4. Add a sub-fund to fund Book (ie : Fiction) 5. Add another sub-fund, this time to sub-fund Book (ie : Adult fiction) You will have this hierarchy : Budget 2022 |____ Book |_____ Fiction |_____ Adult fiction 6. Go to the Acquisition module 7. Select a vendor and create a new basket 8. Place an order 9. Check the budget dropdown menu BEFORE PATCH Book Fiction Adult fiction OR Book Fiction Adult fiction AFTER PATCH Book -- Fiction -- -- Adult fiction Co-authored-by: Didier Gautheron <didier.gautheron@biblibre.com> -- You are receiving this mail because: You are watching all bug changes. You are the assignee for the bug.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=24866 Martin Renvoize <martin.renvoize@ptfs-europe.com> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |martin.renvoize@ptfs-europe | |.com --- Comment #17 from Martin Renvoize <martin.renvoize@ptfs-europe.com> --- I'm wondering whether we should convert the select to a select2 input? Then we can go back to using CSS ;) https://stackoverflow.com/questions/30820215/selectable-optgroups-in-select2... -- You are receiving this mail because: You are the assignee for the bug. You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=24866 --- Comment #19 from Fridolin Somers <fridolin.somers@biblibre.com> --- Great job Florian :D I suggest you replace : [% level_indent | $raw %] with : [% level_indent | html %] Iven if dashed does not need it. It is more secure. -- You are receiving this mail because: You are watching all bug changes. You are the assignee for the bug.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=24866 David Nind <david@davidnind.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Signed Off -- You are receiving this mail because: You are the assignee for the bug. You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=24866 David Nind <david@davidnind.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #127487|0 |1 is obsolete| | --- Comment #22 from David Nind <david@davidnind.com> --- Created attachment 128092 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=128092&action=edit Bug 24866: (follow-up) Replaced tabulations by dashes The rendering of SELECT elements is up to the browser. But Bug 16123 CSS code 'style="padding-left: xx' doesn't work on modern browsers. Based on the previous contribution, this fix replaces CSS style attribute with dashes, creating a leveled structure that should work with most browsers. Tested on Linux Ubuntu with Firefox 94.0, Chromium 95.0.4 and Opera 81.0.1 TEST PLAN : 1. Go to the Administration module 2. Add a new budget (ie : Budget 2022) 3. Add a fund to this budget (ie : Book) 4. Add a sub-fund to fund Book (ie : Fiction) 5. Add another sub-fund, this time to sub-fund Book (ie : Adult fiction) You will have this hierarchy : Budget 2022 |____ Book |_____ Fiction |_____ Adult fiction 6. Go to the Acquisition module 7. Select a vendor and create a new basket 8. Place an order 9. Check the budget dropdown menu BEFORE PATCH Book Fiction Adult fiction OR Book Fiction Adult fiction AFTER PATCH Book -- Fiction -- -- Adult fiction Co-authored-by: Didier Gautheron <didier.gautheron@biblibre.com> Signed-off-by: David Nind <david@davidnind.com> -- You are receiving this mail because: You are the assignee for the bug. You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=24866 David Nind <david@davidnind.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Text to go in the| |This improves the display release notes| |for selecting a fund when | |placing a new order in | |acquisitions. It now | |displays as a hierarchy | |instead of a list without | |any indentation, for | |example: | | | | Budget 2021 | | | |-- Book | | -- -- Adult | |fiction CC| |david@davidnind.com -- You are receiving this mail because: You are the assignee for the bug. You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=24866 Jonathan Druart <jonathan.druart+koha@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |jonathan.druart+koha@gmail. | |com --- Comment #24 from Jonathan Druart <jonathan.druart+koha@gmail.com> --- Next time please provide a change for the different occurrences. We are modifying only 1 dropdown when we have several in the codebase. -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=24866 Jonathan Druart <jonathan.druart+koha@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #128091|0 |1 is obsolete| | Attachment #128092|0 |1 is obsolete| | Attachment #128093|0 |1 is obsolete| | --- Comment #25 from Jonathan Druart <jonathan.druart+koha@gmail.com> --- Created attachment 129366 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=129366&action=edit Bug 24866: Display budget hierarchy in the budget dropdown menu used when placing a new order The rendering of SELECT elements is up to the browser. But Bug 16123 CSS code 'style="padding-left: xx' doesn't work on modern browsers. This patch replace CSS style attribute with   html entity. On supported platforms TEST PLAN : 1. Go to the Administration module 2. Add a new budget (ie : Budget 2020) 3. Add a fund to this budget (ie : Book) 4. Add a sub-fund to fund Book (ie : Adult fiction) You will have this hierarchy : Budget 2020 |____ Book |_____ Adult fiction 5. Go to the Acquisition module 6. Select a vendor and create a new basket 7. Place an order 8. Check the budget dropdown menu BEFORE PATCH Book Adult fiction OR Book Adult fiction AFTER PATCH Book Adult fiction Signed-off-by: David Nind <david@davidnind.com> Signed-off-by: David Nind <david@davidnind.com> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=24866 --- Comment #27 from Jonathan Druart <jonathan.druart+koha@gmail.com> --- Created attachment 129368 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=129368&action=edit Bug_24866: Changed $raw for html for extra safety Same test plan as before Signed-off-by: David Nind <david@davidnind.com> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=24866 Fridolin Somers <fridolin.somers@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Version(s)| |22.05.00 released in| | Status|Passed QA |Pushed to master -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=24866 Kyle M Hall <kyle@bywatersolutions.com> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |kyle@bywatersolutions.com Status|Pushed to master |Pushed to stable Version(s)|22.05.00 |22.05.00,21.11.02 released in| | --- Comment #30 from Kyle M Hall <kyle@bywatersolutions.com> --- Pushed to 21.11.x for 21.11.02 -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=24866 Victor Grousset/tuxayo <victor@tuxayo.net> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Pushed to oldstable |RESOLVED Resolution|--- |FIXED --- Comment #32 from Victor Grousset/tuxayo <victor@tuxayo.net> --- Not backported to oldoldstable (20.11.x). Feel free to ask if it's needed. -- You are receiving this mail because: You are watching all bug changes.