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

[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  3c5e3170b9c62b3f881fdecb15d83a0bc35eed65 (commit)
       via  a9719215b45c99e9fa2429992d2b2b1daa1c6cf3 (commit)
       via  d892340cf53ca945906bd2f50615eab72781238f (commit)
       via  47bd795b828c7b99524145fe337ea0c6ac7d588f (commit)
      from  402435b17a1ae32fb41b6fdde39b94059fdb2c2f (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 3c5e3170b9c62b3f881fdecb15d83a0bc35eed65
Author: Galen Charlton <gmc at esilibrary.com>
Date:   Sun Sep 8 02:28:45 2013 +0000

    Bug 10325: (follow-up) add test for overriding system preferences
    
    To test:
    
    [1] Verify that prove -v t/db_dependent/sysprefs.t passes.
    
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>

commit a9719215b45c99e9fa2429992d2b2b1daa1c6cf3
Author: Galen Charlton <gmc at esilibrary.com>
Date:   Sun Sep 8 02:16:59 2013 +0000

    Bug 10325: (follow-up) fix typos and whitespace in httpd.conf example
    
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>

commit d892340cf53ca945906bd2f50615eab72781238f
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date:   Thu Aug 15 13:49:07 2013 -0400

    Bug 10325 - QA Followup - Fix typos
    
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>

commit 47bd795b828c7b99524145fe337ea0c6ac7d588f
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date:   Fri May 24 06:56:50 2013 -0400

    Bug 10325 - Allow system preferences to be overridable from koha-httpd.conf
    
    For Koha installations with multiple OPAC URLs, It would be nice to be
    able to override systeprefs from the http conf file. Case in point,
    a library wants to have two separate opacs, one the is only viewable
    from within the library that allows patrons to place holds, and a second
    public one that does not. In this case, overriding the system preference
    RequestOnOpac would accomplish this simply, and with no ill affects.
    
    This feature would of course be should only be used to override
    cosmetic effects on the system, and should not be used for system
    preferences such as CircControl, but would be great for preferences
    such as OpacStarRatings, opacuserjs, OpacHighlightedWords and many
    others!
    
    Test Plan:
    1) Apply this patch
    2) Disable the system pref OpacHighlightedWords
    3) Do a seach in the OPAC, not the term is not highlighted
    4) Edit your koha-http.conf file, add the line
         SetEnv OVERRIDE_SYSPREF_OpacHighlightedWords "1"
       to your koha-http.conf file's OPAC section.
       Also add the line
         SetEnv OVERRIDE_SYSPREF_NAMES "OpacHighlightedWords"
       to the Intranet section
    5) Restart your web server, or just reload it's config
    6) Do a seach, now your search term should be highlighted!
    7) From the intranet preference editor, view the pref,
       You should see a warning the this preference has been overridden.
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>

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

Summary of changes:
 C4/Context.pm                                      |   27 ++++++++++------
 admin/preferences.pl                               |    5 ++-
 etc/koha-httpd.conf                                |   12 +++++++
 .../intranet-tmpl/prog/en/css/preferences.css      |    8 ++++-
 .../prog/en/modules/admin/preferences.tt           |    6 +++
 t/db_dependent/sysprefs.t                          |   34 +++++++++++++++++++-
 6 files changed, 79 insertions(+), 13 deletions(-)


hooks/post-receive
-- 
main Koha release repository