[koha-commits] main Koha release repository branch master updated. v3.12.00-beta1-1114-g1303ad2

[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  1303ad28b2fe5f612a6f65671e4068b67a5de665 (commit)
       via  015319dbaf655a51492537401e9cbb5a7263a37c (commit)
       via  04818401d739b3aae702bec45237c8df824dfb44 (commit)
       via  9dca7096c89bef81c3a4cfb46df788e65818e86b (commit)
      from  7c82fe1a670892b07f426f356c67bc3cd60a37f3 (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 1303ad28b2fe5f612a6f65671e4068b67a5de665
Author: Galen Charlton <gmc at esilibrary.com>
Date:   Mon Sep 16 17:42:46 2013 +0000

    Bug 10513: DBRev 3.13.00.019
    
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>

commit 015319dbaf655a51492537401e9cbb5a7263a37c
Author: Galen Charlton <gmc at esilibrary.com>
Date:   Mon Sep 16 17:41:51 2013 +0000

    Bug 10513: (follow-up) use "checkin" rather than "check in"
    
    "Checkin" is by far more commonly used as an adjective than
    "check in".
    
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>

commit 04818401d739b3aae702bec45237c8df824dfb44
Author: Galen Charlton <gmc at esilibrary.com>
Date:   Mon Sep 16 17:33:55 2013 +0000

    Bug 10513: (follow-up) allow for multiline checkin alerts/messages
    
    This patch turns the form input for the checkin message to
    a text area and uses the html_line_break Template Toolkit filter
    to display it.
    
    To test:
    
    [1] Create or edit an item type.  Note that the checkin message
        field is a text area.
    [2] Enter a checkin message with at least one line break.
    [3] In the item types administration page, note that the checkin
        message is displayed with the line break.
    [4] Return an item of the item type modified in step 1.  Verify
        that the displayed checkin message includes the line break.
    
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>

commit 9dca7096c89bef81c3a4cfb46df788e65818e86b
Author: Magnus Enger <magnus at enger.priv.no>
Date:   Thu Jun 27 22:22:18 2013 +0200

    Bug 10513: display a warning/message when returning a chosen item type
    
    This patch adds a new column to item types. Text in this column is
    displayed as a warning when an item of the given type is checked in.
    The type of message can also be chosen, affecting how the message is
    displayed.
    
    Use case: Items that are on inter-library loan can have a separate
    item type, and when items of this type are checked in a message
    saying something like "ILL! Remember to return it to the owning
    library!" can be displayed.
    
    To test:
    - Apply the patch
    - Go to Home > Administration > Item types administration
    - Check that there is a new column, called "Check in message"
    - Edit an item type and add a check in message
    - Check that the check in message you added is displayed in the table
    - Check in an item with an item type that has a check in message
    - Check that the message is displayed
    - Repeat the steps above, but select "Alert" instead of the default
      "Message" as the "Check in message type". Check that the message
      is displayed in a yellow alert box, not a blue message box.
    - Check in an item with an item type that does *not* have a check
      in message, and make sure no false messages are displayed
    - Create a new item type from scratch and check that it works
      the way it is supposed to
    - Run the tests in t/ItemType.t, which are updated by this patch
    
    This patch also removes backticks around column names in the
    itemtypes table in installer/data/mysql/kohastructure.sql
    
    UPDATE 2013-07-22
    - Rebased on current master (no changes)
    - Added "AFTER summary" to the SQL statement in updatedatabase.pl
    - Added another placeholder on line 170 of admin/itemtypes.pl
    Thanks Katrin!
    
    UPDATE 2013-07-29
    - Make this message independent of all other messages - thanks Owen!
    - Make it possible to choose the type of message ("alert" or
      "message")
    
    Sponsored-by: Kultur i Halland - Regionbibliotek
    Signed-off-by: Owen Leonard <oleonard at myacpl.org>
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    Fixed some tabs to make the QA script happy.
    All old and new tests pass.
    
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>

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

Summary of changes:
 C4/ItemType.pm                                     |   27 +++++++++++
 admin/itemtypes.pl                                 |   12 ++++-
 circ/returns.pl                                    |   10 ++++
 installer/data/mysql/kohastructure.sql             |   14 +++---
 installer/data/mysql/updatedatabase.pl             |    7 +++
 .../prog/en/modules/admin/itemtypes.tt             |   21 +++++++++
 .../intranet-tmpl/prog/en/modules/circ/returns.tt  |   10 ++++
 kohaversion.pl                                     |    2 +-
 t/ItemType.t                                       |   47 ++++++++++++++++----
 9 files changed, 132 insertions(+), 18 deletions(-)


hooks/post-receive
-- 
main Koha release repository