From 4b0feb1a0f05f539e792e4e5e9e669fec7efcab7 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Wed, 19 Feb 2014 15:06:36 -0500 Subject: [PATCH] Bug 10714 [Follow-up] Redirect to list contents view upon cancel after initiating edit from list contents view (staff) This follow-up corrects the "cancel" action on list edit actions based on whether the edit was initiated from the list of lists or the list contents view. To test, view the list of lists and click the edit link next to one of them. Click the cancel link. You should return to the list of lists you were just viewing. View the contents of a list. Choose "Edit list" from the edit menu. Click the cancel link on the edit screen. You should return to the list contents view from which you initiated the edit action. Signed-off-by: Chris Cormack Signed-off-by: Jonathan Druart Signed-off-by: Galen Charlton (cherry picked from commit 6a323ce4ce914e757d5c1c999237ad2c0efc15e9) Signed-off-by: Fridolin Somers Signed-off-by: Kyle M Hall (cherry picked from commit 7d40a4c9081d50b15652f80a0d65d8a60f7a57b5) --- .../prog/en/modules/virtualshelves/shelves.tt | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt index 1d4a3903cd..7594d676a4 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt @@ -380,7 +380,15 @@ function placeHold () {
- [% IF ( showprivateshelves ) %]Cancel[% ELSE %]Cancel[% END %] + [% IF ( showprivateshelves ) %] + Cancel + [% ELSE %] + [% IF ( display == "viewshelf" ) %] + Cancel + [% ELSE %] + Cancel + [% END %] + [% END %]
-- 2.39.5