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

[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  46bbfa12a1d20cfaea2c61ad9bf1fdb47a25435a (commit)
       via  3d8f462cce3779fd1963d623b051dbc79d2f799a (commit)
      from  6434f9264ac0415e1e52904dc953a00ee0806491 (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 46bbfa12a1d20cfaea2c61ad9bf1fdb47a25435a
Author: Galen Charlton <gmc at esilibrary.com>
Date:   Sun Sep 8 07:37:04 2013 +0000

    Bug 9924: (follow-up) ensure that correct error message is displayed
    
    (Apparently) unlike HTML::Template::Pro, Template Toolkit doesn't like
    template variables that are entirely numeric -- in conditionals, it
    consider them integers, most of which are Perl true.
    
    This patch changes this by setting the error variable to the error
    value.
    
    To test:
    
    [1] Run the test plan from the previous patch.  In each
        case, verify that the error message is specifically applicable
        to the test.  For example, if you try uplaoading a patron image
        that is larger than 500KB, the error message displayed should
        specifically say so.
    
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    Thank you Galen for catching this. Error messages showing up
    now are much more specific and according to the error codes given.
    I testd uploading a file larger then 500KB and triggered several
    error messages giving the error code in the URL:
    /cgi-bin/koha/patroncards/manage.pl?card_element=profile&error=201
    
    All tests and QA script pass.
    
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>

commit 3d8f462cce3779fd1963d623b051dbc79d2f799a
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Mon Mar 25 12:22:33 2013 -0400

    Bug 9924 - Simplify and rename patron card creator error message include
    
    The patron card creator error message include uses a non-standard method
    for displaying error messages, and is poorly-named.
    
    This patch converts the method of displaying error messages for various
    patron card creator options to the standard one ('<div class="dialog
    alert">') and renames the include file to make it clear that it relates
    only to patron card creator operations.
    
    To test, perform various operations:
    
    - Go to 'manage images' and try to upload a file which exceeds the
      500KBfile size limit
    - Go to the edit batch page and manually append an error code to the
      URL:  /cgi-bin/koha/patroncards/edit-batch.pl?op=new&error=403
    - Go to one of the manage pages and manually append an error code to the
      URL:
      /cgi-bin/koha/patroncards/manage.pl?card_element=profile&error=201
    
    Correct display of an error message indicates that the include file is
    being found.
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    Passes test plan, test suite and QA script.
    
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>

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

Summary of changes:
 .../prog/en/includes/error-messages.inc            |  108 --------------------
 .../prog/en/includes/patroncards-errors.inc        |   35 +++++++
 .../prog/en/modules/patroncards/edit-batch.tt      |    2 +-
 .../prog/en/modules/patroncards/image-manage.tt    |    2 +-
 .../prog/en/modules/patroncards/manage.tt          |    2 +-
 patroncards/edit-batch.pl                          |    3 +-
 patroncards/image-manage.pl                        |   15 +--
 patroncards/manage.pl                              |    3 +-
 8 files changed, 45 insertions(+), 125 deletions(-)
 delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/error-messages.inc
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/patroncards-errors.inc


hooks/post-receive
-- 
main Koha release repository