[koha-commits] main Koha release repository branch master updated. v3.14.00-389-g33bdec2

Git repo owner gitmaster at git.koha-community.org
Fri Jan 31 21:11:26 CET 2014


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  33bdec2c3df1afe927a5765f45a38ee6731ccdc8 (commit)
       via  25f134f525a1997ab60ce20a597cb09f5c533177 (commit)
      from  3cbf11a2bf3c253270214823a71b8b8f807e6a52 (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 33bdec2c3df1afe927a5765f45a38ee6731ccdc8
Author: Mark Tompsett <mtompset at hotmail.com>
Date:   Tue Jan 7 14:43:31 2014 -0500

    Bug 11491: (QA follow-up) updated license and use Modern::Perl
    
    Replaced License text with latest one from
        http://wiki.koha-community.org/wiki/Coding_Guidelines#Licence
    and tweaked copyright lines accordingly.
    
    Also changed use strict and use warnings into use Modern::Perl
    as per PERL2 from the coding guidelines.
    
    TEST PLAN
    ---------
    1) less ~/kohaclone/opac/svc/report
       - The license does not reflect the current license
       - This will have use strict and use warnings
    2) Apply patch
       - The license should be corrected
    3) It should still run
         https://.../cgi-bin/koha/svc/report?id=##
         https://.../cgi-bin/koha/svc/report?id=##&annotated=blah
       Where ## reflects a public report available (for OPAC).
    
    Signed-off-by: Holger Meißner <h.meissner.82 at web.de>
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>

commit 25f134f525a1997ab60ce20a597cb09f5c533177
Author: Mark Tompsett <mtompset at hotmail.com>
Date:   Tue Jan 7 14:39:46 2014 -0500

    Bug 11491: add option to supply field names in reports web service output
    
    The staff and public catalog reports web services (/svc/report) return
    JSON output, in particular an array contain an array for each row
    of the report output.
    
    This patch adds a URL parameter, annotated, which when supplied and
    set to a value that evaluates to Perl true, will cause the output
    to be emited as a JSON array of hashes, where each hash represents
    a row of report output and the hash keys are the column names
    or labels set in the report definition.
    
    This patch also moves code around to make diffs between svc/report and
    opac/svc/report smaller.
    
    The suggestion to return an array of hashes was made by Chris Cormack.
    
    TEST PLAN
    ---------
     1) Log into staff client
     2) Reports
     3) Used save reports
     4) Click the Action button on any report
         WITHOUT PARAMETERS.
        -- with parameters blows up in master and this.
     5) Click Edit
     6) Make the report public
     7) Update the SQL
     8) Note the ID number of the report
     9) Note the ID number of a non-public report
    10) Make up a crazy ID number for a non-existant report
    11) In a new tab (with the appropriate edits)
         https://OPAC/cgi-bin/koha/svc/report?id=# from step 8
        -- JSON data has arrays of field values.
         https://OPAC/cgi-bin/koha/svc/report?id=# from step 8&annotated=1
        -- JSON data has arrays of field values.
         https://OPAC/cgi-bin/koha/svc/report?id=# from step 9
        -- Software error: Sorry this report is not public
         https://OPAC/cgi-bin/koha/svc/report?id=# from step 9&annotated=1
        -- Software error: Sorry this report is not public
         https://OPAC/cgi-bin/koha/svc/report?id=# from step 10
        -- Software error: Sorry this report is not public
         https://OPAC/cgi-bin/koha/svc/report?id=# from step 10&annotated=1
        -- Software error: Sorry this report is not public
         https://STAFF/cgi-bin/koha/svc/report?id=# from step 8
        -- JSON data has arrays of field values.
         https://STAFF/cgi-bin/koha/svc/report?id=# from step 8&annotated=1
        -- JSON data has arrays of field values.
         https://STAFF/cgi-bin/koha/svc/report?id=# from step 9
        -- JSON data has arrays of field values.
         https://STAFF/cgi-bin/koha/svc/report?id=# from step 9&annotated=1
        -- JSON data has arrays of field values.
         https://STAFF/cgi-bin/koha/svc/report?id=# from step 10
        -- Software error: hash- or arrayref expected (not a simple scalar, use allow_nonref to allow this) at /usr/share/perl5/JSON.pm line 154.
         https://STAFF/cgi-bin/koha/svc/report?id=# from step 10&annotated=1
        -- Software error: hash- or arrayref expected (not a simple scalar, use allow_nonref to allow this) at /usr/share/perl5/JSON.pm line 154.
    
    12) Apply the patch
    13) ~/qa-test-tools/koha-qa.pl -v 2 -c 2
        -- There should be no problems. All OK.
    
    14) In a new tab (with the appropriate edits)
         https://OPAC/cgi-bin/koha/svc/report?id=# from step 8
        -- JSON data has arrays of field values.
         https://OPAC/cgi-bin/koha/svc/report?id=# from step 8&annotated=1
        -- JSON data has arrays of hashes with field names as keys
         https://OPAC/cgi-bin/koha/svc/report?id=# from step 9
        -- Software error: Sorry this report is not public
         https://OPAC/cgi-bin/koha/svc/report?id=# from step 9&annotated=1
        -- Software error: Sorry this report is not public
         https://OPAC/cgi-bin/koha/svc/report?id=# from step 10
        -- Software error: There is no such report.
         https://OPAC/cgi-bin/koha/svc/report?id=# from step 10&annotated=1
        -- Software error: There is no such report.
         https://STAFF/cgi-bin/koha/svc/report?id=# from step 8
        -- JSON data has arrays of field values.
         https://STAFF/cgi-bin/koha/svc/report?id=# from step 8&annotated=1
        -- JSON data has arrays of hashes with field names as keys
         https://STAFF/cgi-bin/koha/svc/report?id=# from step 9
        -- JSON data has arrays of field values.
         https://STAFF/cgi-bin/koha/svc/report?id=# from step 9&annotated=1
        -- JSON data has arrays of hashes with field names as keys
         https://STAFF/cgi-bin/koha/svc/report?id=# from step 10
        -- Software error: There is no such report.
         https://STAFF/cgi-bin/koha/svc/report?id=# from step 10&annotated=1
        -- Software error: There is no such report.
    
    Signed-off-by: Holger Meißner <h.meissner.82 at web.de>
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>

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

Summary of changes:
 opac/svc/report |   41 ++++++++++++++++++++++++-----------------
 svc/report      |   40 ++++++++++++++++++++++++----------------
 2 files changed, 48 insertions(+), 33 deletions(-)


hooks/post-receive
-- 
main Koha release repository


More information about the koha-commits mailing list