[koha-commits] main Koha release repository branch master updated. v3.14.00-463-g6a323ce

[Git repo owner]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, master has been updated
       via  6a323ce4ce914e757d5c1c999237ad2c0efc15e9 (commit)
       via  daa98e73f8baf178f2b0f32b4988d2414519ea4b (commit)
      from  11faf9fde8da48c58e853d5538a8e3bbd2ae41c5 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 6a323ce4ce914e757d5c1c999237ad2c0efc15e9
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Wed Feb 19 15:06:36 2014 -0500

    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 at bigballofwax.co.nz>
    Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>

commit daa98e73f8baf178f2b0f32b4988d2414519ea4b
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Mon Aug 12 15:30:16 2013 -0400

    Bug 10714: Redirect to list contents view upon save after initiating edit from list contents view (staff)
    
    In the staff client, if you initiate a list edit from the list contents
    view you should be redirected to that same view after saving your
    changes. The OPAC already works this way.
    
    To test, view the contents of an existing list. Click the "Edit list"
    item under the "Edit" menu. Click save on the list edit form and you
    should be redirected back to the contents view of that list.
    
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
    Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>

-----------------------------------------------------------------------

Summary of changes:
 .../prog/en/includes/virtualshelves-toolbar.inc             |    2 +-
 .../intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt |   11 ++++++++++-
 2 files changed, 11 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
main Koha release repository