In a budget planning, cgi-bin/koha/admin/aqplan.pl, the fund names are not displayed.
This is a side effect of Bug 11714
Created attachment 41396 [details] [review] Bug 14649: Fix regression - display fund name on budget planning A patch from bug 11714 removes 'budget_name_indent', which was useless. The script and the template should use the budget_name value. Note that this patch impacts the CSV export, which does not work, so it cannot be tested. Test plan: Edit a fund and click on one of the Planning value (by months, etc.) The "Fund name" column should be correctly populated with the fund names.
Created attachment 41397 [details] [review] [SIGNED-OFF] Bug 14649: Fix regression - display fund name on budget planning A patch from bug 11714 removes 'budget_name_indent', which was useless. The script and the template should use the budget_name value. Note that this patch impacts the CSV export, which does not work, so it cannot be tested. Test plan: Edit a fund and click on one of the Planning value (by months, etc.) The "Fund name" column should be correctly populated with the fund names. Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
Thanks a lot Jonathan, you where faster than me for patching ;) I of course signoff. > Note that this patch impacts the CSV export, which does not work, so it cannot be tested. I have a correction I will set in another bug.
Created attachment 41398 [details] [review] Bug 14649: Followup - correct budget_period_id in fund name link Now that fund name is displayed in the table as a link, you see that arg budget_period_id is never defined in this link. This is because the template var is [% budget_line.budget_period_id %] instead of [% budget_period_id %]. This looks like a mistake when converting from tmpl to tt. Test plan : - Without patch - Look for a planning with funds : /cgi-bin/koha/admin/aqplan.pl?budget_period_id=2&authcat=MONTHS - Click on a fund name => You see in URL that budget_id is empty : /cgi-bin/koha/admin/aqbudgets.pl?op=add_form&budget_id=6&budget_period_id= - Apply patch - Look for a planning with funds : /cgi-bin/koha/admin/aqplan.pl?budget_period_id=2&authcat=MONTHS - Click on a fund name => you see in URL that budget_id is defined like in planning page : /cgi-bin/koha/admin/aqbudgets.pl?op=add_form&budget_id=6&budget_period_id=2
Small followup needs signoff
(In reply to Fridolin SOMERS from comment #5) > => You see in URL that budget_id is empty : > /cgi-bin/koha/admin/aqbudgets.pl?op=add_form&budget_id=6&budget_period_id= > => you see in URL that budget_id is defined like in planning page : > > /cgi-bin/koha/admin/aqbudgets.pl?op=add_form&budget_id=6&budget_period_id=2 Do you mean »budget_period_id is empty/defined« (not budget_id) in both cases?
(In reply to Mirko Tietgen from comment #7) > (In reply to Fridolin SOMERS from comment #5) > > > => You see in URL that budget_id is empty : > > /cgi-bin/koha/admin/aqbudgets.pl?op=add_form&budget_id=6&budget_period_id= > > > => you see in URL that budget_id is defined like in planning page : > > > > /cgi-bin/koha/admin/aqbudgets.pl?op=add_form&budget_id=6&budget_period_id=2 > > Do you mean »budget_period_id is empty/defined« (not budget_id) in both > cases? Yes indeed, thanks for this
Created attachment 41703 [details] [review] Bug 14649: Followup - correct budget_period_id in fund name link Now that fund name is displayed in the table as a link, you see that arg budget_period_id is never defined in this link. This is because the template var is [% budget_line.budget_period_id %] instead of [% budget_period_id %]. This looks like a mistake when converting from tmpl to tt. Test plan : - Without patch - Look for a planning with funds : /cgi-bin/koha/admin/aqplan.pl?budget_period_id=2&authcat=MONTHS - Click on a fund name => You see in URL that budget_period_id is empty : /cgi-bin/koha/admin/aqbudgets.pl?op=add_form&budget_id=6&budget_period_id= - Apply patch - Look for a planning with funds : /cgi-bin/koha/admin/aqplan.pl?budget_period_id=2&authcat=MONTHS - Click on a fund name => you see in URL that budget_period_id is defined like in planning page : /cgi-bin/koha/admin/aqbudgets.pl?op=add_form&budget_id=6&budget_period_id=2
Created attachment 42268 [details] [review] Bug 14649: Fix regression - display fund name on budget planning A patch from bug 11714 removes 'budget_name_indent', which was useless. The script and the template should use the budget_name value. Note that this patch impacts the CSV export, which does not work, so it cannot be tested. Test plan: Edit a fund and click on one of the Planning value (by months, etc.) The "Fund name" column should be correctly populated with the fund names. Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Created attachment 42269 [details] [review] Bug 14649: Followup - correct budget_period_id in fund name link Now that fund name is displayed in the table as a link, you see that arg budget_period_id is never defined in this link. This is because the template var is [% budget_line.budget_period_id %] instead of [% budget_period_id %]. This looks like a mistake when converting from tmpl to tt. Test plan : - Without patch - Look for a planning with funds : /cgi-bin/koha/admin/aqplan.pl?budget_period_id=2&authcat=MONTHS - Click on a fund name => You see in URL that budget_period_id is empty : /cgi-bin/koha/admin/aqbudgets.pl?op=add_form&budget_id=6&budget_period_id= - Apply patch - Look for a planning with funds : /cgi-bin/koha/admin/aqplan.pl?budget_period_id=2&authcat=MONTHS - Click on a fund name => you see in URL that budget_period_id is defined like in planning page : /cgi-bin/koha/admin/aqbudgets.pl?op=add_form&budget_id=6&budget_period_id=2 Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Created attachment 42367 [details] [review] [PASSED QA] Bug 14649: Followup - correct budget_period_id in fund name link Now that fund name is displayed in the table as a link, you see that arg budget_period_id is never defined in this link. This is because the template var is [% budget_line.budget_period_id %] instead of [% budget_period_id %]. This looks like a mistake when converting from tmpl to tt. Test plan : - Without patch - Look for a planning with funds : /cgi-bin/koha/admin/aqplan.pl?budget_period_id=2&authcat=MONTHS - Click on a fund name => You see in URL that budget_period_id is empty : /cgi-bin/koha/admin/aqbudgets.pl?op=add_form&budget_id=6&budget_period_id= - Apply patch - Look for a planning with funds : /cgi-bin/koha/admin/aqplan.pl?budget_period_id=2&authcat=MONTHS - Click on a fund name => you see in URL that budget_period_id is defined like in planning page : /cgi-bin/koha/admin/aqbudgets.pl?op=add_form&budget_id=6&budget_period_id=2 Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Created attachment 42368 [details] [review] [PASSED QA] Bug 14649: Fix regression - display fund name on budget planning A patch from bug 11714 removes 'budget_name_indent', which was useless. The script and the template should use the budget_name value. Note that this patch impacts the CSV export, which does not work, so it cannot be tested. Test plan: Edit a fund and click on one of the Planning value (by months, etc.) The "Fund name" column should be correctly populated with the fund names. Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Created attachment 42369 [details] [review] [PASSED QA] Bug 14649: Followup - correct budget_period_id in fund name link Now that fund name is displayed in the table as a link, you see that arg budget_period_id is never defined in this link. This is because the template var is [% budget_line.budget_period_id %] instead of [% budget_period_id %]. This looks like a mistake when converting from tmpl to tt. Test plan : - Without patch - Look for a planning with funds : /cgi-bin/koha/admin/aqplan.pl?budget_period_id=2&authcat=MONTHS - Click on a fund name => You see in URL that budget_period_id is empty : /cgi-bin/koha/admin/aqbudgets.pl?op=add_form&budget_id=6&budget_period_id= - Apply patch - Look for a planning with funds : /cgi-bin/koha/admin/aqplan.pl?budget_period_id=2&authcat=MONTHS - Click on a fund name => you see in URL that budget_period_id is defined like in planning page : /cgi-bin/koha/admin/aqbudgets.pl?op=add_form&budget_id=6&budget_period_id=2 Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Patches pushed to master. Good catch Jonathan and Frido!
Pushed to 3.20.x will be in 3.20.4