[koha-commits] main Koha release repository branch 3.18.x updated. v3.18.06-3-68-g3cf4f1e

Mon May 18 01:15:35 CEST 2015

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.18.x has been updated
       via  3cf4f1e3487e5cc6946cfbdcd8d971dada02726d (commit)
       via  7fdf0545dce3309486a2099269040938747dfb28 (commit)
       via  1da4936e05101e323ffdd8f4c2fc49631bd471d0 (commit)
       via  3a8a4c7ea9c7b73e00bf268ec1d165abd80d5e31 (commit)
       via  917140b9f29ea6136aadfdca440b38fa40e92eb4 (commit)
       via  1b5ec8c50926f7c0e9e84c701ea4a4a635cd73ea (commit)
      from  7a5abcdcdd5e5e9ff1ecc29f40abf5618831ab87 (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 3cf4f1e3487e5cc6946cfbdcd8d971dada02726d
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date:   Wed Apr 29 10:56:42 2015 +0200

    Bug 13423: Fix number of tests in Serials.t

    Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>

    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
    (cherry picked from commit a072260bf64f46e922bdb6a05b2f6dac605d3c60)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

    Conflicts:
    	t/db_dependent/Serials.t

commit 7fdf0545dce3309486a2099269040938747dfb28
Author: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Date:   Sat Apr 25 09:01:44 2015 -0300

    Bug 13423: Remove unused serials-recieve

    This patch removes two files, serials-recieve.pl and serial-recieve.tt
    serials-recieve.pl is not called anyware
    (it's recieve!)

    Also removes the sub removeMissingIssue called only from serials-recieve.pl

    git grep serials-recieve.pl .
    C4/Serials.pm:called when a missing issue is found from the serials-recieve.pl file
    koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-recieve.tt:     <form method="post" name="f" action="serials-recieve.pl" onsubmit="return barcode_check()">
    koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-recieve.tt:     <form method="post" name="f2" action="serials-recieve.pl">
    serials/serials-recieve.pl:serials-recieve.pl

    Just a POD entry and self reference.

    After removing of files

    git grep removeMissingIssue .
    C4/Serials.pm:      &check_routing &updateClaim &removeMissingIssue
    C4/Serials.pm:=head2 removeMissingIssue
    C4/Serials.pm:removeMissingIssue($subscriptionid)
    C4/Serials.pm:sub removeMissingIssue {
    t/db_dependent/Serials.t:is(C4::Serials::removeMissingIssue(), undef, 'test removing a missing issue');

    Not used anymore

    To test:
    1) Apply the patch
    2) Check serials workflow, no changes must be noted

    Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>

    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
    (cherry picked from commit 65b7ad030cd5cd0e3148fbbd1496d31b5cf149f7)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

    Conflicts:
    	serials/serials-recieve.pl

commit 1da4936e05101e323ffdd8f4c2fc49631bd471d0
Author: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Date:   Tue Mar 24 14:54:57 2015 -0300

    Bug 13423: Remove unused JS function in serials-edit.tt

    This patch removes unused code:
     * barcode_check() function, with untranslatable strings
     * commented call to this function

    To test:
    1. Apply the patch
    2. Check serials receive, no changes shall be detected

    NOTE: I did not run this test plan.

    Verification steps
    ------------------
    1. Find out where barcode_check is used.
       $ git grep barcode_check
       -- This is only in serials-edit.tt and serials-receive.tt
    2. This patch only affects serials-edit.tt, so
       check who put the <!--onsubmit="return barcode_check()">-->
       $ git blame -L130 koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tt
       -- note the commit related number.
    3. Check out the commit.
       $ git show 77b64098
       -- should show bug 5917, but the patches on bugzilla don't
          have the change nicely, so...
    4. Hunt through the pages to find the change.
       -- Note: it is part of a "new file" diff!
    5. Since this code hasn't been running since it was added...
    6. apply the patch
    7. run koha-qa test tools

    Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
    Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>

    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
    (cherry picked from commit 9bfa7f9e29c78ca39c3dd97a798e293c41fc2a81)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

commit 3a8a4c7ea9c7b73e00bf268ec1d165abd80d5e31
Author: Marc Véron <veron at veron.ch>
Date:   Wed Apr 29 11:34:40 2015 +0200

    Bug 14077: Remove unused AUTH_UPDATE_FAILED from moremember.tt

    'AUTH_UPDATE_FAILED' in moremember.tt is never set and should be removed (see comment #6 on Bug 13910).

    To verify: git grep 'AUTH_UPDATE_FAILED'
    Result: Only one occurence (in moremember.tt)

    Test plan:
    - Apply patch (on top of Bug 13910)
    - Verify that the part with AUTH_UPDATE_FAILED is removed from moremember.tt
    - Go to a patron's detail page and verify that nothing is broken (Home > Patrons > Patrons details for...)

    Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
    This has been introduced by
      commit 1a91801b06607ee9e5f8c21d531a7b7a3ca3b683
      Date:   Sat Dec 1 20:56:27 2007 -0600
          Add Staff member type. Add permissions checks for bug# 1269
          and related permissions on memberentry and mods.
    But was already not used...

    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
    (cherry picked from commit c7a4b7e51b29a98c0b126504e0ff60a010ad7081)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

commit 917140b9f29ea6136aadfdca440b38fa40e92eb4
Author: Marc Véron <veron at veron.ch>
Date:   Wed Apr 29 11:18:08 2015 +0200

    Bug 13910: Line with AUTH_UPDATE_FAILED restored

    As of comment #6

    Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
    This should be fixed in a separate patch, this error is not sent to the
    template and the related code could be removed.

    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
    (cherry picked from commit eb80bedc29a0aad74a89c1dff9dffc9c40720793)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

commit 1b5ec8c50926f7c0e9e84c701ea4a4a635cd73ea
Author: Marc Véron <veron at veron.ch>
Date:   Thu Apr 23 22:50:17 2015 +0200

    Bug 13910: Prevent delete of one's own patron account

    This patch adds a check to prevent deleting the user's own account.
    Additionali it fixes a "missing link" in moremember.pl and wrong comparisions in moremember.tt regarding other forbidden deleting.

    To test:
    - Apply patch
    - Create a user with sufficient privileges to delete users
    - Log in as this new user
    - Try to delete this user. Confirm message box "Are you sure..."
    - Confirm that you get a message "Not allowed to delete own account" and that the user still exists.

    Bonus test:
    Try to trigger other forbidden deletions (see members/deletemem.pl): 'CANT_DELETE_STAFF', 'CANT_DELETE_OTHERLIBRARY', 'CANT_DELETE'
    (You can fake it by using an URL like: /cgi-bin/koha/members/moremember.pl?borrowernumber=115&error=CANT_DELETE_STAFF  etc.)
    Without patch, no message appears. With patch, messages appear as appropriate.

    Signed-off-by: Mark Tompsett <mtompset at hotmail.com>

    NOTE: Attempted all CANT combinations. From reading the code,
    this is kind of an important patch, because I'm not sure
    deleting error messages work at all right now based on what
    I read.

    Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
    (cherry picked from commit 1a54f0916ed96ae717cdca8ece53cf5998bafec3)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

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

Summary of changes:
 C4/Serials.pm                                      |   43 +--
 .../prog/en/modules/members/moremember.tt          |   16 +-
 .../prog/en/modules/serials/serials-edit.tt        |   31 --
 .../prog/en/modules/serials/serials-recieve.tt     |  363 --------------------
 members/deletemem.pl                               |    6 +
 members/moremember.pl                              |    2 +
 serials/serials-recieve.pl                         |  278 ---------------
 t/db_dependent/Serials.t                           |    4 +-
 8 files changed, 18 insertions(+), 725 deletions(-)
 delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-recieve.tt
 delete mode 100755 serials/serials-recieve.pl

hooks/post-receive
-- 
main Koha release repository