[koha-commits] main Koha release repository branch 3.12.x updated. v3.12.04-79-g319efaf

[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.12.x has been updated
       via  319efaf0957c7b7e3d2a7bae3964397e60d9a37f (commit)
       via  61baf514ef08e5d50acacb9cd6e1350f28c750d3 (commit)
       via  f6d1d5cd6c4f93f6c592170f59241268dfff79cb (commit)
      from  2d80d67e75ac37016f982afcbc643159ccde1e1e (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 319efaf0957c7b7e3d2a7bae3964397e60d9a37f
Author: Tomas Cohen Arazi <tomascohen at gmail.com>
Date:   Fri Aug 2 18:36:19 2013 -0300

    Bug 10678 - Update addbooks help page
    
    The button's name changed, and a caret was added.
    
    Sponsored-by: Universidad Nacional de Cordoba
    Signed-off-by: Melia Meggs <melia at bywatersolutions.com>
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    Passes all tests and QA script.
    If you click the button directly, the default framework is still used.
    If you use the split button functionality to select another framework,
    this framework will be used for the imported record.
    
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    (cherry picked from commit 6fcb6712fe5411b182b6f0d23c40d3ce6d44f3eb)
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>

commit 61baf514ef08e5d50acacb9cd6e1350f28c750d3
Author: Tomas Cohen Arazi <tomascohen at gmail.com>
Date:   Fri Aug 2 15:22:43 2013 -0300

    Bug 10678 - Allow framework selection when creating from Z39.50
    
    If we are creating a new record, we are forced to use the default framework
    and then change it after we have the cataloguing form filled. This patch
    adds the option to choose (from a splitted button dropdown) which framework
    to use.
    
    To test:
    - Apply the patch.
    - Go to More > Cataloguing
    - Check there's a nice split button that says "New from Z39.50"
    a) Click the button, the usual Z39.50 search popup should appear and work as expected
       (check the URL parameters and see frameworkcode= has no value
    b) Click on the dropdown arrow, choose a framework and the usual Z39.50 search popup should
       appear, this time frameworkcode= should have the chosen value.
    
    Edit: fixed a small bug that prevented the default framework to be called. Thanks Owen for testing.
    
    Sponsored-by: Universidad Nacional de Cordoba
    Signed-off-by: Melia Meggs <melia at bywatersolutions.com>
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    Notes on second patch.
    
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    (cherry picked from commit a2e7e6ef1cc4306e5429ca99317b96479cfa26d2)
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>

commit f6d1d5cd6c4f93f6c592170f59241268dfff79cb
Author: Robin Sheat <robin at catalyst.net.nz>
Date:   Thu Jul 11 23:58:34 2013 +1200

    Bug 10574 - mute the "upgrading from 3.2" message
    
    New installs get the message about running a script if upgrading from
    3.2. They shouldn't. This silences this message in all cases except when
    you actually are upgrading from 3.2.
    
    Test plan:
    
    There are three scenarios to test:
    1) A fresh install should not cause the prompt.
    2) An upgrade with or without the debconf entry set should not cause the
       prompt.
    3) An upgrade from a 3.2 release to this should cause the prompt.
    
    To remove the debconf entry that says the prompt has been seen:
    
    echo 'unregister koha-common/3.2-3.4-upgrade-notice' | sudo debconf-communicate koha-common
    
    This should be run before every test to make debconf forget that it's
    shown the prompt. To get its current state:
    
    sudo debconf-show koha-common
    
    To test against the 3.2 version, an empty package that claims to be Koha
    3.2.2 is attached to the bug.
    
    Signed-off-by: Mirko Tietgen <mirko at abunchofthings.net>
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    (cherry picked from commit 598a830af0f97aef39bae36265c06a6f8ed73f10)
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>

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

Summary of changes:
 debian/koha-common.config                          |    4 ++-
 .../prog/en/modules/cataloguing/addbooks.tt        |   28 +++++++++++++++----
 .../prog/en/modules/help/cataloguing/addbooks.tt   |    2 +-
 3 files changed, 26 insertions(+), 8 deletions(-)


hooks/post-receive
-- 
main Koha release repository