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

[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.18.x has been updated
       via  9006187ab3953da0d6fa5305391bab907e5efdc3 (commit)
       via  21c27fbf8d19cc0d71ac1f903af7681b7667ddd7 (commit)
       via  e0b43dee074238dd6b1dabc6b8b2641d56f7d674 (commit)
      from  bd758e20f6fa6f624979197f106a438f987afe6e (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 9006187ab3953da0d6fa5305391bab907e5efdc3
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date:   Mon May 4 08:00:54 2015 +0200

    Bug 14129: templates.readme is outdated
    
    The file templates.readme dates back to CSV and
    HTML::Template times and is outdated.
    
    To test:
    - Verify the file is outdated and removed by this patch.
    
    Signed-off-by: Magnus Enger <magnus at enger.priv.no>
    If noone spotted the outdatedness of this file until now I
    agree with Katrin that we should get rid of it and maybe
    create something similar in the wiki. The patch works as
    advertised.
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
    (cherry picked from commit 2731ee8bfea2190dabe69c9393515e355446ab88)
    Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>

commit 21c27fbf8d19cc0d71ac1f903af7681b7667ddd7
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date:   Tue Apr 28 15:14:49 2015 +0200

    Bug 12253: Fix MARCUrls in basket
    
    At the OPAC and the intranet, the urls don't be displayed anymore.
    The variables used in the templates are not the good ones (MARCurlS vs
    MARCURLS).
    
    Test plan:
    1/ On the intranet side, add some urls to some records
    2/ Add these records to the basket
    3/ Add records without urls defined
    4/ Go on the basket view, click "more details"
    5/ You should see the urls displayed
    6/ Repeat steps 4-5 at the OPAC
    
    Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
    
    NOTE: 856$u displays now in intranet and OPAC. :)
    
    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 6a923f9cc666d3186d70299d0e18530c2bc26e97)
    Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>

commit e0b43dee074238dd6b1dabc6b8b2641d56f7d674
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date:   Mon Apr 13 05:56:24 2015 -0500

    Bug 13982: Checkouts table not sorting on correct column
    
    The "Date Due" column for checkouts is using the column index 1 to sort by.
    This column is the one that is used for grouping items into today's checkouts
    and previous checkouts. This is definitely not the column that should be used.
    Instead, we should be using column index 2, which contains the raw unformatted
    due date.
    
    Revised Test Plan:
    1) Find a patron with no checkouts
    2) Check out something as due the beginning on the month.
    3) Check out something as due the end of the month.
    4) Check out something due tomorrow (hopefully not end of month)
       -- so you should have 2015-04-01, 2015-04-30, and 2015-04-14
          (for example)
    5) Attempt to sort by due date
       -- Note the sorting is incorrect
    6) Apply this patch
    7) Clear your browser cache
    8) Reload the page
    9) Attempt to sort by due date again
       -- Note the sorting works correctly this time
    10) Verify there are no regressions with bug 13908
        -- this will require finding a patron with many checkouts,
           playing with the Circulation system preferences
           previousIssuesDefaultSortOrder and todaysIssuesDefaultSortOrder,
           and understanding what the four different cases mean with
           respect to actually manually sorting the 'Due Date' column.
    
    NOTE: I did not do step 10,
    Signed-off-by: Mark Tompsett <mtompset at hotmail.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 35acace47f6f2e10451563d6a8cc1a70810f63dc)
    Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>

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

Summary of changes:
 koha-tmpl/intranet-tmpl/prog/en/js/checkouts.js    |    2 +-
 .../intranet-tmpl/prog/en/modules/basket/basket.tt |   27 +--
 .../opac-tmpl/bootstrap/en/modules/opac-basket.tt  |   19 +-
 koha-tmpl/templates.readme                         |  190 --------------------
 4 files changed, 26 insertions(+), 212 deletions(-)
 delete mode 100644 koha-tmpl/templates.readme


hooks/post-receive
-- 
main Koha release repository