[Koha-patches] [PATCH] Bug 10714 [Follow-up] Redirect to list contents view upon save after initiating edit from list contents view

[Owen Leonard]

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.
---
 .../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 4c51b34..95fa4b9 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt
@@ -500,7 +500,15 @@ function placeHold () {
 
 		</fieldset>
 		<fieldset class="action"><input type="submit" onclick="Check(this.form); return false;" value="Save" class="submit" />
-        [% IF ( showprivateshelves ) %]<a href="/cgi-bin/koha/virtualshelves/shelves.pl?display=privateshelves" class="cancel">Cancel</a>[% ELSE %]<a href="/cgi-bin/koha/virtualshelves/shelves.pl" class="cancel">Cancel</a>[% END %]
+        [% IF ( showprivateshelves ) %]
+            <a href="/cgi-bin/koha/virtualshelves/shelves.pl?display=privateshelves" class="cancel">Cancel</a>
+        [% ELSE %]
+            [% IF ( display == "viewshelf" ) %]
+               <a href="/cgi-bin/koha/virtualshelves/shelves.pl?viewshelf=[% shelfnumber %]" class="cancel">Cancel</a>
+            [% ELSE %]
+                <a href="/cgi-bin/koha/virtualshelves/shelves.pl" class="cancel">Cancel</a>
+            [% END %]
+        [% END %]
     </fieldset>
     </form>
     </div>
-- 
1.7.9.5