[koha-commits] main Koha release repository branch 3.20.x updated. v3.20.10-52-g48f1119

[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.20.x has been updated
       via  48f1119a547a9bb280b6a27c4524302cb3716e71 (commit)
       via  cd9170d249d3ff16c3e0290021a8a40ea4af1a24 (commit)
       via  f49adba138c7deb6736c50a75e1863b1d4647669 (commit)
      from  9aea6d98ab95b0b5d7b8d97f5d726f30737a6483 (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 48f1119a547a9bb280b6a27c4524302cb3716e71
Author: Marc Véron <veron at veron.ch>
Date:   Wed Apr 27 12:38:58 2016 +0200

    Bug 12721: (followup) Replace mysqlism by DBIx::Class
    
    This patch removes the mysqlism (see comment #18)
    
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    Fixed QA tools complaints about missing lines before
    and after =cut in POD.
    
    Signed-off-by: Brendan Gallagher <brendan at bywatersolutions.com>
    (cherry picked from commit ef97b6b301a5c1a9ef5c63cc93933bf7442513fc)
    Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
    (cherry picked from commit 8fb9837adeecce2896085d9f3d463633a2cbb8ae)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

commit cd9170d249d3ff16c3e0290021a8a40ea4af1a24
Author: Marc Véron <veron at veron.ch>
Date:   Sun Oct 18 16:28:52 2015 +0200

    Bug 12721 - Prevent software error if incorrect fieldnames given in sypref StatisticsFields
    
    To reproduce issue:
    See comment #1
    
    To test:
    - Apply patch
    - Leave syspref StatisticsFields empty
    - Display statistics for an author
    
      => Result: Table displays Shelving location, Collection code, Item type
               (as before)
    
    - Change syspref to any combination of location|itype|ccode
      => Result: Table displays columns as appropriate
    
    - Change syspref to some garbage
      => Result: Same as with empty syspref (was crashing without patch)
    
    - Change syspref to valid combination with trailing |
      => Result: Table displays columns as appropriate (was crashing
         without patch)
    
    - Change syspref to a combination of valid and invalid fields
      (location|blah|ccode)
      => Result: Table displays column of valid fields only (was crashing
         without patch)
    
    Signed-off-by: Aleisha <aleishaamohia at hotmail.com>
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Brendan Gallagher <brendan at bywatersolutions.com>
    (cherry picked from commit 5fc93bce9b786797724539bea1a1689e959078e6)
    Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
    (cherry picked from commit 36392d8a0cc07c3d5de51ec53c529d3a7d777508)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

commit f49adba138c7deb6736c50a75e1863b1d4647669
Author: Marc Véron <veron at veron.ch>
Date:   Sun Oct 18 18:27:58 2015 +0200

    Bug 12721 - Syspref StatisticsFields: Warning on About page and text change in System preferences
    
    This patch adds a warning to the about page if the syspref 'StatisticsFields' is misconfigured.
    Additionally, the text on Home > Administration > SystemPreferences for 'Statistics Fields'
    is changed.
    
    To test:
    - Apply patch
    - Edit syspref 'StatisticsFields'. Verify that the explanation makes sense.
    - Leave field empty
      => verify that no message appears on About page, tab System information
    - Insert valid field names, e.g. location|itype
      => verify that no message appears on the About page
    - Add trailing char
      => verify that the warning message appears on the About page
    - Fill in some garbage or misspell a field name
      => verify that the warning message appears on the About page
    
    Signed-off-by: Aleisha <aleishaamohia at hotmail.com>
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Brendan Gallagher <brendan at bywatersolutions.com>
    (cherry picked from commit 95f492b4d2505103269b295a34bab74804df9746)
    Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
    (cherry picked from commit f6694ce92ff4b60aea1234e9a138853fb0406f18)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

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

Summary of changes:
 C4/Members/Statistics.pm                           |   36 +++++++++++++++++---
 about.pl                                           |   11 ++++++
 koha-tmpl/intranet-tmpl/prog/en/modules/about.tt   |    7 ++--
 .../prog/en/modules/admin/preferences/patrons.pref |    2 +-
 4 files changed, 48 insertions(+), 8 deletions(-)


hooks/post-receive
-- 
main Koha release repository