https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=16525 --- Comment #1 from Aleisha Amohia <aleishaamohia@hotmail.com> --- Created attachment 51507 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=51507&action=edit Bug 16525: Have cancel button when adding new aq budget At the moment you only see the cancel button on the form if editing an existing budget. This patch adds a cancel button to the form which adds a budget. Also changes the wording of the save button from 'Save changes' to just 'Save' so it makes more sense when adding a new budget To test: 1) Go to Admin -> Budgets -> New budget 2) Notice 'Save changes' button and no cancel 3) Apply patch and refresh page 4) Notice 'Save' button and 'cancel' link 5) Click 'cancel' - should be taken to Budgets administration page 6) Edit an existing budget 7) Click 'cancel' - should be taken to the funds page for that budget Sponsored-by: Catalyst IT -- 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=16525 Owen Leonard <oleonard@myacpl.org> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Failed QA --- Comment #2 from Owen Leonard <oleonard@myacpl.org> --- This works fine, but the markup needs to be restructured: <a href="[% IF ( budget_period_id) %]/cgi-bin/koha/admin/aqbudgets.pl?budget_period_id=[% budget_period_id %][% ELSE %]/cgi-bin/koha/admin/aqbudgetperiods.pl[% END %]" class="cancel">Cancel</a> I thought that this would have triggered a warning by the QA tools because of coding guideline 'HTML1:' https://wiki.koha-community.org/wiki/Coding_Guidelines#HTML1:_Template_Toolk... It's more verbose, but you have to do it this way: [% IF ( budget_period_id) %] <a href="/cgi-bin/koha/admin/aqbudgets.pl?budget_period_id=[% budget_period_id %]" class="cancel">Cancel</a> [% ELSE %] <a href="/cgi-bin/koha/admin/aqbudgetperiods.pl" class="cancel">Cancel</a> [% END %] -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=16525 Aleisha Amohia <aleishaamohia@hotmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #51507|0 |1 is obsolete| | --- Comment #3 from Aleisha Amohia <aleishaamohia@hotmail.com> --- Created attachment 51725 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=51725&action=edit Bug 16525: Have cancel button when adding new aq budget At the moment you only see the cancel button on the form if editing an existing budget. This patch adds a cancel button to the form which adds a budget. Also changes the wording of the save button from 'Save changes' to just 'Save' so it makes more sense when adding a new budget To test: 1) Go to Admin -> Budgets -> New budget 2) Notice 'Save changes' button and no cancel 3) Apply patch and refresh page 4) Notice 'Save' button and 'cancel' link 5) Click 'cancel' - should be taken to Budgets administration page 6) Edit an existing budget 7) Click 'cancel' - should be taken to the funds page for that budget Sponsored-by: Catalyst IT -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=16525 Owen Leonard <oleonard@myacpl.org> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #51725|0 |1 is obsolete| | --- Comment #4 from Owen Leonard <oleonard@myacpl.org> --- Created attachment 51772 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=51772&action=edit [SIGNED-OFF] Bug 16525: Have cancel button when adding new aq budget At the moment you only see the cancel button on the form if editing an existing budget. This patch adds a cancel button to the form which adds a budget. Also changes the wording of the save button from 'Save changes' to just 'Save' so it makes more sense when adding a new budget To test: 1) Go to Admin -> Budgets -> New budget 2) Notice 'Save changes' button and no cancel 3) Apply patch and refresh page 4) Notice 'Save' button and 'cancel' link 5) Click 'cancel' - should be taken to Budgets administration page 6) Edit an existing budget 7) Click 'cancel' - should be taken to the funds page for that budget Sponsored-by: Catalyst IT Signed-off-by: Owen Leonard <oleonard@myacpl.org> -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=16525 sandboxes@biblibre.com <sandboxes@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #51772|0 |1 is obsolete| | -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=16525 PTFS Europe Sandboxes <sandboxes@ptfs-europe.com> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |sandboxes@ptfs-europe.com --- Comment #7 from PTFS Europe Sandboxes <sandboxes@ptfs-europe.com> --- Patch tested with a sandbox, by Sabine Liebmann <Liebmann@dipf.de> -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=16525 --- Comment #8 from PTFS Europe Sandboxes <sandboxes@ptfs-europe.com> --- Created attachment 51786 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=51786&action=edit Bug 16525: Have cancel button when adding new aq budget At the moment you only see the cancel button on the form if editing an existing budget. This patch adds a cancel button to the form which adds a budget. Also changes the wording of the save button from 'Save changes' to just 'Save' so it makes more sense when adding a new budget To test: 1) Go to Admin -> Budgets -> New budget 2) Notice 'Save changes' button and no cancel 3) Apply patch and refresh page 4) Notice 'Save' button and 'cancel' link 5) Click 'cancel' - should be taken to Budgets administration page 6) Edit an existing budget 7) Click 'cancel' - should be taken to the funds page for that budget Sponsored-by: Catalyst IT Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Sabine Liebmann <Liebmann@dipf.de> Signed-off-by: Sabine Liebmann <Liebmann@dipf.de> -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=16525 Jonathan Druart <jonathan.druart@bugs.koha-community.org> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #51786|0 |1 is obsolete| | --- Comment #9 from Jonathan Druart <jonathan.druart@bugs.koha-community.org> --- Created attachment 51802 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=51802&action=edit Bug 16525: Have cancel button when adding new aq budget At the moment you only see the cancel button on the form if editing an existing budget. This patch adds a cancel button to the form which adds a budget. Also changes the wording of the save button from 'Save changes' to just 'Save' so it makes more sense when adding a new budget To test: 1) Go to Admin -> Budgets -> New budget 2) Notice 'Save changes' button and no cancel 3) Apply patch and refresh page 4) Notice 'Save' button and 'cancel' link 5) Click 'cancel' - should be taken to Budgets administration page 6) Edit an existing budget 7) Click 'cancel' - should be taken to the funds page for that budget Sponsored-by: Catalyst IT Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Sabine Liebmann <Liebmann@dipf.de> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Still an issue: If edit a budget fron aqbudgets.pl, then cancel, you get aqbudgets.pl?budget_period_id=XX. But existed before this patch. -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=16525 Frédéric Demians <frederic@tamil.fr> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |frederic@tamil.fr --- Comment #11 from Frédéric Demians <frederic@tamil.fr> --- Pushed in 16.05. Will be in 16.05.01. -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=16525 Katrin Fischer <katrin.fischer@bsz-bw.de> changed: What |Removed |Added ---------------------------------------------------------------------------- Summary|Have cancel button when |Add cancel button when |adding new aq budget |adding a new acq budget CC| |katrin.fischer@bsz-bw.de -- You are receiving this mail because: You are watching all bug changes.