[Bug 8117] New: Divide budget periods into two tabs
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8117 Priority: P5 - low Change sponsored?: --- Bug ID: 8117 Assignee: henridamien@koha-fr.org Summary: Divide budget periods into two tabs Severity: enhancement Classification: Unclassified OS: All Reporter: jonathan.druart@biblibre.com Hardware: All Status: NEW Version: unspecified Component: Acquisitions Product: Koha Budget periods are now divided into two tabs : active and inactive budget periods. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8117 Jonathan Druart <jonathan.druart@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Assignee|henridamien@koha-fr.org |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=8117 --- Comment #1 from Jonathan Druart <jonathan.druart@biblibre.com> --- Created attachment 9634 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=9634&action=edit Bug 5849: Divide budget periods into two tabs -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8117 Jonathan Druart <jonathan.druart@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- 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=8117 Jonathan Druart <jonathan.druart@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #9634|0 |1 is obsolete| | --- Comment #2 from Jonathan Druart <jonathan.druart@biblibre.com> --- Created attachment 9635 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=9635&action=edit Bug 8117: Divide budget periods into two tabs -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8117 Nicole C. Engard <nengard@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |nengard@gmail.com -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8117 --- Comment #3 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- Created attachment 10138 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=10138&action=edit screenshot of budget page Hi Jonathan, the javasript page on the page seems to be broken for me. I tried refreshing the cache and closing the browser completely. I think it should not be separate tables but tabs? Perhaps patch could also make use of the Koha dates plugin? :) -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8117 Katrin Fischer <katrin.fischer@bsz-bw.de> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Failed QA CC| |katrin.fischer@bsz-bw.de -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8117 --- Comment #4 from Jonathan Druart <jonathan.druart@biblibre.com> --- Created attachment 10160 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=10160&action=edit Bug 8117: Followup: FIX compatibility for the new version of jQuery tabs -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8117 --- Comment #5 from Jonathan Druart <jonathan.druart@biblibre.com> --- Created attachment 10161 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=10161&action=edit Bug 8117: Followup: Use the KohaDates plugin in aqbudgetperiods.tt -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8117 Jonathan Druart <jonathan.druart@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Failed QA |Needs Signoff -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8117 Katrin Fischer <katrin.fischer@bsz-bw.de> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #9635|0 |1 is obsolete| | Attachment #10160|0 |1 is obsolete| | Attachment #10161|0 |1 is obsolete| | --- Comment #6 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- Created attachment 10178 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=10178&action=edit [SIGNED-OFF] Bug 8117: Divide budget periods into two tabs Budget periods are now divided into two tabs : active and inactive budget periods. The original author of this patch is Julian Maurice Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8117 --- Comment #7 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- Created attachment 10179 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=10179&action=edit [SIGNED-OFF] Bug 8117: Followup: FIX compatibility for the new version of jQuery tabs Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8117 --- Comment #8 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- Created attachment 10180 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=10180&action=edit [SIGNED-OFF] Bug 8117: Followup: Use the KohaDates plugin in aqbudgetperiods.tt Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8117 Katrin Fischer <katrin.fischer@bsz-bw.de> 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=8117 Michael Davis <m.r.davis@cranfield.ac.uk> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Signed Off |Failed QA CC| |m.r.davis@cranfield.ac.uk --- Comment #9 from Michael Davis <m.r.davis@cranfield.ac.uk> --- Looks really good, and I think this is a really good feature. However, it fails a javascript validation error when the patch is applied. To recreate, add two active budgets, apply patch, refresh budgets page. DataTables warning (table id = 'inactiveperiodst'): Requested unknown parameter '1' from the data source for row 0 -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8117 --- Comment #10 from Jonathan Druart <jonathan.druart@biblibre.com> --- Created attachment 10231 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=10231&action=edit Bug 8117: Followup Move the "no budget" string outside the table Hi Michael, Thanks for testing. I can't reproduce your javascript error. Could you test with this followup please ? -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8117 Jonathan Druart <jonathan.druart@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Failed QA |Needs Signoff -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8117 Michael Davis <m.r.davis@cranfield.ac.uk> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #10178|0 |1 is obsolete| | Attachment #10179|0 |1 is obsolete| | Attachment #10180|0 |1 is obsolete| | Attachment #10231|0 |1 is obsolete| | --- Comment #11 from Michael Davis <m.r.davis@cranfield.ac.uk> --- Created attachment 10235 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=10235&action=edit [SIGNED-OFF] Bug 8117: Followup Move the "no budget" string outside the table Signed-off-by: Michael Davis <m.r.davis@cranfield.ac.uk> -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8117 Michael Davis <m.r.davis@cranfield.ac.uk> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #10180|1 |0 is obsolete| | -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8117 Michael Davis <m.r.davis@cranfield.ac.uk> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #10179|1 |0 is obsolete| | -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8117 Michael Davis <m.r.davis@cranfield.ac.uk> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #10178|1 |0 is obsolete| | -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8117 --- Comment #12 from Michael Davis <m.r.davis@cranfield.ac.uk> --- This works for me, thanks, but I may have messed up the patches, so someone else should sign off. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8117 Owen Leonard <oleonard@myacpl.org> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply Version|unspecified |master --- Comment #13 from Owen Leonard <oleonard@myacpl.org> --- Applying the patches fails for me at this step: Applying: Bug 8117: Followup: Use the KohaDates plugin in aqbudgetperiods.tt fatal: sha1 information is lacking or useless (koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt). Repository lacks necessary blobs to fall back on 3-way merge. Cannot fall back to three-way merge. Patch failed at 0001 Bug 8117: Followup: Use the KohaDates plugin in aqbudgetperiods.tt -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8117 Jonathan Druart <jonathan.druart@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #10178|0 |1 is obsolete| | Attachment #10179|0 |1 is obsolete| | Attachment #10180|0 |1 is obsolete| | Attachment #10235|0 |1 is obsolete| | --- Comment #14 from Jonathan Druart <jonathan.druart@biblibre.com> --- Created attachment 11047 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=11047&action=edit Bug 8117: Divide budget periods into two tabs Squashed and rebased path A quick last signoff is required. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8117 Jonathan Druart <jonathan.druart@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Patch doesn't apply |Needs Signoff -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8117 Owen Leonard <oleonard@myacpl.org> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #11047|0 |1 is obsolete| | --- Comment #15 from Owen Leonard <oleonard@myacpl.org> --- Created attachment 11052 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=11052&action=edit [SIGNED-OFF] Bug 8117: Divide budget periods into two tabs Budget periods are now divided into two tabs : active and inactive budget periods. The original author of this patch is Julian Maurice Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> Signed-off-by: Michael Davis <m.r.davis@cranfield.ac.uk> Signed-off-by: Owen Leonard <oleonard@myacpl.org> -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8117 Owen Leonard <oleonard@myacpl.org> 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=8117 Paul Poulain <paul.poulain@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |paul.poulain@biblibre.com --- Comment #16 from Paul Poulain <paul.poulain@biblibre.com> --- QA comment: * small patch, just for a better display * passes test-qa.pl * A fix and a question: - you weren't respecting [HTML4] coding guideline (Active Budget should have been Active budget). I've fixed them - why do you repeat (as <h3> the title of the tab at the beginning ot the tab ?) * is it me or the toolbar does not display nice buttons but basic links New budget, New, Budgets, Budget planning are in blue, not styled. I tried shift-reload, switching to another page, switching to another language, the problem is still here pls check my last point -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8117 --- Comment #17 from Jonathan Druart <jonathan.druart@biblibre.com> --- (In reply to comment #16)
QA comment: - you weren't respecting [HTML4] coding guideline (Active Budget should have been Active budget). I've fixed them
Thanks!
- why do you repeat (as <h3> the title of the tab at the beginning ot the tab ?)
You're right. It's useless, I will submit a followup
* is it me or the toolbar does not display nice buttons but basic links New budget, New, Budgets, Budget planning are in blue, not styled. I tried shift-reload, switching to another page, switching to another language, the problem is still here
I don't reproduce this behaviour. Buttons display correctly for me. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8117 --- Comment #18 from Jonathan Druart <jonathan.druart@biblibre.com> --- Created attachment 11325 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=11325&action=edit Bug 8117: Followup: remove h3 title (duplicate infos) -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8117 Jonathan Druart <jonathan.druart@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |julian.maurice@biblibre.com --- Comment #19 from Jonathan Druart <jonathan.druart@biblibre.com> --- *** Bug 8654 has been marked as a duplicate of this bug. *** -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8117 Paul Poulain <paul.poulain@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Signed Off |Passed QA --- Comment #20 from Paul Poulain <paul.poulain@biblibre.com> --- QA comment: this time it's OK ! passed QA A follow-up will be added though, because we understood why I had some javascript error and jonathan didn't. It's because I've plack + debug debug panel in plack adds a lot of <table> (without any id) thus, when you call $("table").dataTable(...) there's a javacscript error because datatable can't handle the plack <table> ! The solution has been to explicitely name the tables to dataTable (which is a good thing anyway) $("#activeperiodst,#inactiveperiodst").dataTable($.extend(true, {}, dataTablesDefaults, { -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8117 Paul Poulain <paul.poulain@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Passed QA |Pushed to Master Version|master |rel_3_10 --- Comment #21 from Paul Poulain <paul.poulain@biblibre.com> --- Patch pushed to master -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8117 Owen Leonard <oleonard@myacpl.org> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Pushed to Master |ASSIGNED -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8117 Owen Leonard <oleonard@myacpl.org> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|ASSIGNED |Needs Signoff -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8117 Owen Leonard <oleonard@myacpl.org> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #11052|0 |1 is obsolete| | Attachment #11325|0 |1 is obsolete| | --- Comment #22 from Owen Leonard <oleonard@myacpl.org> --- Created attachment 13713 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=13713&action=edit Bug 8117 [Follow-up] Divide budget periods into two tabs This patch corrects some capitalization errors. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8117 Jonathan Druart <jonathan.druart@biblibre.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=8117 Jonathan Druart <jonathan.druart@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #13713|0 |1 is obsolete| | --- Comment #23 from Jonathan Druart <jonathan.druart@biblibre.com> --- Created attachment 13727 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=13727&action=edit Bug 8117 [Follow-up] Divide budget periods into two tabs This patch corrects some capitalization errors. Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com> -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8117 Katrin Fischer <katrin.fischer@bsz-bw.de> changed: What |Removed |Added ---------------------------------------------------------------------------- Patch complexity|--- |String patch QA Contact| |katrin.fischer@bsz-bw.de -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8117 Katrin Fischer <katrin.fischer@bsz-bw.de> 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=8117 Katrin Fischer <katrin.fischer@bsz-bw.de> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #13727|0 |1 is obsolete| | --- Comment #24 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- Created attachment 13821 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=13821&action=edit [SIGNED-OFF] Bug 8117 [Follow-up] Divide budget periods into two tabs This patch corrects some capitalization errors. Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com> Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> String changes, all tests pass. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8117 Jared Camins-Esakov <jcamins@cpbibliography.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Passed QA |Pushed to Master --- Comment #25 from Jared Camins-Esakov <jcamins@cpbibliography.com> --- This patch has been pushed to master. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8117 Chris Cormack <chris@bigballofwax.co.nz> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Pushed to Master |Pushed to Stable CC| |chris@bigballofwax.co.nz --- Comment #26 from Chris Cormack <chris@bigballofwax.co.nz> --- Pushed to 3.10.x, will be in 3.10.1 -- You are receiving this mail because: You are watching all bug changes.
participants (1)
-
bugzilla-daemon＠bugs.koha-community.org