[koha-commits] main Koha release repository branch new/bug_9824 updated. v3.12.00-beta1-548-g7acdcb7

[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, new/bug_9824 has been updated
       via  7acdcb7e2aedf2ff202c009ce053de6dff54e840 (commit)
       via  529434cab891a8b76b3792e12e359f8c8b171519 (commit)
      from  a0a6d6e64bca28b4d9bc668f614ed286b07327f9 (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 7acdcb7e2aedf2ff202c009ce053de6dff54e840
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date:   Fri May 17 21:12:05 2013 +0200

    Bug 9824: Make it possible to apply/cancel switch
    
    Using another existing string 'Apply filter' we are now
    able to cancel the filter... and apply it... and cancel it
    again... and so on.
    
    Signed-off-by: Owen Leonard <oleonard at myacpl.org>
    Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>

commit 529434cab891a8b76b3792e12e359f8c8b171519
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Fri May 17 19:01:06 2013 +0200

    Bug 9824: Followup for removing filter
    
    Adds allbaskets parameter to GetBasketsInfosByBookseller. (Only used in booksellers.pl now)
    Normally, all 'active' baskets are shown. With allbaskets=1 all baskets :)
    In the template I had to rename a loop var supplier to supplier1 to resolve
    name conflict between template vars.
    In the template I added the string: Cancel filter.
    Note that this string is already translated:
    msgid "Cancel filter"
    msgstr ""
    Hope this helps.
    
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    Undoing the filter works and I checked that the string gets
    translated with the po files in current master.
    So this is almost perfect, only we can't apply the filters
    again and the link remains 'cancel' when we already did.
    Sending a follow-up trying to fix this.
    Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>

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

Summary of changes:
 C4/Acquisition.pm                                  |   12 +++++++-----
 acqui/booksellers.pl                               |    4 +++-
 .../prog/en/modules/acqui/booksellers.tt           |   11 +++++++++--
 3 files changed, 19 insertions(+), 8 deletions(-)


hooks/post-receive
-- 
main Koha release repository