[koha-commits] main Koha release repository branch 3.12.x updated. v3.12.03-21-gc4bf7d8
Git repo owner
gitmaster at git.koha-community.org
Wed Aug 14 16:17:09 CEST 2013
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.12.x has been updated
via c4bf7d825141261a8a1563790f4e4a767647a779 (commit)
via d8eeb697c873b1ba9366bbce275a14d004931f40 (commit)
via 8871a6a2add5cbdef3a46267a54fc78ddf995687 (commit)
via 7a76c515edaa3b49a0d52097476c465bdb744a71 (commit)
via fdb1d099c5489f200b7b36125ed4ccddd00e3d4c (commit)
via c7e19ee643730b06dc0f0ab2665c31f65b8e86e4 (commit)
via 5e7452758949e037fcf286cead721b559dd7d0e3 (commit)
via 3db6e17c9eb05e3680328a76b352aa9cf555db43 (commit)
via 094bfd0d17689c92a4e9366af63ffb7fcbe99399 (commit)
from 1ebaaa8c4b3c27afa9fd2ef67a9430fafb82b544 (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 c4bf7d825141261a8a1563790f4e4a767647a779
Author: Owen Leonard <oleonard at myacpl.org>
Date: Thu Jul 18 11:30:35 2013 -0400
Bug 7598: [Follow-up] make strings in acquisitions JavaScript translatable
This follow-up addresses QA comments and moves punctuation and line
breaks out of the string to be translated.
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit b38187d8b004316b17d1e67753d638e96bb62bb8)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit d8eeb697c873b1ba9366bbce275a14d004931f40
Author: Owen Leonard <oleonard at myacpl.org>
Date: Mon Sep 10 08:34:33 2012 -0400
Bug 7598: make strings in acquisitions JavaScript translatable
English strings in acq.js cannot be processed by the translation script.
This patch moves the strings to the templates to be set as JS variables
for use by the script.
To test:
- On the uncertain prices page, enter an invalid price and click save.
You should see a JavaScript alert pointing this out.
- When adding a fund to an existing budget, enter an amount which
exceeds the amount in the parent budget. You should see a JavaScript
alert pointing this out. There is a similar function which has been
corrected, checkBudgetParent(), but I don't know how to trigger it for
testing.
The closebasketgroup function has been updated but as far as I can tell
it's not actually in use.
Signed-off-by: Srdjan <srdjan at catalyst.net.nz>
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit f69e13665da007a6ab28e4c1d5a7d1a50f3ac3ac)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 8871a6a2add5cbdef3a46267a54fc78ddf995687
Author: David Cook <dcook at prosentient.com.au>
Date: Thu Jun 27 16:02:08 2013 +1000
Bug 9801: display facet labels in search results only when there are facet values
Currently, the headings for facets (such as location) are showing even
if there are no actual values/links for that facet type.
This patch simply checks if the facet array contains any facets before
printing the heading and HTML for each facet value/link.
Test Plan:
Before applying:
0) If you want to check the location facet (which is easiest),
enable singlebranch mode in the globals system preferences.
1) Do a search for records/items that you have no shelving location
specified (or simply remove the shelving location for a small range
of records that you can find in a search query).
2) Note that "Location" appears amongst the facets even though there
are no values/links present. (If you look at the HTML source, you'll
see some empty HTML tags have been printed out.)
Apply patch.
3) Flush your cache and refresh your page.
4) You should no longer see a "Location" facet (or those empty HTML
tags) on the facet sidebar.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Template changes only.
Checked according to test plan, made sure location facet
still shows up when values exist, otherwise it's hidden.
It might make sense to add ids to the facets so libraries
can decide to hide some of them easily. Or alternatively
add a system preference to make that possible.
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit f01606d89b487d585bf06eae1dd6de6ff138eab9)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 7a76c515edaa3b49a0d52097476c465bdb744a71
Author: Owen Leonard <oleonard at myacpl.org>
Date: Mon Jun 10 12:14:15 2013 -0400
Bug 2774 - Path to theme is hard-coded in many places
This patch corrects more places in Koha where the path to the "prog"
theme is hard-coded in templates, CSS, and scripts.
Staff client home page:
Paths to the Koha logo background image and the module image sprite have
been corrected. Inactive and hover states of the module links
(circulation, patrons, etc) should look correct.
addbiblio.pl:
An <img> tag is replaced with a text link and an
additional CSS class. CSS uses an image-replacement technique to display
the image as before.
To test, open a blank or existing bibliographic record for editing.
Confirm that the "tag editor" icon displays correctly in two cases: 1)
tags linked to plugin editors and 2) tags linked to authorities. Both
should look correct and work correctly.
System preferences:
The system preferences editor appends a "loading" image to system
preference submit buttons when they are clicked. This patch changes
ajax.js to insert a <span> styled with a background-image instead.
To test, open system preferences and modify any preference. Submit the
change and confirm that the "loading" image appears correctly.
Background jobs:
Any place in Koha where a background job is used displays a progress
bar. This patch corrects the path in CSS to the progress bar image. To
test, perform an action which triggers the display of a progress bar.
For instance, batch modification of items. Confirm that the progress bar
image displays correctly.
blue.css:
I don't know if this is still used by anyone, but a couple of image
paths in this CSS file have been corrected.
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Passes all tests, QA script and test plan.
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit 538ab5631ef18640d1d9cac6e25ed2f9f2ef11cd)
Conflicts:
koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit fdb1d099c5489f200b7b36125ed4ccddd00e3d4c
Author: David Cook <dcook at prosentient.com.au>
Date: Thu Jun 13 16:46:46 2013 +1000
Bug 10457: fix SQL error when using 'export select items data' in serials claims page
Currently, if you use the "check all" checkbox next to the "Vendor"
table header, and try to "Export selected items data", you'll
see the following SQL error in the Apache error log:
DBD::mysql::st execute failed: You have an error in your SQL syntax;
check the manual that corresponds to your MySQL server version for
the right syntax to use near 'on ORDER BY title' at line 12 at
/.../lib/C4/Serials.pm line 1828.
This is because the Javascript that produces the re-direct URL is
including the value of the checkall checkbox, which is "on",
as a "serialid".
We need to only take checkboxes with a name of "serialid" when
crafting the re-direct link.
This patch adds the [name=serialid] attribute selector to the Jquery
that creates the URL to lateissues-excel.pl from claims.pl.
Test Plan:
Before applying the patch:
1) Go to Serials > Claims (found on the left navigation bar of Serials)
2) Choose a vendor that has serials to claim (or create some late
serials for a vendor so that they will show up)
3) Click on the checkbox to the left of the "Vendor" table heading.
4) Click "Export selected items data" at the bottom of the page
5) Check the Apache error log. Notice that you'll get a SQL error
like the one in the message above.
Apply the patch.
Repeat Steps 1-4.
Note that you should now have a CSV file downloading rather than
getting a SQL error.
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit 3834d1f2b4494d465c6d1ab72aa334100898a756)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit c7e19ee643730b06dc0f0ab2665c31f65b8e86e4
Author: Owen Leonard <oleonard at myacpl.org>
Date: Mon Jul 8 14:37:03 2013 -0400
Bug 10553: make public lists available on OPAC login page
If you are not logged in to the OPAC, looking at the login page, and you
click the Lists button to see public lists it says there are none. This
patch corrects Auth.pm so that it loads the list of public lists in this
situation.
To test you must have at least one public list. Make sure you are logged
out of the OPAC and visit the login page (/cgi-bin/koha/opac-user.pl).
Clicking the "Lists" button should show you a list of public shelves.
Signed-off-by: Liz Rea <liz at catalyst.net.nz>
works as described, and list button is not shown when opacpublic is disabled.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit 651f810f68f82f4aac254c4a78bb6a4517dcb558)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 5e7452758949e037fcf286cead721b559dd7d0e3
Author: Galen Charlton <gmc at esilibrary.com>
Date: Tue Jul 9 17:53:16 2013 +0000
bug 10559: remove spurious "statement handle still active" warnings
Generating (e.g.) overdue notices can result in spurious warnings in
the cronjob logs:
$ ./misc/cronjobs/overdue_notices.pl -t -library CPL
prepare_cached(SELECT * FROM issues WHERE itemnumber = ?) statement handle DBI::st=HASH(0x54a7828) still Active at C4/Letters.pm line 589
This patch removes the warning by making sure that the relevant statement
handle is finished after fetching its first row of results.
To test:
[1] Set up an overdue loan such that running overdue_notices.pl will
trigger the generation of a notice.
[2] Run overdue_notices.pl -t and note the warning message.
[3] Apply the patch.
[4] Run overdue_notices.pl -t again and note that the warning message
is no longer displayed.
[5] Check the message_queue table and verify that the overdue
notices generated in steps 2 and 4 have the same text.
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
Signed-off-by: Srdjan <srdjan at catalyst.net.nz>
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit 2bab95cac5f43b034adec36ec62a8c8f7f520627)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 3db6e17c9eb05e3680328a76b352aa9cf555db43
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Tue Jul 16 12:50:25 2013 -0400
Bug 10597: fix Search to hold button on record details page
The holds button in cat-toolbar is broken for "search to hold". It is a
split button rather than a dropdown button. Clicking the caret works
fine, but clicked the button sends you to the marc editor!
Test Plan:
1) View a patron's details page
2) Click 'search to hold'
3) Search for something
4) On the results page, click a result line's title link (
catalogue/detail.pl )
5) Note the "Place hold" button is a split button, click the left half
of the button, note it redirects you to the editor.
6) Apply this patch
7) Repeat steps 1-5
Signed-off-by: Srdjan <srdjan at catalyst.net.nz>
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit b77af9326232d8512527040c4984b7bdc167c388)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 094bfd0d17689c92a4e9366af63ffb7fcbe99399
Author: Mirko Tietgen <mirko at abunchofthings.net>
Date: Tue Jul 16 21:51:01 2013 +0200
Bug 10595: don't display OpacTopissue page when system preference is turned off
When the syspref is turned off, the link is hidden but the page is still
accessible. This patch checks the syspref and redirects to 404 if it is disabled.
Test plan:
Before applying the patch
Enable OpacTopissue
Observe there is a link to opac-topissues.pl next to Advanced search etc.
Follow that link, observe that opac-topissues.pl is loading
Disable OpacTopissue
Observe the link is gone
Manually open /koha/opac-topissues.pl and check that it is loading even though the feature is disabled
Apply patch
(OpacTopissue still diabled)
Manually open /koha/opac-topissues.pl and observe that you are being redirected to the 404 page.
Enable OpacTopissue
Follow the link or manuall open opac-topissues.pl and check that it is working
Signoff the patch.
Signed-off-by: Srdjan <srdjan at catalyst.net.nz>
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit 04ca81bc358f1bc6425e1cef431d9e4abfc744d8)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
Works as expected
-----------------------------------------------------------------------
Summary of changes:
C4/Auth.pm | 8 ++++++
C4/Letters.pm | 1 +
cataloguing/addbiblio.pl | 6 ++--
koha-tmpl/intranet-tmpl/prog/en/css/blue.css | 6 ++--
koha-tmpl/intranet-tmpl/prog/en/css/mainpage.css | 4 +-
.../intranet-tmpl/prog/en/css/preferences.css | 9 +++++++
.../intranet-tmpl/prog/en/css/staff-global.css | 24 ++++++++++++++----
.../intranet-tmpl/prog/en/includes/cat-toolbar.inc | 17 +++++++------
.../intranet-tmpl/prog/en/includes/facets.inc | 2 +
koha-tmpl/intranet-tmpl/prog/en/js/acq.js | 26 +++++++------------
koha-tmpl/intranet-tmpl/prog/en/js/ajax.js | 10 ++++----
.../prog/en/modules/acqui/basketgroup.tt | 6 ++++
.../prog/en/modules/acqui/uncertainprice.tt | 1 +
.../prog/en/modules/admin/aqbudgets.tt | 8 ++++++
.../prog/en/modules/serials/claims.tt | 5 +--
.../opac-tmpl/prog/en/includes/opac-facets.inc | 2 +
opac/opac-topissues.pl | 7 +++++
17 files changed, 97 insertions(+), 45 deletions(-)
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list