[koha-commits] main Koha release repository branch master updated. v3.22.00-1390-g567c994

Fri Apr 29 14:35:13 CEST 2016

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  567c99442f7497e747ae4068cdbbf95786c2689e (commit)
       via  eca286349b07c8f32f94c9fc73ef58ec5bf91fa4 (commit)
       via  497cd04df0dc68b2c3972343a64f0f5221cc6d70 (commit)
      from  fdda5d7d7cf8c724e57e5bb8b1e55533cb0e7b8b (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 567c99442f7497e747ae4068cdbbf95786c2689e
Author: Mark Tompsett <mtompset at hotmail.com>
Date:   Tue Apr 5 11:52:22 2016 -0400

    Bug 14305: RSS message correction follow-up

    If a user is not logged in but requests a specific branch,
    the RSS feed message fails to mention the branch.

    TEST PLAN
    ---------
    1) Apply first patch
    2) go to OPAC's opac-main.pl?branch={some branch with specific news}
       -- notice bad RSS message
    3) Apply this patch
    4) Repeat step 2
       -- notice branch is properly shown.
    5) koha qa test tools

    Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
    Signed-off-by: Owen Leonard <oleonard at myacpl.org>

    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>

commit eca286349b07c8f32f94c9fc73ef58ec5bf91fa4
Author: Martin Persson <xarragon at gmail.com>
Date:   Wed Aug 5 16:16:50 2015 +0200

    Bug 14305: View arbitrary branch's news

    This patch adds an input named 'branch' to opac-main.pl that
    allows overriding the home library to view news from any branch.

    This is part of the 'Use Koha as a CMS' development.

    To reviewers: Does this create any security implications?
                  The column is text; it is possbile to push SQL
                  statemens into the DB via the opac-membership.pl
                  page, but all the code there seems to use DBIx::Class
                  and prepared statements. When attemped, accepting the
                  changes were rejected because of the foreign key
                  constraint placed on the main borrowers table.

    It is recommended to use this patch in conjunction with 11584
    which adds a WYSIWYG editor to System Preferences.

    Test plan:
    * Make sure your Koha installation has multiple branches:
      * Log in to the Staff interface and select 'Koha administration'
      * Select 'Libraries and groups', the first item in the list
      * Add an extra branch named 'BRANCH1':
        * Press the 'New library' button
        * Set 'Library code' to 'BRANCH1'
        * Enter an arbitrary name
        * Press 'Submit'

    * Add at least two news items with different branches:
      * Log in to the Staff interface and select 'Tools'
      * Under 'Additional tools' select 'News'
      * On the 'Koha news' page, create a news item for all libraries:
        * Press the 'New entry' button
        * Set 'Library' to 'All libraries' and enter a title.
        * Press 'Submit'
      * On the 'Koha news' page, create a news item for one library:
        * Press the 'New entry' button
        * Set 'Library' to 'BRANCH1' and enter a title
        * Press 'Submit'

    * Add links to OPAC to select branch:
      * Select 'System preferences' and then the 'OPAC' tab
      * Scroll down to the 'OpacNav' preference and click 'Click to Edit'
      * Create two hyperlinks with a parameter named 'branch':
        * '<a href="?branch=BRANCH1">BRANCH1</a>'
        * '<a href="?branch=">none</a>'
      * Click 'Save all OPAC preferences'

    * Test OPAC:
      * By default, global news and news for home branch should show.
      * When clicking the 'BRANCH1' link, you should see global news
        plus news for the BRANCH1 branch.
      * When the parameter 'branch' is set but has no value,
        news from the home branch should be shown.

    Issues: Tricky to create a link to the same page
            which removes existing paramters.

    The user normally has a home branch set.
    We can override it with the parameter.
    If undefined, the home branch should be shown.

    Sponsored-by: Halland County Library

    http://bugs.koha-community.org/show_bug.cgi?id=14305

    Changed 2015-12-14: Whitespace fix

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

    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>

commit 497cd04df0dc68b2c3972343a64f0f5221cc6d70
Author: Martin Persson <xarragon at gmail.com>
Date:   Tue Aug 18 23:03:54 2015 +0200

    Bug 14305: View arbitrary branch's news, RSS fix

    This fix changes the RSS link to reflect the URL paramter override.

    This is less elegant than the existing solution which uses the
    Branches TT module, perhaps there is a better way?

    Sponsored-By: Halland County Library

    Test plan:
    * Follow instructions in the original patch but also check the
      URLs and contents of the RSS link at the bottom the OPAC page.

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

    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>

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

Summary of changes:
 koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt |    4 ++--
 opac/opac-main.pl                                     |    4 ++++
 2 files changed, 6 insertions(+), 2 deletions(-)

hooks/post-receive
-- 
main Koha release repository