[koha-commits] main Koha release repository branch master updated. v3.22.00-1380-ga789184

[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  a789184e01d269a1d12f88315aff2959fe16658a (commit)
       via  afae8e583a2f020941c341be374712ab72365126 (commit)
       via  4be1dfd62357e9c0745673c34dd50001c99d6ee4 (commit)
       via  5a961c6953600df07998575fd96cf682d7ae46c2 (commit)
       via  0893a5075b0ae27509de12ddf11d7e005ae53c43 (commit)
      from  74e28c02f9c7588fed911afaf92eac6e34d00e49 (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 a789184e01d269a1d12f88315aff2959fe16658a
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date:   Wed Apr 27 15:39:55 2016 +0000

    Bug 11565 [QA Followup] - Only hide options when none are in use
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>

commit afae8e583a2f020941c341be374712ab72365126
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Tue Mar 22 09:04:25 2016 -0400

    Bug 11565 [QA Followup] - Hide checkout options when not in use
    
    This follow-up reformats the checkout screen so that checkout settings
    like specify due date, on-site checkout, and override high holds are
    grouped in a panel which is hidden by default. Clicking a link shows all
    the available settings.
    
    Also modified in this patch: The default color for div.hint has been
    made a little darker for readability.
    
    To test, apply the patch and clear your browser cache if necessary.
    
    - Check out to a patron who is not blocked from checking out.
    - Click the "Checkout settings" link and confirm that the settings panel
      is displayed.
    - Test that the settings in the panel behave as expected.
    - Test with preferences on and off: decreaseLoanHighHolds,
      OnSiteCheckouts, SpecifyDueDate.
    
    NOTE: This patch is a work in progress. It does not address the issue of
    checkout setting being hidden even if they are active.
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>

commit 4be1dfd62357e9c0745673c34dd50001c99d6ee4
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date:   Wed Apr 27 14:49:36 2016 +0200

    Bug 11565: QA Follo-up: Improve translatability of 'not shortened' message
    
    Mark-up inside sentences splits them of up for translation, so it's better
    to only highlight full sentences for easier translation.
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>

commit 5a961c6953600df07998575fd96cf682d7ae46c2
Author: Jesse Weaver <jweaver at bywatersolutions.com>
Date:   Wed Sep 30 11:48:14 2015 -0400

    Bug 11565: (QA followup) add class to allow feature to be easily hidden
    
    This wraps both checkboxes (in the confirmation dialog and checkout
    interface) in a class of "circ-override-high-holds" so they can be
    easily hidden.
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>

commit 0893a5075b0ae27509de12ddf11d7e005ae53c43
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date:   Wed Sep 30 11:48:14 2015 -0400

    Bug 11565 - decreaseLoanHighHolds needs Override
    
    This patch allows the high holds loan length decrease to be overridden
    either by a checkbox that remembers its setting during a series of
    checkouts, or by a one time use override checkbox that will show
    in the warning popup if a checkout is affected by high holds.
    
    Test Plan:
    1) Set up a checkout that will be affected by decreaseLoanHighHolds
    2) Attempt to check out an item
    3) Check the override checkbox
    4) Note the checkout date is not reduced
    5) Return the item
    6) Start a new checkout for the patron
    7) Check the "Don't decrease lean length based on holds" checkbox
    8) Check out the item
    9) Note you are not warned about the high holds decrease
       and that the checkout length is not reduced
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Signed-off-by: Christopher Brannon <cbrannon at cdalibrary.org>
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>

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

Summary of changes:
 C4/Circulation.pm                                  |   30 ++++-
 circ/circulation.pl                                |   17 ++-
 .../intranet-tmpl/prog/en/css/staff-global.css     |   37 ++---
 .../intranet-tmpl/prog/en/js/pages/circulation.js  |   24 ++++
 .../prog/en/modules/circ/circulation.tt            |  142 +++++++++++++-------
 t/db_dependent/DecreaseLoanHighHolds.t             |   20 ++-
 6 files changed, 195 insertions(+), 75 deletions(-)


hooks/post-receive
-- 
main Koha release repository