[koha-commits] main Koha release repository branch 3.8.x updated. v3.08.12-22-ga49d2d7

[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, 3.8.x has been updated
       via  a49d2d7875505064f5983e6d80e005f0ea6bc42d (commit)
       via  f05bb04470a96eb66fa30c1b93ac7b8357db6446 (commit)
       via  7925b98ee8d2f1e456cf6459e14197a50b20cf09 (commit)
      from  c3cdfb0e4a8f36a7d6b0218dc34b94cecaf39cc2 (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 a49d2d7875505064f5983e6d80e005f0ea6bc42d
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Thu May 9 15:08:41 2013 -0400

    Bug 10225 - If an item isn't editable, don't show the onclick Edit/Delete menu
    
    The user should not be shown edit/delete links when clicking on a row in
    additems which they cannot edit because of the IndependantBranches
    setting. This patch adds a class to the row to exclude such rows in the
    JavaScript onclick handler.
    
    To test:
    
    - Turn IndependantBranches on and edit items for a title which
      has holdings from various branches including your own.
    - Click a row for an item which is held by your library. You should see
      the "Edit/Delete" links appear.
    - Click a row for an item which is held by another library. No links
      should appear.
    
    Signed-off-by: Nicole C. Engard <nengard at bywatersolutions.com>
    All test pass
    
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    All tests and QA script pass.
    Changes to the templates include no string changes.
    Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
    (cherry picked from commit b36d3bc796fd1b0a4db32729c994287425f10326)
    
    Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
    (cherry picked from commit 1a8db0ba7d62a70cd6b49ee705a5db9b11ad7672)
    
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    
    Conflicts:
    	koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt
    (cherry picked from commit 0394a8f8ce88b6883cd2a14d57971713f98be346)

commit f05bb04470a96eb66fa30c1b93ac7b8357db6446
Merge: 7925b98 c3cdfb0
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Thu May 16 09:45:55 2013 +1200

    Merge remote-tracking branch 'kc/3.8.x' into 3.8.x

commit 7925b98ee8d2f1e456cf6459e14197a50b20cf09
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Mon Apr 8 21:20:51 2013 +1200

    Bug 9591 : Set Library changes after viewing Holds Queue >> reserves item
    
    To test
    1. Log in to the staff client. Note your logged in library.
    2. Navigate to Circulation -> Holds queue.
    3. Select a holds queue report for a library other than your own.
    4. From the holds queue report page, click the "Check out" tab and
       enter the card number of a patron who has holds.
    5. On the circulation page for that patron, click the "Holds" tab.
    6. Click one of the titles in the list of holds.
    
    Your logged in branch will now match the library you chose for the
    holds queue report.
    
    Alternate sequence:
    
    4. From the holds queue report page, click the "Check out" tab and
       do a non-exact search (search which will return more than one result)
       for a patron who has holds.
    5. Choose the correct patron from the list of results.
    
    Your logged in branch will now match the library you chose for
    the holds queue report.
    
    Apply the patch and repeat, this time it should not change your logged
    in branch
    
    Signed-off-by: Mirko Tietgen <mirko at abunchofthings.net>
    Weird bug, the patch works for me.
    
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    Good catch. All tests and QA script pass.
    
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

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

Summary of changes:
 circ/view_holdsqueue.pl                            |    2 +-
 .../prog/en/modules/cataloguing/additem.tt         |   16 ++++++++++++++--
 .../prog/en/modules/circ/view_holdsqueue.tt        |    2 +-
 3 files changed, 16 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
main Koha release repository