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 <chris@bigballofwax.co.nz>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 6a323ce4ce)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 7d40a4c908)
This commit is contained in:
Owen Leonard 2014-02-19 15:06:36 -05:00 committed by Kyle M Hall
parent 02095ae19a
commit 4b0feb1a0f
1 changed files with 9 additions and 1 deletions

View File

@ -380,7 +380,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>