Marcel de Rooy [Wed, 22 May 2013 13:01:07 +0000 (15:01 +0200)]
Bug 10381: Followup adding some text around Apply/cancel filter.
The texts Apply/cancel filter did not need translation and were used to get
this change into 3.12.
For 3.12.X or 3.14 we can add some words to clarify its meaning.
With thanks to Owen for some rewording.
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Pierre Angot <tredok.pierre@gmail.com> Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com> Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 600eff7827be1c396e7ea13cd7c7159003d6c794) Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit 8fc93e7abced06ae5adce80e123e061aea46950a)
Marcel de Rooy [Wed, 22 May 2013 12:51:00 +0000 (14:51 +0200)]
Bug 10381: POD lines of GetBasketsInfosByBookseller
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Cedric Vita <cedric.vita@dracenie.com> Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com> Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 5bf996f68d2279ae9582b338b3d094ad20f7596c) Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit 1530cee8a50006bbaa013676917086175401968c)
Katrin Fischer [Fri, 17 May 2013 19:12:05 +0000 (21:12 +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@myacpl.org> Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit 7acdcb7e2aedf2ff202c009ce053de6dff54e840)
Marcel de Rooy [Fri, 17 May 2013 17:01:06 +0000 (19:01 +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@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@cpbibliography.com>
(cherry picked from commit 529434cab891a8b76b3792e12e359f8c8b171519)
Lyon3 Team [Thu, 21 Mar 2013 13:47:43 +0000 (14:47 +0100)]
Bug 9824 - Hide basket with no expected items in basqket list by bookseller
Before patch you will see in acqui/booksellers.pl all the baskets ever
created.
After the patch you will see in acqui/booksellers.pl only the basket
with expected items.
Test plan :
* Create a basket with some orders lines
You should see this basket in acqui/booksellers.pl
* receive or cancel all the line in this basket
This basket shouldn't appear any more in acqui/booksellers.pl
Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit a0a6d6e64bca28b4d9bc668f614ed286b07327f9)
Marcel de Rooy [Wed, 22 May 2013 12:51:00 +0000 (14:51 +0200)]
Bug 10381: POD lines of GetBasketsInfosByBookseller
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Cedric Vita <cedric.vita@dracenie.com> Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com> Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 5bf996f68d2279ae9582b338b3d094ad20f7596c) Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit 1530cee8a50006bbaa013676917086175401968c)
Bug 10359: transform masthead dropdown after user JS for CCSR
Since libraries may want to customize the options in the masthead search
dropdown, which is done via dropdown, it would be better if the select
box were transformed *after* user javascript was run.
To test:
1) Switch to the CCSR OPAC theme.
2) Add some Javascript to your OpacUserJS that will modify the masthead
search dropdown, such as:
$("select[name='idx']").append("<option value='Host-item,wrdl'>Journal title</option>");
3) Note that when you view the OPAC, the results in the dropdown are unchanged.
4) Apply patch.
5) Note that your new option now shows up.
6) Sign off.
Signed-off-by: Mirko Tietgen <mirko@abunchofthings.net> Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com> Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit ff2b4d1ff5992989478f83517d95f957c4af50d4) Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit 8d27bd783ebb353aea3d1a428b42b0b012b9d5a0)
Galen Charlton [Mon, 20 May 2013 17:12:44 +0000 (10:12 -0700)]
bug 10292: improve fallback logic for picking XSLT
This patch fixes a bug whereby XSLT files from the
prog theme would be used (for English OPACs and staff
interfaces) even if the user had created and enabled a
custom theme that provided override XSLT files.
This patch provides a clearer implementation of the fallback
logic and adds test cases.
To reproduce the bug:
[1] Set OPACXSLTDetailsDisplay to 'default' and English as the OPAC
language.
[2] Create a new OPAC theme, including copying the XSLT files.
[3] Set opactheme to the new theme.
[4] Make a change to koha-tmpl/opac-tmpl/NEWTHEME/en/xslt/MARC21slim2OPACDetail.xsl
[5] View a bib record in the OPAC. The change made in the previous step
is not reflected.
To test after applying the patch:
[6] Reload the bib record in the OPAC. The change made in step 4 should
now be reflected.
[7] (To be thorough) Go through the test plan for bug 8947
and verify that there is no regression.
Signed-off-by: Galen Charlton <gmc@esilibrary.com> Signed-off-by: Mirko Tietgen <mirko@abunchofthings.net> Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com> Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit b0eeb00d48892c2ea7f42d787dae10364537ed6f) Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit d68bb6b8c03c1d538b29448b5baf0dfb13cca736)
Kyle M Hall [Thu, 16 May 2013 18:02:24 +0000 (14:02 -0400)]
Bug 10262 - fine calculation at checkin not respecting CircControl
The fines.pl script uses the system preference CircControl to decide
what branches circ rules to use for fine generation.
Recently, code was added to the returns system to recalculate the fine
at checkin time ( to support hourly loans ). The problem is that this
code does not respect CircControl.
Test Plan:
1) Set circ control to "the library you are logged in at"
2) Set different fines rules for two different librarys
3) Check an item out at library A, backdate the due date so it's overdue
and will have fines.
4) Check the item in at library B
5) Observe that the fines should be generated based on library A's rules,
but the fines will be based on library B's rules instead!
5) Apply the patch
6) Repeat steps 3 and 4.
7) Observe now that the fines should reflect the fines rules for Library A
Note: it seems counter-intuitive for the fines system to behave this way
based on the preference being set to "the library you are logged in at"
but it does make sense. The rules used are from "the library you are
logged in at" when the item is first checked out.
If the fines system really did use the rules for the library the item was
returned to, it would be easy to exploit the library system. Some Koha
using systems have branches that charge fines, and others that don't, so
a patron could just return any overdue items to a non-charging branch
to avoid ever paying fines!
Furthermore, it would mean that the fines.pl script would be using one
set of rules to charge fines, and the returns system could possibly be
using another. Since fines.pl has been around far longer, it makes sense
to assume the fines.pl behavior is canonical.
Signed-off-by: Mickey Coalwell <mcoalwell@nekls.org> Signed-off-by: George Williams <georgew@latahlibrary.org> Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz> Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Merged with reservations; see comment on bug report for details.
Owen Leonard [Mon, 13 May 2013 19:07:34 +0000 (15:07 -0400)]
Bug 10218 - In OPAC XSLT search results, add class to 'online access'
In some cases in OPAC search results and the detail page there is a
class specific to each line of data being output (publisher, date,
subjects, etc). In other cases there is no additional class. This patch
makes modifications to a few different OPAC files in an attempt to make
them consistent with each other.
To test, apply the patch and view:
- an OPAC detail page with OPACXSLTDetailsDisplay off
- the OPAC search results page with OPACXSLTDetailsDisplay off
- the OPAC search results page with OPACXSLTDetailsDisplay on
Labels should have classes relevant to their data. To test the specific
case requested by this bug, view details/results for a record which
includes online resources (856u in MARC21).
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
html changes only, passes all tests
Colin Campbell [Fri, 3 May 2013 14:35:44 +0000 (15:35 +0100)]
Bug 10184 - Circulation History reverses sort order
Issue data is passed to the readingrec template ordered
most recent due date first. Datatables unless specified
otherwise do a presort on the data they will display
the default results in an order the reverse of what was
intended. Disabling the presort preserves the initial sort
order until the user selects a different sort
Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz> Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 3285261d0150113e597d48a5a78aee5fdc1ebd94)
Owen Leonard [Mon, 13 May 2013 19:21:46 +0000 (15:21 -0400)]
Bug 10193 - Copies should be holdings as label for items on MARC view
In the OPAC MARC view, the table of holdings is labeled 'copies.' In
order to be consistent with the normal view this should be labeled
'holdings.' This patch makes this correction.
To test, apply the patch and view the MARC detail page for any record
with items. The table of holdings data at the bottom of the page should
be labeled 'Holdings.'
Signed-off-by: Mirko Tietgen <mirko@abunchofthings.net> Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com> Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 492a1a19f99c27ccbb94cab2fa4318379076bc6f)
Katrin Fischer [Sun, 19 May 2013 10:16:16 +0000 (12:16 +0200)]
Bug 10284: Add missing spaces between label and content in XSLT view (780/785)
To test:
- Check OPAC and intranet XSLT view for a record that contains
780 and 785 fields.
- Verify there is no space between the label and the content of the
field.
- Apply patch.
- Verify the display both in intranet and OPAC is a little nicer now.
Signed-off-by: Galen Charlton <gmc@esilibrary.com> Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz> Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 4c1c323232cd303c9c1e0f02c83871e1e6fcd62d)
Chris Cormack [Mon, 29 Apr 2013 20:56:22 +0000 (08:56 +1200)]
Bug 10120: Adding a syspref to control if overdue charges are updated on return
On by default.
To Test
1/ Create an overdue item, that should get fines
2/ Return the item
3/ Check the borrowers record to see if the fine has been added/updated
Apply patch
1/ Make sure preference is set to do
Repeat steps 1-3 above
2/ Switch the preference to don't
Repeat stes 1-2
3/ Check the fine hasn't been added/updated
Signed-off-by: David Cook <dcook@prosentient.com.au> Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
All tests and QA script pass, works as described.
I would categorize this a bug fix for libraries that don't want
the new changed behaviour that was introduced by recalculating
fines on return. Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit fc61bd30186b0305579c5dee0a14f9d2733cd5db)
Solved conflicts in:
installer/data/mysql/sysprefs.sql
installer/data/mysql/updatedatabase.pl
and changed DB version number.
Colin Campbell [Wed, 22 May 2013 18:32:45 +0000 (19:32 +0100)]
Bug 10313 Fix link to invoice from orders
Need to have invoiceid and pass it to retrieve selected
invoicenumber. Wrong data passed causing incorrect
records to be displayed
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com> Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com> Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 3f4d31309203b85b5415788967d4c8cf3ce83570)
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
There's a small POD error, I'll try to provide a followup for it.
(cherry picked from commit ed34661870e50e04acf61c7f687343b9a2a8f1da)
Jonathan Druart [Thu, 23 May 2013 07:33:48 +0000 (09:33 +0200)]
Bug 10310: Followup Prevent submitting form with enter does not work with IE
Check e.target.type instead of using jQuery. Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit c4978ef178746df06333c6704ea9e6f888b4b9ff)
Jonathan Druart [Wed, 22 May 2013 13:49:26 +0000 (15:49 +0200)]
Bug 10310: Prevent submitting form with enter does not work with IE
I am not able to test this patch with IE...
I tested it with Chromium and FF and it works great.
This patch can be tested on the neworderempty.pl page Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit efdf30bc476ab130b0dc4767ba38d68208eb2ca7)
Jonathan Druart [Wed, 30 Jan 2013 14:19:58 +0000 (15:19 +0100)]
Bug 9507: prevent submit: refactor some code in a js file
This patch refactors some code in a js file.
Test plan:
On acqui/neworderempty.pl, acqui/orderreceive.pl and
serials/serials-edit.tt try to scan a barcode (or press enter) on the
form and check that it is not sent.
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Have to note that the code for IE9 does not work. Before and after this patch.
If we refactor code, it would have been nice to resolve this too.
But I do not oppose pushing this patch.
The test uses 'an ancient Netscape property' window.Event (uppercase!) to make
the distinction between browers and event models. Some more documentation here
would be welcome too.
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Refactoring, but needed for 10310 inclusion
(cherry picked from commit c8ea6ba025455a26a585733fdb214942a9823a45)
Owen Leonard [Tue, 30 Apr 2013 19:33:48 +0000 (15:33 -0400)]
Bug 10036 - adding header search to additem page
The add item screen lacks a header search form. This patch adds the
cataloging header search include to additem.tt.
To test, apply the patch and add items to or edit items of an existing
record. The header search form should appear with options for cataloging
search and circulation.
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com> Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 646015c6471fa3d248696a55b6f18d268b5a2f60)
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
This should have been tagged as a bugfix...
(cherry picked from commit d22fb794dcc977c096665c4aa44ffc2185af7d46)
Magnus Enger [Sun, 19 May 2013 16:56:00 +0000 (18:56 +0200)]
Bug 10288 - Fix a tiny typo on "Pending offline circulation actions"
To test:
- Apply the patch
- Go to <intranet>/cgi-bin/koha/circ/circulation-home.pl
- Verify that is says "There are no pending offline operations."
- Sign off
Owen Leonard [Wed, 15 May 2013 12:45:32 +0000 (08:45 -0400)]
Bug 6399 - tooltip for tags that says 'separate by comma'
Some sites split tags on spaces, some on commas. Since Koha splits on a
comma, we should make that clear to the patron. This patch adds
additional text to the "New tag(s)" label.
To test, enable TagsEnabled, TagsInputOnDetail, and TagsInputOnList.
Click "Add tag" on both OPAC search results and an OPAC detail page.
Confirm that the revised label appears correctly.
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
all tests pass
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
All tests pass. There are some more places where we can
add tags to multiple records at once, I noted them on the bug.
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Even if tha patch doesn't add a tooltip, as it is just a string change that clarifies the addition of tags it should be applied to stable.
(cherry picked from commit e776b28e31052553c994d63162a36263b3ada259)
Owen Leonard [Thu, 16 May 2013 13:20:01 +0000 (09:20 -0400)]
Bug 10083 [3.10.x] In Transit string doesn't get translated in the staff interface
For some reason this text inside a <td> isn't getting picked up by the
translator unless it's inside a <span>. This patch adds the span and
tidies up the text.
To test, apply the patch and "translate update" a translation. Searching
the po file for "In transit from" should return a result from detail.pl.
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Trivial string changes that didn't make it before string freeze. Patch applies cleanly on 3.12.x. It shouldn't go into older releases I guess.
(cherry picked from commit deedd99d92c2c3cf6932eeffd2d9c270142055d4)
Mathieu Saby [Sat, 4 May 2013 09:31:24 +0000 (11:31 +0200)]
Bug 10191: Close 2 option tags in unimarc_field_115a.tt and unimarc_field_116.tt
This patch close 2 option tags in unimarc_field_115a.tt and unimarc_field_116.tt.
To test :
- in a UNIMARC Koha instance, edit a record
- open the plugin for 115a subfield
- check the "Form of release - visual projection, motion picture" option
list is correct, especially the value "other film type"
- open the plugin for 116 field
- check the "Technique (prints) 2" option list is correct, especially
the value "lithography"
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
I did not test this in Koha, but it's a simple change of one character
which I'm comfortable with signing off on.
I don't know if this counts as a string change or not, since the string
was previously mixed with a malformed tag.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Passes tests and fixes an obvious problem in the HTML.
I checked the po files - currently the strings appear as:
"other film type/option> %s "
So in theory it's possible to translate them correctly even
if the standard templates now are not correct.
Probably has to wait for 3.14.
Mathieu Saby [Sat, 4 May 2013 09:07:55 +0000 (11:07 +0200)]
Bug 10186: Fix a typo in subscription-add.tt : 2/years should be 2/year
In subscription-add.tt dropdown list for periodiciy, the description for 9 value should be "2/year" (2 issues each year)
At present, if the option value is selected, it is "2/years".
This patch supresses the "s" after "year".
To test :
- in a subscription, change periodicity to "2/year"
- save the subscription
- reopen it and check the value is labelled "2/year"
Signed-off-by: David Cook <dcook@prosentient.com.au>
Trivial change. Works as described. Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit cf2f95f0607f5bc20f757a6de7effd93334576fa)
Kyle M Hall [Mon, 20 May 2013 18:50:46 +0000 (14:50 -0400)]
Bug 10293 - Bug 9930 needs to be reverted for 3.10.x
The patch for bug 9930 needs to be reverted for 3.10.x, as the patron
self registration feature is not part of 3.10.x. With the patch applied,
the OPAC patron details link may redirect to a non-existent page (
opac-memberentry.pl ).
Test Plan:
1) Set OPAC to use CCSR theme.
2) Log into the OPAC.
3) Click the link for your username.
4) Click the "my personal details" tab.
5) Note the error page you get
6) Apply this patch
7) Refresh the page
8) You should now see the user details update page
Owen Leonard [Thu, 9 May 2013 19:08:41 +0000 (15:08 -0400)]
Bug 10225 - If an item isn't editable, don't show the onclick Edit/Delete menu
The user should not be shown edit/delete links when clicking on a row in
additems which they cannot edit because of the IndependantBranches
setting. This patch adds a class to the row to exclude such rows in the
JavaScript onclick handler.
To test:
- Turn IndependantBranches on and edit items for a title which
has holdings from various branches including your own.
- Click a row for an item which is held by your library. You should see
the "Edit/Delete" links appear.
- Click a row for an item which is held by another library. No links
should appear.
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
All test pass
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
All tests and QA script pass.
Changes to the templates include no string changes. Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit b36d3bc796fd1b0a4db32729c994287425f10326)
We have a message if we want to add items and we can't add, substract only.
It's ok if we choose to create items on ordering, in this case koha can't add items, just substract
and in this case we have to delete manually the items(s) in the catalog.
But if via the syspref AcqCreateItem we choose to create items when receiving this limitation is not usefull
The patch just checks if the syspref AcqCreateItem is on 'ordering'
if not the message is not shown and we can add items
Signed-off-by: Mathieu Saby <mathieu.saby@univ-rennes2.fr>
Here is the test I made for signing off :
after applying the patch
- syspref AcqCreateItem : create items on RECEIVING
- in a basket, create an order (quantity = 1)
- save the order
- reopen the order
- change the quantity (2 instead of 1)
- save the order
=> changing quantity was not possible before the patch
- syspref AcqCreateItem : create items on CATALOGING
- in a basket, create an order (quantity = 1)
- save the order
- reopen the order
- change the quantity (2 instead of 1)
- save the order
=> changing quantity was not possible before the patch
- syspref AcqCreateItem : create items on ORDERING
- in a basket, create an order (click on "add" to add an item => quantity = 1)
- save the order
- reopen the order
- try to change the quantity (2 instead of 1), without clicking on "add" to create a new item => you cannot (alert message)
=> the behavior is the same as before the patch
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Copied test plan from bug report.
Template only change deactivating the Javascript that blocks
you from changing the quantity when AcqCreateItem is set to
something else than 'ordering'.
Passes all tests and QA script.
**Rebased for 3.10.x**
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Owen Leonard [Fri, 10 May 2013 13:50:51 +0000 (09:50 -0400)]
Bug 9679 - can't place hold from cart in CCSR
When the CCSR theme is enabled, selecting items in the cart and clicking
"place hold" triggers a JavaScript error and fails. This patch adds a
function missing from the CCSR version of basket.js.
To test, apply the patch and clear your browser cache.
- Enable the CCSR theme and put items into the OPAC cart.
- Open the cart, select one or more items, and click "place hold."
The cart should automatically close and the main window should redirect
to the holds screen showing your selections.
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
All test passed
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Confirmed patch fixes the problem described.
All tests and QA script pass, JavaScript only change.
No strings involved, save for inclusion in 3.12. Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit d0f93e67726ed242e1124d36ed00d1a4a3645701)
Julian Maurice [Mon, 6 May 2013 06:43:50 +0000 (06:43 +0000)]
Bug 10185: Add missing columns in update 3.09.00.025
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
SQL only changes fixing an important database update.
IMPORTANT: Patches must be backported to all versions containing
the database update 3.09.00.025.
I used the test plan provided by Julian with some additions:
1/ Do a fresh 3.8 install
2/ Do some reserves
3/ Check your old_reserves table is empty
4/ Update your sources to 3.10
5/ Run updatedatabase.pl
6/ Your reserves table is now empty!
I made sure I had item level and title level holds, also
suspended holds.
I repeated the test with entries in my old_reserves table
(cancelled and filled holds) to make sure this is also still
working correctly.
Before the patch we lost all suspended holds and when the
old_reserves table was empty also all holds in general.
After the patch the reserve_id is added but the other data
in both tables is not altered.
NOTE: Adding the reserve_id first to old_reserves and then
to reserves we are missing one id in between.
old_reserves: 1,2,3
reserves: 5,6 Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit 30d067400e6d15cd86d8b35daed4bb10438d0e2e)
Julian Maurice [Fri, 3 May 2013 15:20:17 +0000 (17:20 +0200)]
Bug 10185: Fix update 3.09.00.025
It can remove all reserves from reserves table when there is no entries
in old_reserves.
This is due to @ai which is set to NULL in
SET @ai = ( SELECT MAX( reserve_id ) FROM tmp_reserves )
and reserve_id > NULL returns no results in
INSERT INTO reserves SELECT * FROM tmp_reserves WHERE reserve_id > @ai
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Test plan and comments on second patch. Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit 37c52367b08f30514483b02a387cb5a463ea15d0)
David Cook [Wed, 8 May 2013 08:00:29 +0000 (18:00 +1000)]
Bug 10156 - Fix usr/bin/perl path for get_report_social_data.pl
Currently, the perl path for get_report_social_data.pl is "#!/bin/perl"
when it should be "#!/usr/bin/perl".
While I'm not entirely sure how to test this, rangi did mention:
23:47 (it wouldnt work on my debian install)
23:48 zsh: no such file or directory: /bin/perl
It's a pretty trivial change, so I'm not sure it needs much of a test
plan.
Signed-off-by: Magnus Enger <magnus@enger.priv.no>
Before the patch "grep -r '#!/bin/perl' in the misc dir shows one file
with this line, and it is indeed get_report_social_data.pl. After the
patch there are no occurrences left. Passed-QA-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit 2e103a018cedc1c57d1c0db8acad6f93ab4ca428)
Making sure that the regex does not kill more than it should.
Amended: does now only look at separating colons(;) not commas(,).
Amended: two index expressions in direct context replaced by same regex for
consistency.
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com> Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit e5b467e81f494857a0831fe0d4f9ad94127a91bb)
Lyon3 Team [Mon, 8 Apr 2013 09:14:09 +0000 (11:14 +0200)]
Bug 8896: Delete serials no more missing from missinglist
When manual history is disabled in subscription history section
if a serial has been previously set as missing and is received
or set as expected, late or claimed, it will be deleted from missinglist
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Regex needs a followup. More comments on Bugzilla.
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com> Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit ccc7f535cb585352b2e933c1e5694e1d6e06d38b)
Karam Qubsi [Sat, 4 May 2013 20:44:57 +0000 (23:44 +0300)]
Bug 10176: Solve the Invalid URLs in 'Refine Search Results' when it uses UNICODE symbols
I just add use utf8; to the Search.pm and the problem
was solved .
Test plan :
1- Add bib records with non-latin characters
2- search for some of these records
3- try to refine your search using Subject / Author
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Comment: Work fixing URLs in facets. Now they work correctly.
No errors.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Passes all tests and QA script.
I tested facets with the 22 Arabic records provided on
bug 9579 successfully. Before the patch the links are not
correct, after applying the patch the links work as
expected. Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit 2d29440c5ade462bf6939f2ab32b5ec9c2c1b377)
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
use utf8;
Does not do what most people think it does, all it does is
utf8 - Perl pragma to enable/disable UTF-8 (or UTF-EBCDIC) in source
code
IE allow Search.pm to contain utf8 chars. It does not affect any thing
else
From the Man Page
The use utf8 pragma tells the Perl parser to allow UTF-8 in the
program text in the current lexical scope (allow UTF-EBCDIC on EBCDIC
based platforms). The no utf8 pragma tells Perl to switch back to
treating the source text as literal bytes in the current lexical scope.
Do not use this pragma for anything else than telling Perl that your
script is written in UTF-8. The utility functions described below are
directly usable without use utf8; .
Bug 10084 - YUI path wrong in CCSR theme with packages
Bug 9052 fixed this for prog, CCSR was left aline in the dark (it's friday).
Regards
To+
Sponsored-by: Universidad Nacional de Cordoba Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Worked fine in my test package, good work Tomas Signed-off-by: Mason James <mtj@kohaaloha.com> Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit be1770ffccdff54f3140f3af7f7f1d026c46e05a)
Bug 6709 - marc21_field_006.xml and marc21_field_008.xml can't be translated
This patch changes
1) structure and schema for xml files used in MARC21
006 and 008 value builders.
2) JavaScript functions used to show value builders.
Xml processing is enabled in previous patch
Any translatable string has been moved to an xml element,
those strings that no need translation remains as xml
attributes.
NOTE_1: I do not include as translatable material types
codes, because those values are restricted in schema
definition. But this restriction can be removed.
NOTE_2: Anyone with experience in XML/XSD please
check the new schema definition.
NOTE_3: Anyone with experience in the former and
JavaScript please check xmlControlfield.js
To test:
1) Apply the patch
2) Verify that 006 and 008 value builders show and work
properly
3) Update translation files for your favorite language,
a new set of strings must show up corresponding to
names and descriptions on value builders.
Note: messed up patches, sending again. Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
All tests and QA script pass.
Did regression tests on the plugins for 006 and 008 and could
spot no differences in behavior of the plugins to before.
Also tested the translation process and found it working nicely.
Thank you for fixing this long standing translation bug! Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit b6518e632ddf1c2e97fe9f49d9dd307a3047266b)
Chris Cormack [Sun, 8 Apr 2012 08:10:19 +0000 (20:10 +1200)]
Bug 6709 : Patch for testing translating .xml files
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com> Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Comment on second patch. Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit 3588e2820ebdada0befecbb698b93a9aadc8a510)
Bug 9358 - Followup - Fixed field plugins for MARC21 should be updated for MARC21 update #15
This little patch adds a few values and descriptions to complete
value builder for marc21 008.
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz> Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Follow-up works as described.
XML change only. Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit cb47df4bbbc676e29f75c1c686c9ba12e8e73b57)
Bug 9358 - Fixed field plugins for MARC21 should be updated for MARC21 update #15
This patch, together with 9357, fix plugins for leader, 006, 007 and 008 MARC21 fields
Leader18 c and i is fixed on Bug 9357
Added missing/renamed fields on 007
Options 'o' and 'q' already present on 006 and 008,
fixing spaces and removing unnecessary descriptions.
To test:
1) Catalog/edit a record
2) On 007 value builder, check missing values
on 008, BKS, check for example 33- Literary form,
i- Letters has a description
3) Apply the patch
4) Clean your browser cache
5) On 007 value builder, new values are present
On 008/6 descriptions are absent
Signed-off-by: Galen Charlton <gmc@esilibrary.com> Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works as described. Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit 67dae3abd4bbd5394c62eaeccfa67d9c0220a627)
koha-email-disable now
- Checks the instance exists.
- Checks if email is already disabled.
Regards
To+
Sponsored-by: Universidad Nacional de Córdoba Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz> Signed-off-by: Mason James <mtj@kohaaloha.com> Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 31b43ac1fe6830426c80988b93bc15d0fa88e79a)
Jonathan Druart [Fri, 26 Apr 2013 11:59:18 +0000 (13:59 +0200)]
Bug 10044: Remove duplicate pagination on the pending orders page.
Test plan:
Check that there is just one pagination on the pending orders page.
Signed-off-by: Mathieu Saby <mathieu.saby@univ-rennes2.fr> Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works and deletes the old pagination that was replaced by
datatables. Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit 7b0b6e32d1462fab10257769c417f014b0819135)
Magnus Enger [Tue, 5 Mar 2013 12:49:11 +0000 (13:49 +0100)]
Bug 9250 - Followup to add koha-*-sip commands to koha-common.xml
The original patch for Bug 9250 did not add the new commands to
debian/docs/koha-common.xml, which functions as a sort of table
of contents for the real commands. This patch adds them.
Signed-off-by: Robin Sheat <robin@catalyst.net.nz>
Simple documentation patch Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit 38b1fd99c4e3a2ae3a944c5ba0b17189da3feef5)
Robin Sheat [Mon, 10 Dec 2012 05:57:04 +0000 (18:57 +1300)]
Bug 9250 - [SIGNED-OFF] provide commands to manage the SIP server
This adds commands required to control the SIP server. These commands
are:
* koha-enable-sip - copies the SIP config to the sites directory
* koha-start-sip - starts the SIP server processes
* koha-stop-sip - stops the SIP server processes
It also calls these as appropriate from the koha-common init script.
To use:
1) sudo koha-enable-sip instancename
2) sudo vim /etc/koha/sites/instancename/SIPconfig.xml
Do whatever is needed for your site's SIP configuration
3) sudo koha-start-sip instancename
To test:
1) Build packages with this patch
2) Ensure that sudo koha-start-sip instancename doesn't do anything
3) Run sudo koha-enable-sip instancename
4) Edit /etc/koha/sites/instancename/SIPconfig.xml if needed (probably
not required for testing)
5) Run sudo koha-start-sip instancename
6) Note that the sip processes are now running
7) Run sudo koha-stop-sip instancename
8) Note that the sip processes have gone
9) Reboot your Koha server
10) Note that the sip processes are back
Sponsored-By: Waitaki District Council Libraries Sponsored-By: South Taranaki District Council Libraries Sponsored-By: Horowhenua District Council Libraries Sponsored-By: Rangitikei District Council Libraries Signed-off-by: Magnus Enger <magnus@enger.priv.no>
Works as advertised. koha-start-sip without a prior koha-enable-sip
does nothing. koha-enable-sip copies the SIP config file to the
instance directory. After koha-enable-sip, koha-start-sip and
koha-stop-sip works as expected. After a reboot, the SIP processes are
still running. I have not actually tested the SIP servers after they
have been started, but assume they work the same as always.
The man pages look good.
The new commands should also have been added to the man page for
koha-common. I'll do a followup for that. Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit 3dc22e7fb27162b3a461477bc40f5c38a1739516)
Bug 10041 - Provide a koha-translate script to aid package users on installing translations
Until we have solved the packaging of koha template translations, provide a command that manages the installed translations in a proper way.
To test, build a Debian package of current master+the patches from this bug :-D and try the many options running koha-translate --help provide.
The command itself can be grabbed from a git checkout with this patch applied to test the script's funcionality. If it (and its docs) fits the package building stuff, I'll test on monday when I can be back on my workstation.
Sponsored-by: Universidad Nacional de Córdoba Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Comment: Good adition. Work as described. No errors.
Copied to /usr/local/bin. No errors on install, update, remove, list and check. Passed-QA-by: Mason James <mtj@kohaaloha.com> Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit 2cd5afa9741ef432a9f3ecac939c98e20d5ebfc5)
Sponsored-by: Universidad Nacional de Córdoba Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz> Signed-off-by: Mason James <mtj@kohaaloha.com> Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit 7d09198659c92eda7046dee0f93e4caf2ec37096)
- checks for the existence of the instance before any other action on it.
- checks if the instance is already enabled before changing stuff in the config files.
- only reloads apache if it is needed!
- handles more than one instance name as parameter (the code was there, a check for the cardinality of the args prevented it from working).
- documents this behaviour change in the docs
- doesn't break if the provided (invalid) instance name is a prefix/suffix of a real one (added -x to the relevant grep command).
To test:
- Aplpy the patch, build your packages
- Run koha-enable on
- Non existent instance (try using a prefix or a suffix of an already created one too).
- Already enabled existent instance name.
- Disabled instance.
Regards
To+
Sponsored-by: Universidad Nacional de Córdoba Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz> Signed-off-by: Mason James <mtj@kohaaloha.com> Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit 3bca90eb0c0fc91f64f3e479ac6ab25e54d4f1aa)
As noted by Mason on bug 10101, the check was not working for zero arguments.
Sponsored-by: Universidad Nacional de Córdoba Signed-off-by: Mason James <mtj@kohaaloha.com> Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit ca118d57db383f5efebc4d53cba11ccc8af5c9a9)
- checks for the existence of the instance before any actions on it.
- checks if the instance is already disabled before touching anything (warns otherwise)
- only reloads apache if needed
- handles more than one instance name.
- changed the docs to acknowledge the previous item.
To test:
- Apply the patch, build your package
- Run koha-disable on
- Non existent instance (try names that are prefix and suffix of a valid one too please)
- Already disabled instance name.
- Enabled instance name.
It should work as expected and warn the user on the expected wrong cases.
Regards
To+
Sponsored-by: Universidad Nacional de Córdoba Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz> Signed-off-by: Mason James <mtj@kohaaloha.com> Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit b055f7d86c7772cf52c4a20d04a7e1cb0c8c19c9)
koha-start-zebra now
- Checks the instance exists.
- Checks the instance is enabled.
- Checks if the zebra daemon is already running.
Regards
To+
Sponsored-by: Universidad Nacional de Córdoba Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz> Signed-off-by: Mason James <mtj@kohaaloha.com> Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit 98bde26d2571b43ecee07e017e36f45e1aa6e680)
koha-restart-zebra now
- Checks the instance exists.
- Checks the instance is enabled.
- Checks if the zebra daemon is already running.
Regards
To+
Edit:
- changed some wording problems.
- fixed an error in parameter validation
Sponsored-by: Universidad Nacional de Córdoba Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz> Signed-off-by: Mason James <mtj@kohaaloha.com> Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit cee6909c8a5c10cc534a1ebe35ec5b8cda522eab)
The SQL query build in C4::Items::_koha_modify_item performs an update on a row of items table identified by itemnumber.
Actually the query is build using a hash of datas :
for my $key ( keys %$item ) {
$query.="$key=?,";
push @bind, $item->{$key};
}
But this hash contains 'itemnumber' key, so you get an update including the primary key.
It is actually harmless but may be dangerous.
This patch simply skips itemnumber key in above loop.
Test plan :
Check you can create and modify items.
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit 598dfe27224f517fafa06df75521c623992ecbe0)
Kyle M Hall [Mon, 15 Apr 2013 12:39:26 +0000 (08:39 -0400)]
Bug 8419 - Suspended holds appear on the daily holds queue
This bug was reintroduced by the patch for bu 5911: Transport Cost Matrix
Test Plan:
1) Place a hold on a record
2) Run build_holds_queue.pl
3) Verify the hold is showing in the holds queue
4) Suspend the hold
5) Re-run build_holds_queue.pl
6) Note the hold is still in the holds queue
7) Apply patch
8) Re-run build_holds_queue.pl
9) Note the hold is no longer in the holds queue
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz> Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Passes test plan and QA script. Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit d098a7c298437b2fd6ced6a8237f98f3221b810f)
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com> Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Magnus Enger [Mon, 15 Apr 2013 17:02:46 +0000 (19:02 +0200)]
Bug 7054 - NORMARC: Fix default for 000 position 17
Someone at the library education in Oslo told me that it would be
better to have the default for 000/17 set to 1, instead of 2 as it
is today.
To reproduce:
- Run through the Web-installer in Norwegian and choose NORMARC as
the MARC dialect
- Go to Home > Cataloging > Add MARC record and start to add a new
record
- Click in the 000 field and it should be filled with:
" nam a22 2 4500"
- Reload the page, then open the value builder for 000 and click on OK
- 000 should get filled with the same string as above
To test:
- Apply the patch and repeat the steps from above. The default value
for 000 should now be:
" nam a22 1 4500"
(Don't be confused by the 1s and the 2s. A value of 1 in position 17
means "level 2", and a value of 2 means "level 1" - that is how it
is defined in the "standard":
1 = Nivå 2, iflg. Katalogiseringsregler
2 = Nivå 1, iflg. Katalogiseringsregler)
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz> Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Small changes. Didn't test in a NORMARC installaton, but
trusting Magnus with this and seeing no reason why it
shouldn't work.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit 064fc8b5223b19a57c658e7ca3444df7c017a444)
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com> Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Magnus Enger [Mon, 15 Apr 2013 17:50:19 +0000 (19:50 +0200)]
Bug 7055 - NORMARC: Fix 008 position 15-17 and 35-37
This patch does several things:
- Set the default for 008/15-17 to "no " (yes, there is space at the end)
- Link from 008/15-17 in the value builder to NORMARC country codes
- Set the default for 008/35-37 to "nor" (by setting the
DefaultLanguageField008 syspref)
- Link from 008/35-37 in the value builder to NORMARC language codes
- Fix a missing <tr> around field 35-37
To reproduce:
- Run through the Web-installer in Norwegian and choose NORMARC as
the MARC flavour
- Go to Home > Cataloging > Add MARC record and add a new record
- Click in the field for 008. The default should look like:
130415t xxu||||| |||| 00| 0 eng d
^^^ ^^^
- Reload the page and open the value builder for 008. Problems:
- The text for 15-17 links to MARC21 country codes
- The default for 15-17 is xxu
- The text for 35-37 links to MARC21 language codes
- The default for 35-37 is eng
- If you choose e.g. "Monografier" in the top dropdown then click
on "OK" the window does not close
To test:
- Apply the patch and run through the Web-installer again, selecting
Norwegian and NORMARC
- Go to Home > Cataloging > Add MARC record and add a new record
- Click in the field for 008. The default should look like:
130415t no ||||| |||| 00| 0 nor d
^^^ ^^^
- Reload the page and open the value builder for 008.
- Check that...
- The default for 15-17 is "no " (with a space at the end)
- The link goes to NORMARC country codes
- The default for 35-37 is "nor"
- The link goes to NORMARC language codes
- Select something from the top dropdown and click "OK". Check that the
window closes and that the values that are entered into the 008 field
matches what you chose in the popup window.
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Trusing Magnus is right, so testing for any regressions mainly, all good
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Only changes NORMARC specific plugin and system preferences
files. Changes all seem logical to me. Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Conflicts:
installer/data/mysql/nb-NO/1-Obligatorisk/system_preferences.sql
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
David Cook [Tue, 23 Apr 2013 02:58:19 +0000 (12:58 +1000)]
Bug 10097 - Hide framework selection when importing staged authority records
Currently, when importing authority records using the "Manage staged
MARC records" tool, it will show the text "Add new bibliographic records
into this framework:" followed by a drop-down menu of possible frameworks.
Since these are bibliographic frameworks and we're importing authority
records which do not use them, we have no need to show this information.
I'm proposing just a little patch to display this info only for
bibliographic records. From my tests, everything seems to work fine
without this text and the drop-down, although I've only uploaded one
MARC21 authority record at a time.
--
Test Plan:
Before applying patch...
1) Find yourself an authority record. I recommend downloading your
favourite author from: http://authorities.loc.gov/
2) Stage MARC for import. Choose "Authority" as your record type.
3) Go to "Manage staged records"
4) Underneath the button "Import this batch into the catalog", you
should see the text "Add new bibliographic records into this framework:"
followed by a drop-down of the available frameworks.
Optionally) You can also try this for bibliographic records. You'll find
the same.
After applying the patch...
5) Repeat steps 2 and 3.
6) Underneath the button "Import this batch into the catalog", you
should just see a table listing your MARC record(s).
7) Stage MARC for import. Choose "Bibliographic" as your record type.
8) Go to "Manage staged records".
9) You should find step 4 still to be true (i.e. the "Add new
bibliographic..." text should still be there).
Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Small template change, passes all tests. Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com> Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Owen Leonard [Tue, 30 Apr 2013 18:39:48 +0000 (14:39 -0400)]
Bug 9957 - Missing cancel link on subfield editing page
The subfield edit page has an edit bottom at the top of the page. Almost
no other edit screens do this. It would be more consistent to put it at
the bottom. Also missing is a "cancel" link. This patch fixes both
issues.
The patch also adds "Default" to the breadcrumbs when editing a subfield
in the default framework.
To test, apply the patch and edit a subfield: MARC frameworks -> MARC
structure -> Subfields -> Edit. The "Save changes" button should appear
at the bottom of the page alonside a "Cancel" link. Both should work
correctly.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz> Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Template change only, improves consistency and works
nicely. Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com> Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Owen Leonard [Fri, 26 Apr 2013 18:20:49 +0000 (14:20 -0400)]
Bug 9266 - Untranslated strings in tags moderation
There are a couple of English strings in tags moderation JavaScript
which are not properly enclosed in the _() function enabling
translation. As a result, clicking a translated 'Approve' or
'Reject' button in the table of tags would change the button's
neighbor's label to the English string. This patch
corrects it.
To test, apply the patch and regenerate a translation to test with. Go
to Tools -> Tags and find a list of tags to moderate (pending, approved,
or rejected). When you click on an 'Approve' or 'Reject' tag in the
table of tags, the buttons in each Approve/Reject pair should retain
their correct translated label. For instance, looking at approved tags
in French:
[ Approuvé ] [ Rejeter ]
Clicking the "Rejetee" button should change the state to:
[ Approuver ] [ Rejetée ]
Clicking "Approuver" should return the buttons to the first state.
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz> Signed-off-by: Mason James <mtj@kohaaloha.com> Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com> Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Owen Leonard [Thu, 25 Apr 2013 13:34:17 +0000 (09:34 -0400)]
Bug 10111 - Layout on basket summary page a bit inconsistent
Some details in the summary of basket information were not marked up
consistently with others on the page. This patch makes the markup
consistent for a consistent appearance.
To test, view a basket in Acquisitions which is part of a basketgroup.
Information should be displayed consistently for baksets in both open
and closed basket groups.
Signed-off-by: Mirko Tietgen <mirko@abunchofthings.net>
Works as expected
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Template change only, works nicely. Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com> Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Bug 10022 - Multiple tags moderation doesn't work on translated page
When using a translated intranet, tags moderation using checkboxes and a
submit button doesn't work. You get a message "Unknown Operation on x
Term(s)" (translated of course).
This patch corrects by using name="op-[operation]" instead of name="op"
in each submit input.
Test plan :
- Create a new tag on a record
- Go to tags moderation in Tools
=> You should see your tag in pending terms
- Click on checkbox
- Click on Approve or Reject submit button at the bottom of the table
=> Without patch the tag is still pending
=> With patch operation is well performed, tag is not pending
- Test "Check lists" form
- Test Approve and Reject buttons from "Actions" column
Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Passes all tests and QA script. Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com> Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
When you are receiving an order, the list of existing invoices should
appear in reverse chronological order. Unfortunately, right now it
appears in regular chronological order.
To test:
1) Make sure you have multiple invoices that have varying shipment
dates for a vendor. We will assume this vendor is called "Example
Vendor."
2) Choose the "Receive shipments" button on the Example Vendor page.
3) Note that the invoices are sorted by regular chronological order.
4) Apply patch.
5) Refresh "Receive shipment" page. Note that invoices are now sorted
in reverse chronological order.
6) Sign off.
Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works as described. Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com> Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Owen Leonard [Mon, 29 Apr 2013 16:34:10 +0000 (12:34 -0400)]
Bug 10153 - Patron header search form is too wide
The patron header search form is now too wide to display correctly on
screens smaller than about 1110px. This patch groups the
previously shown-by-default choices with the hidden additional
search parameters.
To test, apply the patch and view any page which includes the patron
header search include, for example members/members-home.pl. Additional
search options should be hidden by default. Clicking "[+]" should show
all additional options: Search fields, search type, order by, library,
and category.
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Works for me.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Passes all tests and QA script. I like this change. Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com> Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Edmund Balnaves [Mon, 15 Apr 2013 01:08:06 +0000 (11:08 +1000)]
Bug 8264 - local cover images not working in IE8 [ prog ]
[Patch submitted by David Cook]
Edmund, rather than myself, was the author of this patch,
so I'm not entirely sure about his code choices, but...it
looks like IE must process images differently than other
browsers.
It seems to me that the images are not appearing in IE,
because they're being regarded as incomplete or having
0/NULL natural width.
This patch simply introduces a try/catch hack where it
tries to add the image and remove any "no-image" elements
even nwhen the image is considered incomplete/width of
0/NULL. It won't do this if it catches any errors,
although I'm not sure that any errors would be caught
with this set up anyway...
It's certainly not the ideal solution, but it's a solution.
To Test:
Before applying the patch:
1) Use IE and FF/Chrome/other browser to view a record
with local images attached
2) Note that the local images appear in FF/Chrome/other,
but not in IE
Apply patch.
After applying the patch:
1) Repeat step 1 from above
2) Note that the local images now appear in all browsers
as they should.
--
As I mentioned before, this seems like a real suboptimal
solution. Any ideas on why IE might be considering local
images to be incomplete or having 0/NULL natural width?
Signed-off-by: David Cook <dcook@prosentient.com.au> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
I did a regression test using Chromium and Firefox in
Ubuntu. I checked both prog and CCSR - covers displayed
nicely.
All tests and QA script pass.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Changed author of patch to reflect actual authorship.
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Increase both on staff and OPAC interface
from 80 to 255 characters to be saved in
the database. Shown will be 80 characters.
Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Clean patch, workes as described.
To test:
- Apply patch and run database update
- Check that the column in the database is now varchar(255)
- Enter a new suggestion in the OPAC
- Edit this suggestion in staff
- Confirm form has the new max value set
Colin Campbell [Fri, 26 Apr 2013 16:11:37 +0000 (17:11 +0100)]
Bug 9684 : Correct path to compact.xsl
When try to display card view of retrieved record
error occurred as compact.xsl could not be found
script was constructing path as though it was opac
Also added fallback to en version if no xsl file
found under current lang as done in opac-showmarc.pl
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Test plan:
* Set sys pref to use CCSR
* Do a Z39.50 Search
* Click 'card' on one of the results
* confirm that there is no error.
All test pass
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
I am astonished that opacthemes affects Z39.50 search in
staff so this might be fixing a bigger problem.
Checked that clicking on Card works for both themes now
correctly after I confirmed the bug.
Also all views in OPAC were checked for both themes.
All tests and QA script pass.
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Adding a FIXE at a line that uses $sth->{NAME} for possible utf8 problems.
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Adds a comment, no danger from that.
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Bug 10110: Problems with diacritics in saved SQL reports
Adds decoding for cgi params (for completeness).
Apparently, the NAME attribute of DBI statement handle has a UTF8 bug.
Fixing this by decoding the returned column names.
Did this in a shared routine.
http://bugs.koha-community.org/show_bug.cgi?id=10110 Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Copying test plan from bug report:
Example SQL:
select
branchname as "Bibliothek (üöä)",
branchname "Bibiothek (üäa)",
branchname
from branches where branchcode = <<Bibliothekskürzel|branches>>
1) Create report with given example SQL or your own including
some diacritics in the columnnames
2) Save the report and run it
3) Verify column names are broken before patch, but fixed after..
All tests and QA script pass.
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Bug 10107 - opacbookbag shouldn't prevent from adding items to a list in the OPAC
This bug is present in master and (at least 3.8.x, where we spotted it).
The patch makes adding items, to a list from the results page, not rely
only on opacbookbag syspref but also 'virtualshelves'.
Regards
To+
PS: Thanks Graciela Galli for reporting.
Sponsored-by: Universidad Nacional de Córdoba Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Template only patch, works nicely.
Test plan copied from bug report:
- Disable the opacbookbag syspref
- Login in the OPAC
- Create a list (I tested a private one)
- Search in your db for some biblios.
- Choose some and add them to the created list
- Go to your users's page, to the my lists tab
- Your list is empty.
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Mathieu Saby [Sun, 17 Mar 2013 18:11:29 +0000 (19:11 +0100)]
Bug 9831: Correct and add authorised values un French UNIMARC installer
2d version, Correcting a typo
In French UNIMARC mandatory installer, some authorised values for languages, countries and unimarc function codes are wrong.
A lot of unimarc function codes and language codes are missing.
Reference for country codes is ISO 3166-1 standard
Reference for language codes is ISO 632-2 standard
Reference for Unimarc function codes are Unimarc Manual (french version online in BNF website and ABES website)
This patch correct wrong values and add new ones.
For the moment I keep some wrong codes, because they may be used by some librairies :
- language codes deu, lan, mla, sam
- function codes 571, 573, 574, 575
To test :
1) take a fresh new koha
2) apply patch
3) install Koha, choosing French UNIMARC settings
4) look if values are OK in authorised values and if you can use them in cataloguing module
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz> Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
SQL change only, French installer installs authorised values
without problems.
Note: There is a problem loading sample labels unrelated to this
patch:
sample_labels.sql
ERROR 1146 (42S02) at line 3: Table 'koha.labels_templates' doesn't exist
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Katrin Fischer [Mon, 15 Apr 2013 04:21:55 +0000 (06:21 +0200)]
Bug 9818: Fixing capitalization and remove dollar sign
Overdue Fines Cap ($) > Overdue fines cap (amount)
To test:
Go to administration > circulation and fine rules
Check column label Overdue fines cap now follows capitalization rules
and has no dollar sign.
Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz> Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com> Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Magnus Enger [Mon, 15 Apr 2013 18:24:08 +0000 (20:24 +0200)]
Bug 9804 - Fix name for NORMARC biblio-koha-indexdefs.xml
When i did bug 8805, I gave the biblio-koha-indexdefs.xml file the
wrong name, and called it biblio-zebra-indexdefs.xml. This patch
fixes that.
To reproduce:
- Check that etc/zebradb/marc_defs/normarc/biblios/biblio-zebra-
indexdefs.xml exists
To test:
- Apply the patch and check that etc/zebradb/marc_defs/normarc/
biblios/biblio-zebra-indexdefs.xml no longer exists, but that
etc/zebradb/marc_defs/normarc/biblios/biblio-koha-indexdefs.xml
does exist.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz> Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com> Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Owen Leonard [Wed, 10 Apr 2013 18:24:16 +0000 (14:24 -0400)]
Bug 10026 - OPAC cart not showing location anymore
When Bug 7570 added availability information to the cart it switched
which subroutine was used to get item information, and thus changed how
the information was being returned.
This patch makes accommodations for this change by adding processing of
item location information to the script in a way that will match the
existing template variables.
To test, add items to the cart in the OPAC some of which include
shelving location information. When you view the cart you should see the
shelving location displayed.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz> Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Katrin Fischer [Sun, 14 Apr 2013 17:29:13 +0000 (19:29 +0200)]
Bug 8294: Fix display of serial enumeration for OPAC holds
It turns out that this was not a missing but a broken feature.
This patch corrects the template variables to make enumchron
show up on the item table for item level holds in the OPAC.
To test:
Try to place item level holds on
1) a record where at least one item
2) a record where none of the items
has items.enumchron information.
The column with enumchron should only show for 1), but not
for 2).
Signed-off-by: David Cook <dcook@prosentient.com.au>
Works as described.
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com> Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
The following errors appear when trying to use unapi under Plack (among
others):
Variable "$cgi" is not available at /home/jcamins/kohaclone/opac/unapi line 160.
Variable "$format_to_stylesheet_map" is not available at /home/jcamins/kohaclone/opac/unapi line 173.
Variable "$format_info" is not available at /home/jcamins/kohaclone/opac/unapi line 174.
Variable "$format_to_stylesheet_map" is not available at /home/jcamins/kohaclone/opac/unapi line 185.
To test:
1) Try to view /cgi-bin/koha/unapi under Plack
2) There is no step 2. Plack crashes.
3) Apply patch.
4) Try to view /cgi-bin/koha/unapi again, and note that it doesn't crash
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
I'm puzzled how this ever worked anyway, accidentally i'm guessing,
this tidies up some lazy coding
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com> Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Kyle M Hall [Thu, 7 Feb 2013 14:57:47 +0000 (09:57 -0500)]
Bug 9523: importing staged bib records hangs if a matched bib has been deleted
Test Plan:
1) Stage a MARC record file that will have matches with existing records
2) Delete the bib from Koha that was matched on
3) Attempt to import the records into Koha, the import will hang
4) Apply the patch
5) Reload manage-marc-import.pl and attempt to import again, this time it should succeed.
Signed-off-by: Galen Charlton <gmc@esilibrary.com> Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com> Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Kyle M Hall [Wed, 27 Mar 2013 17:57:01 +0000 (13:57 -0400)]
Bug 9839 - when importing MARC records, item record not created even when set to "always add"
Test Plan:
1) Catalog a new record with an ISBN
2) Add some items to the record
3) Download the record as MARCXML
4) Delete the itemnumbers from the 952 fields in the record,
Change the barcode fields to unused barcodes
5) Use xml2marc to save as a standard MARC file
6) Import the record using the 'Stage MARC for import' tool
Use the settings:
Record matching rule: ISBN
Action if matching record found: ignore
Action if no match found: ignore
Item processing: always_add
Check for embedded item record data?: Yes
How to process items: Always add items
7) Import, note the bib is ignored, and the items are not processed
8) Undo import into catalog
8) Apply this patch
9) Import this batch into the catalog
10) Note the items were processed and are now added to the matching
record
Signed-off-by: Mathieu Saby <mathieu.saby@univ-rennes2.fr>
Tested with UNIMARC record. I followed the test plan, just changing 952 by 995 Signed-off-by: Mason James <mtj@kohaaloha.com> Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Fridolyn SOMERS [Thu, 14 Feb 2013 13:23:30 +0000 (14:23 +0100)]
Bug 9613: items namespace missing in XSLT
In some XSLT, "items" namespace is used in exclude-result-prefixes but is not defined.
This patch add this namespace where missing.
Also corrects a koha.org, instead of koha-community.org, in one namespace URL.
Test plan :
- Enable XSLT on search results
- Perform a search
=> Look at error logs to check that there is no xsl error like :
[Fri Feb 08 15:35:06 2013] [error] [client 127.0.0.1] [Fri Feb 8 15:35:06 2013] opac-search.pl: compilation error: file koha-tmpl/opac-tmpl/prog/en/xslt/UNIMARCslimUtils.xsl line 8 element stylesheet, referer: http://opac.master.community.localhost/cgi-bin/koha/opac-detail.pl?biblionumber=299
[Fri Feb 08 15:35:06 2013] [error] [client 127.0.0.1] [Fri Feb 8 15:35:06 2013] opac-search.pl: xsl:exclude-result-prefixes : undefined namespace items, referer: http://opac.master.community.localhost/cgi-bin/koha/opac-detail.pl?biblionumber=299
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Mathieu Saby <mathieu.saby@univ-rennes2.fr> Passed-QA-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
With comment on Bugzilla.
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com> Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Owen Leonard [Mon, 8 Apr 2013 14:13:11 +0000 (10:13 -0400)]
Bug 9860 [Alternate] Incorrect box heading 'Cannot check in' when a late document is returned
The fix for Bug 9397 moved the "cannot check in" heading from within the
one conditional where it should have been displayed to the top of all
check-in errors/messages. "Cannot check in" is still only valid if the
item is withdrawn and BlockReturnOfWithdrawnItems is ON.
In order to accomplish the goal of Bug 9397 while fixing Bug 9860 this
patch puts "cannot check in" back into the correct conditional and adds
a generic heading to check in messages for accessibility purposes.
To test, check in items which will trigger a variety of errors
including:
- item must be returned to home library
- item is lost
- item is withdrawn (wtih BlockReturnOfWithdrawnItems on and off)
- item is overdue
...as well as items which should check in normally. Messages should
display correctly.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz> Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com> Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Kyle M Hall [Wed, 17 Apr 2013 18:07:55 +0000 (14:07 -0400)]
Bug 10072 - "my suggestions" always says "There are no pending purchase suggestions."
Test Plan:
1) Switch off the IndependantBranches syspref
2) Log into the OPAC
3) Place a suggestions
4) Instead of seeing your suggestion, you will see "There are no pending
purchase suggestions."
5) Apply this patch
6) Reload the page
7) You should now see your suggestions
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz> Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com> Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Magnus Enger [Mon, 15 Apr 2013 19:56:53 +0000 (21:56 +0200)]
Bug 10058 - Fix unapi for NORMARC
This patch uses a lot of MARC21 XSLT to transform NORMARC records
to desired formats. Since NORMARC is mostly a subset of MARC21, I
think this should give passable results. And better results than
no unapi-support at all for NORMARC!
To reproduce:
- Make sure you have marcflavour = NORMARC
- Visit /cgi-bin/koha/unapi in a browser
- Observe the empty <formats></formats> element
To test:
- Apply the patch
- Visit /cgi-bin/koha/unapi in a browser
- Observe the the list of formats in the <formats></formats> element
- Import the provided sample NORMARC record and make a note of its
biblionumber
- View the record at /cgi-bin/koha/unapi?id=koha:biblionumber:x&format=y
where x = the biblionumber of the sample record and y = one of the
formats marcxml, marcxml-full, mods, mods-full, mods3, mods3-full,
oai_dc, rdfdc, rss2, rss2-full and srw_dc
- Check that the transformed records make some kind of superficial
sense
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz> Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com> Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Owen Leonard [Tue, 9 Apr 2013 19:44:45 +0000 (15:44 -0400)]
Bug 10002 - Don't include line breaks in strings that are translated
Several JS alert messages contain "\n" which is problematic for
translation. This patch removes those instances (a line break is not
strictly necessary anyway). Also corrected: two instances of "holds(s)"
To test, place a hold on a title with items. From the biblio detail page
choose Edit -> Delete all items and Edit -> Delete record. In each case
you should see error messages with no line breaks and no misspellings.
Delete all items attached to the record with holds from the item edit
page. Go back to the detail page and choose Edit -> Delete record. You
should see an error message about existing hold(s) with no line breaks
or misspellings.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Harmless change, fixes misspellings and makes translations easier
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com> Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Owen Leonard [Mon, 8 Apr 2013 14:26:06 +0000 (10:26 -0400)]
Bug 10000 - Little typo in intranet-tmpl/prog/en/modules/help/tools/letter.tt: sliip
This patch removes the extra i in "sliip."
To test, go to Tools -> Notices & Slips and view the help file. The last
bulleted item on the page should contain no typo.
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Comment: Can't resist to sign Bug 10000!!
Work as described. No errors.
Signed-off-by: Galen Charlton <gmc@esilibrary.com> Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Can't resist to QA - All tests and QA script pass.
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Fridolyn SOMERS [Thu, 7 Mar 2013 17:17:33 +0000 (12:17 -0500)]
Bug 6898 - circulation librarians can't run overdues without reports permissions followup
Better update database.
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com> Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Kyle M Hall [Fri, 10 Feb 2012 15:43:29 +0000 (10:43 -0500)]
Bug 6898 - circulation librarians can't run overdues without reports permissions
This patch adds a new user permission overdues_report for the circulation module, and requires this permission to run the overdue items
report, rather than requiring full reports permissions.
Test plan :
With a user with permissions circulate_remaining_permissions :
- Add overdues_report permission to user
- Go to circulation home
=> you see "Overdues" link
- Clik on it
=> you are allowed to access and use this page
- Remove overdues_report permission to user
- Go to circulation home
=> you do not see "Overdues" link
- Edit URL : <server>/cgi-bin/koha/circ/overdue.pl
=> you are not allowed to access this page
- Go to main page
=> you don't have access to reports module
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Fridolyn SOMERS <fridolyn.somers@biblibre.com> Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Bug 10042 - Minor typo ("Communnity") in packages docs
VERY trivial string patch. Couldn't help sending it.
To+
Signed-off-by: Magnus Enger <magnus@enger.priv.no>
Thanks for fixing my typo! I did not test by building packages
etc, but by grepping for "Communnity". The patch removes
all occurences of the typo.
Passed-QA-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
David Cook [Fri, 1 Mar 2013 02:22:33 +0000 (13:22 +1100)]
Bug 9737 - Local Covers sometimes appear then disappear on OPAC Search Results/Lists
The current problem:
When the verify_images() function runs from amazonimages.js, it loops
through every img element and selects the elements that come from Amazon
sources.
However, if the height/width is 1 (i.e. Amazon passes off a blank image)
or if the img element's complete property is null or non-existent, then
it searches for the parent node and re-writes the HTML with the "No
Cover Image Available" (NO_AMAZON_IMAGE) text, even though that parent
node might contain other img elements that have images available (from
Google, local images, etc)!
Proposed fix:
Wrap the Amazon image in a span tag (as we do with the Google and local
covers), so that it re-writes the HTML within that parent span, rather
than the parent anchor which contains all the other images.
To test:
1) Turn on the OPACAmazonCoverImages, GoogleJackets, and
OPACLocalCoverImages system preferences
2) Replace the ISBN in one of your records with 9780615352435
3) Now load a local cover image for that record
4) Search for that record (but make sure you're vague enough to have
multiple search results)
5) For a split second, you may notice the local cover image appears before being replaced by a "No Cover Image Available".
Now apply this patch
6) Refresh your search results page
7) You should now see your local cover image, PLUS the "No Cover Image
Available" for the Amazon image, and whatever other graphics/"no
cover image available" "graphics" for the Google Jackets.
To be comprehensive, try the same set of steps using the OPAC Lists
rather than the OPAC Search Results
Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com> Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Chris Cormack [Mon, 8 Apr 2013 09:20:51 +0000 (21:20 +1200)]
Bug 9591 : Set Library changes after viewing Holds Queue >> reserves item
To test
1. Log in to the staff client. Note your logged in library.
2. Navigate to Circulation -> Holds queue.
3. Select a holds queue report for a library other than your own.
4. From the holds queue report page, click the "Check out" tab and
enter the card number of a patron who has holds.
5. On the circulation page for that patron, click the "Holds" tab.
6. Click one of the titles in the list of holds.
Your logged in branch will now match the library you chose for the
holds queue report.
Alternate sequence:
4. From the holds queue report page, click the "Check out" tab and
do a non-exact search (search which will return more than one result)
for a patron who has holds.
5. Choose the correct patron from the list of results.
Your logged in branch will now match the library you chose for
the holds queue report.
Apply the patch and repeat, this time it should not change your logged
in branch
Signed-off-by: Mirko Tietgen <mirko@abunchofthings.net>
Weird bug, the patch works for me.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Good catch. All tests and QA script pass.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Kyle M Hall [Wed, 3 Apr 2013 17:05:52 +0000 (13:05 -0400)]
Bug 8770 - amount does not equal amountoutstanding on a fine with no payments or credits
If a lost item fee is owed and partially paid off when an item is
returned and a refund is processed, Koha tries to pay off existing
fees before adding any leftover balance as a credit on the account.
However, those fee payments aren't actually processed, due to a bug
where the accountnumber was quoted as a string literal, and thus the
for the fee payment would fail. This did not result in an DB error,
as the query was still valid SQL. Checking the return value of the
query would have revealed that the accountline had not been updated.
History:
This bug was introduced on April 23, 2007 with the commit
'reintroducing fixaccountforlostandreturned as requested by rosalie'.
Commit id 111d590e9cdaf801256822e23f170bfc2365338f
Test plan:
1) Create a test patron
2) Check out an item to that patron and give it a due date in the past
3) Run fines.pl to generate the fine for the item
4) Mark the item long overdue on the item tab (not in edit items)
5) Pay for the lost item
6) Check the item back in
7) Note the incorrect fines. Only the lost fee balance due is refunded,
not the entire lost fee, but no other fees are paid off.
8) Apply the patch
9) Repeat steps 1-6, then not the fines are paid correctly
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz> Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Totel due is correct after applying the patch.
All tests and QA script pass.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
projects / koha.git / log