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)
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
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: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Fixes a typo in a text file, no problems found. Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit f6a10cffaba974182fa6bf0d2f51af687282ae2e)
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Magnus Enger [Wed, 20 Mar 2013 13:22:51 +0000 (14:22 +0100)]
Bug 8300 - Add Test::WWW::Mechanize as an optional dependency
This patch replaces an earlier patch by Marcel de Rooy, which
had become outdated because lots of new dependencies were
added since the patch was made.
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com> Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit 508009c7a836375aaf2a5e18db10706ec73cff25)
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Bug 8300: Add mechanized unit test for batch import
This new unit test confirms that importing records via the Stage
MARC import tool still works by connecting to a Koha instance and
importing a record then reverting the import, checking at each step
of the way that everything is as it should be.
To test:
1. Install Test::WWW::Mechanize
> sudo apt-get install libtest-www-mechanize-perl
2. Set environment variables to reflect your Koha instance:
> export KOHA_USER=kohaadmin
> export KOHA_PASS=katikoan
> export KOHA_INTRANET_URL=http://localhost:8080
> export KOHA_OPAC_URL=http://localhost
3. Run the test:
> prove t/db_dependent/www/batch.t
This updated patch now handles both MARC21 and UNIMARC installations.
Signed-off-by: Magnus Enger <magnus@enger.priv.no>
All tests pass with marcflavour = MARC21 and NORMARC. Test #15 fails
when marcflavour = UNIMARC, but from what I can see, that is because
I'm testing on a MARC21 setup, missing the UNIMARC frameworks etc.
I'm signing off - QA folks, please ask for a proper UNIMARC signoff
if you feel it is needed.
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Amended patch: Load the POSIX module (for the floor routine). Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit bc2ab3b5882e664d91ce086ce96dd32c7452dee4)
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
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>
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>
(cherry picked from commit 361e5f83e21fd94364e34af71e4a7fc64a03d2cb)
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Jonathan Druart [Mon, 15 Apr 2013 12:27:46 +0000 (14:27 +0200)]
Bug 10053: borrowers.branchcode cannot be null
The DB field borrowers.branchcode cannot be null (`branchcode`
varchar(10) NOT NULL default ''). However, an empty value can be selected
on creating/updating a patron.
Test plan:
- Add or edit a patron and choose the empty value for library
(branchcode).
- Save (pref BorrowerMandatoryField must not contain branchcode).
- Mysql raises an error.
- Apply the path.
- Check that you are not able to select no library.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz> Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit 09d36cee3c16b14acf0435531d1789486e0a0a44)
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
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>
(cherry picked from commit 01f7542f4bdbd9b31836ed8c3fc817b67086b8d2)
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Kyle M Hall [Wed, 27 Feb 2013 13:46:56 +0000 (08:46 -0500)]
Bug 9719 - Changing the rows per page on a custom report fails if it has user supplied parameters
If you create an SQL report that includes one or more parameters,
using the 'rows per page' pulldown does not work. Instead, it will
prompt for the parameters again and shows the first page of output.
Test Plan:
1) Create a new report from sql as follows:
SELECT * FROM borrowers WHERE surname LIKE <<Last Name>> AND firstname LIKE <<First Name>>
2) Run this report
3) Change the 'Rows per page' and click 'Update'
4) This should kick you back to the start where the report asks you for your parameters
5) Apply the patch
6) Repeat step 3, this time is should work correctly
Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works nicely now. All tests and QA script pass. Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit 020b8a66bc1ea9173ede154678ff690fd5f67c1f)
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
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>
(cherry picked from commit 559ff89fd641df9a67fe6fc53efdc49854ccdd1c)
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
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>
(cherry picked from commit acfbfcb7d9b6bef3186adc9b93ead44fc58ce420)
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
D Ruth Bavousett [Tue, 22 Jan 2013 18:44:33 +0000 (15:44 -0300)]
Bug 7143: Updating the About page with translation teams for Basque and Turkish
Text-change only, should require little QA and testing. Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Template change only, changes look correct to me. Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit 80d926ea60baa0046bd11ae92346ef3f23ed41e3)
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Bug 7143 Followup for some new developers on about page
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Template change only - changes look correct to me. Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit c641fd0b957e02e42b0ae389fa5e5b6ca114705b)
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
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>
(cherry picked from commit 72c95fa1ccd7fadadd5e5b73cf4e1a5623f18f89)
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
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)
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
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)
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Chris Cormack [Mon, 29 Apr 2013 10:31:58 +0000 (22:31 +1200)]
Bug 10143 - Fixing license headers
Some files have the old 59 Temple address instead of the 51 Franklin
street.
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
I see lots more which will need to be corrected as well.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Corrects addresses in 3 files. Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit c82facc01216f390a77de6268d75903c0eed7d42)
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
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>
(cherry picked from commit 86511b380f06f4b0f9c6a21332819c9614ac3b59)
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Karam Qubsi [Wed, 17 Apr 2013 10:16:00 +0000 (13:16 +0300)]
Bug 10017: Follow up handling with the multi libraries pref active
This Follow up patch will handle multi libraries pref
when it sets to "add" and enhance the way lists drop down menu appear
Test plan for all patches ( the first one and all follow ups ) :
1- apply the patches ( from the first one and all follow up patches)
2- use 3.10 po files and update it (for the master) "
../misc/translate/ perl translate update ar-Arab "
3- install Arabic from the updated po files
"perl translate install ar-Arab "
4- set opac opacthemes pref to ccsr
5- set OpacAddMastheadLibraryPulldown pref to add
6- select the Arabic from the opaclanguages pref
7- set opaclanguagesdisplay to allow
8- go to the opac and choose arabic
9- you will see all the directions from right to left
(as you look at koha on a mirror ;) ))
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Comment: Work as decribed. No errors.
With all patches applied, we get a pretty RTL interface.
Well done!
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Changes are mostly CSS, one new image and a tiny template change.
Used po files from 3.8 for testing. Looks good! Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit 11820f3c17244a6b6d262bde30d4941d87f9fa5a)
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Karam Qubsi [Tue, 16 Apr 2013 15:56:34 +0000 (18:56 +0300)]
Bug 10017: Follow up OPAC-CCSR-Right-to-left-css
This follow up patch will delete the "-moz-box-sizing"
property that I was add when I'm doing some tests on
the rtl css file and I forgot to delete it
many thanks David Cook for your notes deleting that property will not effect on the results
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Comment on last patch.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Comment on last patch. Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit da5b3c0cdad485e7564b6ce1b2a0bdd5d06f14a1)
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Karam Qubsi [Mon, 8 Apr 2013 12:17:30 +0000 (15:17 +0300)]
Bug 10017: Fix CSS for right-to-left in CCSR theme
This patch will add css file for the Opac CCSR
link this css file in the doc-head-close.inc
and add new image : arrow-left-grey-11x6.png
for the opposite direction of the right existing one.
the test plan is the same for the oldest patches
for opac prog and intranet ...
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Comment on last patch.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Comment on last patch. Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit 2beeedafbe7c72c5b21fce9fffa6625f4fe99c3c)
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Owen Leonard [Fri, 26 Apr 2013 19:18:12 +0000 (15:18 -0400)]
Bug 10083 - 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: Chris Cormack <chris@bigballofwax.co.nz> Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Template only change fixing a translation problem. Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit 284e3e0d31ac12cf03c024d42cb1ceb10e3c276d)
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Jonathan Druart [Mon, 29 Apr 2013 14:01:56 +0000 (16:01 +0200)]
Bug 10145: The acquisition details block is badly placed.
Bug 5335 introduced a new "Acquisition details" block on the
subscription details page.
It is placed between to tabs and causes an ergonomic issue.
Test plan:
- Order a subscription.
- Go on the subscription detail page and select a tab.
- The "Acquisition details" block is moved from the bottom to the top of
the table.
- Apply the patch
- The "Acquisition details" block is always on the bottom of the table.
Signed-off-by: David Cook <dcook@prosentient.com.au> Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Fixes display problem, passes all tests. Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit 53cdc66a0e61783ab31ba5bbca0ed71b045bc334)
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
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>
(cherry picked from commit 23b9661efad0e0fd0deb3e3d025e08c8cfbc1fd3)
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
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>
(cherry picked from commit 065fe316ead0208bb562c953b798fc698e5b1f18)
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
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.
(cherry picked from commit 7e293e20de5cf5639c161b46871f401ab950e841)
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Jonathan Druart [Thu, 25 Apr 2013 07:47:53 +0000 (09:47 +0200)]
Bug 10088: FIX adding an order from a staged file.
Bug 9902 introduced an issue in the C4::Items::PrepareItemrecordDisplay
routine. The existence of $defaulvalue hashref should be tested before
getting to the branchcode key.
Test plan:
Before applying the patch, an error occurred when you try to create an
order from a staged file.
After applying the patch, the error does not appear anymore.
Signed-off-by: Mathieu Saby <mathieu.saby@univ-rennes2.fr> Signed-off-by: Mason James <mtj@kohaaloha.com> Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit f2e44716f60578b9663862d7b2ba3b16f7067143)
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
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 Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit 7a5dc6eef546bfa4f9465e9f864bacdefe168cd5)
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
fixed a typo in marc 21 leader builder about the value 'b', Serial component part
Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Good catch.
Template change only. Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit 9a449ce16ce00d667ff12ec262dc02e973a21cc2)
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
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: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit 8084a70a3b13a87a516844ee7b7f3665aa8c1e95)
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
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: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit d050e557f4ac3d7a8b1a0fa573a8ca00aa0862a9)
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
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: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit 5b6f89714d58d4a7c33b621b2cefbc02523dafa3)
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
A construction that was a syntax error in older versions of Perl was
causing problems for jenkins. This patch fixes it. Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit 906bf789febd3e97bd23ed2cc1fcf3233bdfba9c)
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Marcel de Rooy [Thu, 21 Mar 2013 12:56:01 +0000 (13:56 +0100)]
Bug 9886: ParseLetter removes too often punctuation characters from fields
This patch makes ParseLetter somewhat more restrictive in removing
punctuation characters from the end of a table field.
Based on the assumption that we want to remove punctuation from fields in
biblio and biblioitems (like ISBD).
ParseLetter should not remove e.g. a parenthesis in itemcallnumber, but still
removes e.g. a colon (:) at the end of a title.
Removed an unneeded global and lookahead from the regex.
Test plan:
1) Add a colon (:) to the end of a title.
2) Add a colon to the end of item copynumber.
3) Place a hold on that item. Check it in. Confirm hold.
4) Check the email or print notice generated. There should be no colon at the
end of the title, but the colon in the copynumber should still be there.
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
I compared checkout notices with lots of different fields before
and after applying the patch. For example the ) at the end of a
field in branches is now longer removed. Other fields looked ok
before and after.
Passes all tests and QA script. Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit 4b1c71e91a19fcf37e302bba66019807b18cb307)
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Aaron Wells [Mon, 25 Mar 2013 03:56:24 +0000 (16:56 +1300)]
Bug 9671: Make fines.pl help text more accurate
To test:
run kohaclone/misc/cronjobs/fines.pl --help and note the help text. It should match the settings in System Preferences.
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Documentation change, passes all tests. Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit 109f316efb49287e92f56164f819d2ced03536c1)
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Katrin Fischer [Sun, 14 Apr 2013 18:59:08 +0000 (20:59 +0200)]
Bug 10040: Capitalization wrong when deleting subfields from authority
Confirmation message for deleting subfields from an authority framework
has wrong capitalization.
To reproduce:
1) Go to Administration > Authority types
2) Click on MARC structure for one of the authority types
3) Click on the subfields link for one of the fields
4) Delete one of the subfields
Signed-off-by: Owen Leonard <oleonard@myacpl.org> Passed-QA-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit 0f2945d768753b92c7014830efc31345d3ce7e87)
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Bug 10073: Show ccode or location also if not bound to Authorized Values in XSLT
If you do not have ccode or location governed by authorized value
(you can release this default connection in the marc structure),
these item values are not passed through in the items section,
created by buildKohaItemsNamespace for XSLTParse4Display.
This simple patch checks if the authorized value hash on ccode or
location returns something and passes the original value in otherwise.
Test plan:
Temporarily disconnect ccode and location from authorized values
in MARC structure.
Edit an item, put some values in location and ccode.
Look at this record via opac search (XSLT enabled). Toggle the value of
OPACItemLocation to show ccode or location before call number.
Restore authorized values-connection when applicable.
Note: Since bug 9995 adjusts OPAC XSLT Results, it may be helpful
to apply these
patches when testing this.
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
This works as described for the XSLT result list.
The text is shown when OpacItemLocation is set to show collection
or location.
Note: Displaying location and collection without using authorised
values doesn't work in other places like the detail page item table.
So this will need more work to be fully functional. Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit ab5c3eccf4a7e874f8b654c199caeeae9a98128f)
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Bug 10103 UniqueItemFields is missing from sysprefs.sql
Bug 7892 introduced UniqueItemFields but did not add it to sysprefs.sql.
Also fixes an unrelated missing semicolon in sysprefs.sql
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com> Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit faa93aff62a5bc381134720177918f09987ea61a)
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Kyle M Hall [Wed, 5 Dec 2012 18:55:00 +0000 (13:55 -0500)]
Bug 9219 - Show damaged and lost statuses for issues on circulation.pl as they are on moremember.pl
This patch adds the lost and damaged status for an issued item to the
table of issued items on circulation.pl to make it align more closely to
the same table on moremember.pl
Test Plan:
1) Apply patch
2) Issue an item
3) Set the item's damaged status
4) Verify the status is showing near the date due on circulation.pl
5) Clear the damaged status and set the lost status again
6) Repeat step 4
Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
I could only test this with the DAMAGED value, because
currently lost items are removed from the patron account
when you set the status.
I know there is a patch somewhere
to make it optional and the change looks alright.
Passes all tests and QA script. Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit 6385cfd1dc6c0dbceed0064c35f6f86f86e22be2)
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Added some tests against the methods added by this patch.
To test, prove -v
- t/Koha.t
- t/ReportsGuided.t
Edit: fixed the amount of tests in the skip block. Tests fail for people having earlier versions of DBD::Mock.
Sponsored-by: Universidad Nacional de Córdoba Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works quite nicely!
All tests and QA script pass. Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit 6110375307845778f74d6e5a214d63ab69cc5330)
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Bug 9659 - Better handling of non-existent authorised value categories used in SQL reports
A user might create a SQL report that relies on non-existent authorised value categories.
Because of a typo, or just because they copy&pasted the report from the Wiki.
Use cases are:
- The user creates a report from SQL
a) Uses bad authorised values
b) Clicks 'Save Report'
c) Koha lists the problematic authorised values
d) The user decides to
e-1) Save it anyway, it gets saved
e-2) Edit the report, it gets back to where it chose 'Save Report'
- The user edits an already saved report (Update SQL)
a) Uses bad authorised values
b) Clicks 'Update SQL'
c) Koha lists the problematic authorised values
d) The user decides to
e-1) Save it anyway, it gets saved
e-2) Edit the report, it gets back to where it chose 'Update SQL'
- The user tries to run a saved report that contains bad authorised values, Koha advertises the problem and provides the user with a button 'Edit SQL' to fix things.
To test, just create a report from SQL using invalid authorised values like this (misspelled 'branch'):
SELECT *
FROM itemtypes
WHERE hola=<<Test branch1|branchee>> AND
hola2=<<Test branch2|brancha>>
Regards
To+
Notes:
- I added several comments on the code.
- Fixed an annoying warning of uninitialised variable also (refactored some tiny bits to do it).
- Added the following methods
- C4::Reports::Guided::GetReservedAuthorisedValues
- C4::Reports::Guided::GetParametersFromSQL
- C4::Reports::Guided::IsAuthorisedValueValid
- C4::Reports::Guided::ValidateSQLParameters
- C4::Koha::IsAuthorisedValueCategory
- Those methods could have been used to refactor this guided reports code as its *a bit messy*. I chose to do it in a new bug of course :-D.
- Fixed some trivial perlcritic -5 errors
- Removed some debugging stuff left by mistake
- Fixed some POD problems
- Optimal SQL-driven IsAuthorisedValueCategory method
- Thanks to Owen and Jared for their patience heh.
Sponsored-by: Universidad Nacional de Córdoba Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Comment: Work as described. No koha-qa errors.
Test:
Tried with examples (from help and test plan) reports, correctly
identifies invalid authorized values, and no problem with
authorized ones.
NOTE: Online help for this does not states that partial values
need to be between '%' in a SQLish way. Perhaps this could be
addressed inserting % in values or adding a checkbox (partial|exact).
Or changing help.
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>
(cherry picked from commit cdc5e11159c6c3dba8ae371094633feb5e64b57d)
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
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: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit 545573d33318a37e5f58f053acc3a5cf09a9260c)
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Owen Leonard [Thu, 25 Apr 2013 12:49:51 +0000 (08:49 -0400)]
Bug 10115 - Hiding advanced search in Orders search tab removes plus button
The logic of the JavaScript for showing and hiding additional options in
the orders search form wasn't quite right, resulting in the +/- control
being hidden incorrectly.
This patch corrects and simplifies the JS in order to fix the problem.
To test:
- Open any page in Acquisitions which shows the orders search
form in the header search bar (for instance, Acquisitions home).
- Open the orders search tab and click on the "+" to show more
options.
- Click the "-" to hide the additional options. The additional options
should now be hidden and the "+" displayed.
Signed-off-by: Mirko Tietgen <mirko@abunchofthings.net>
Works as expected Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com> Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit f8130fb8486a3bb840d37006ddfbf046cb9b161a)
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Liz Rea [Tue, 9 Apr 2013 01:20:09 +0000 (13:20 +1200)]
Bug 10006 - holding branch is not available to XSLT display
To test:
Use attached XSLT stylesheet for OPAC Results
* set your OPACXSLTResultsDisplay to use the attached stylesheet. The path is the FULL PATH, from /, to the file.
* be sure to copy MARC21slimUtils.xsl to the same folder, or change the path in the attached one to point to the correct path on your filesystem.
Verify that the OPAC results now show the holding branch instead of the home branch.
Possible fail states:
* no branch is shown (only call numbers, if given)
* the wrong branch is shown
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 0942cac72e8910b3ed6e557c42f6665060c14bd0)
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
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: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit 5959154bc140a60164dd8652dd4285e2ec51f5d3)
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Katrin Fischer [Sun, 14 Apr 2013 16:02:43 +0000 (18:02 +0200)]
Bug 10045: Switch budget to fund in suggestions
Labels are budget, but should be fund.
To test:
1) Check the table on the suggestions page.
2) Check the suggestion edit form.
3) Check the suggestion display.
Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com> Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit cd14dae7720b93f1ed101cd6383828885237aa02)
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Owen Leonard [Wed, 24 Apr 2013 12:52:12 +0000 (08:52 -0400)]
Bug 10106 - Markup error causing misplacement of "reopen" checkbox on invoice edit screen
A misplaced closing </li> causes the "reopen" checkbox to be misplaced
if you're editing the a closed invoice. This patch puts the </li> in its
proper place.
To test, view a closed invoice (Acquisitions -> Vendor -> Invoices) and
confirm that the "reopen" checkbox is correctly placed.
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com> Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Problem easy to spot, patch fixes it perfectly. Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit fc34239c7d161b82d923dbf318537d6a22e7ed9f)
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Katrin Fischer [Sun, 14 Apr 2013 15:44:43 +0000 (17:44 +0200)]
Bug 8068: Standardize terms used on acquisitions statistics
branch > library
budget > fund
bookseller, supplier > vendor
and capitalization
To test:
1) Go to Reports > Acquisitions statistics
2) Check the labels and options of the form for correctness.
3) Run a few test searches to make sure functionality is
unchanged.
Unfortunately, some strings are from the .pl file, so a follow
up moving those to the templates is needed.
To make the changes consistent I have changed them in the .pl file.
Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com> Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit 8e222dcdcc1f4aad9147f584df9d2f983f803a48)
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Owen Leonard [Thu, 7 Mar 2013 21:07:16 +0000 (16:07 -0500)]
Bug 9766 - Remove YUI menu on budget planning page in favor of different column-hiding system
The budget planning table previously used a YUI menu as part of a
system for hiding and showing table columns. Instead of trying
to convert that sytem to Bootstrap I have used code from the
batch modification/deletion pages which uses a list of checkboxes
to show and hide table columns. This has the advantage of giving
the user visual feedback of what columns are hidden and of offering the
user an interface which is familiar from other pages.
This patch also moves CSS from a batch-operations-specific
CSS file into the main CSS file. Batch modification templates have been
modified accordingly.
To test, view the budget planning page and choose different
"plan by" options (by month, by library, by item type). Test
the show/hide action on each individual column and using the
"show all" and "hide all" checkboxes.
Signed-off-by: David Cook <dcook@prosentient.com.au>
Works as described.
This interface is also much more visually appealing, user-friendly, and informative than it was when it used the YUI menu.
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com> Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit 28518a033bf9a1b3f86270cfab438b5b9cdee8be)
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
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: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit 44a8ed7dec205dd264797ecf2638fea7f1ea67c8)
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Nicole C. Engard [Thu, 28 Mar 2013 03:16:42 +0000 (23:16 -0400)]
Bug 9850: Update Lists Help
This updates the manual link in the lists help file.
To test:
Visit lists pages in the staff client, view the help and confirm link goes
to the right place.
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz> Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Nicole C. Engard [Thu, 28 Mar 2013 03:14:16 +0000 (23:14 -0400)]
Bug 9850: Update holds help file
This updates the manual link on the holds help file.
To test:
Visit the holds tab on any bib record and click the Help link. Make sure it
goes to the right place.
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz> Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Nicole C. Engard [Thu, 28 Mar 2013 02:31:57 +0000 (22:31 -0400)]
Bug 9850: Update Tags & Comments Help
This patch updates the text and links for the Tag and Comment
moderation tools.
To test:
Visit the help on the tags and comments tools and confirm that text and
links are right.
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz> Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Nicole C. Engard [Wed, 27 Mar 2013 18:41:05 +0000 (14:41 -0400)]
Bug 9850: Catalogue help files
This patch updates the help files in the catalogue folder.
To test:
Visit the help on the search, detail pages, item details and
item history pages and confirm text and links are right.
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz> Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Nicole C. Engard [Wed, 27 Mar 2013 16:49:05 +0000 (12:49 -0400)]
Bug 9850: Acq Help Files for 3.12
This patch updates the manual links and some text in the acq
help files.
To test:
Visit help on all acq pages and make sure links and text are right.
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz> Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Nicole C. Engard [Sun, 24 Mar 2013 05:14:58 +0000 (01:14 -0400)]
Bug 9850: Update Admin Help Files for 3.12
This patch updates the links to the manual and the text of the
admin help files.
To test:
Visit the help files on all admin pages and make sure the links and text
are right.
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz> Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Nicole C. Engard [Sat, 23 Mar 2013 23:53:14 +0000 (19:53 -0400)]
Bug 9850: Update Patron Help Files for 3.12
This patch updates all the help files in the members folder. It also
adds a missing help file for approving patron account changes.
To Test:
Visit the help on every patron page and make sure the text and
manual links are all right.
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz> Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Fixed 2 obvious typos mentioned on the bug report. Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Nicole C. Engard [Sat, 23 Mar 2013 13:46:38 +0000 (09:46 -0400)]
Bug 9850: Update Patron Card Help Files
This patch updates the links to the manual in the patron card
creator help files. There were no other changes.
To test:
Visit help on the patron card creator tool and make sure the links are right.
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz> Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Nicole C. Engard [Sat, 23 Mar 2013 13:42:12 +0000 (09:42 -0400)]
Bug 9850: Update Label Help Files
This patch updates the manual links in the label creator
help files. There were not other string changes.
To test:
Visit the help on the label creator and make sure that the
links go to the 3.12 manual.
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz> Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Updating links. Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Nicole C. Engard [Sat, 23 Mar 2013 13:17:00 +0000 (09:17 -0400)]
Bug 9850: Update Authority Help Files
This patch just updates the links to the manual in the
Authority help files.
To Test:
Visit the help on all authority pages and click the manual link
in the help pop up. It should go to the 3.12 manual.
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz> Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Updating links to new version. Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Nicole C. Engard [Sat, 23 Mar 2013 13:09:39 +0000 (09:09 -0400)]
Bug 9850: Update Stray Help Files
This patch updates the help files which do not have a module
folder.
To test:
Visit About Koha, Koha Home, and the No Help Found pages and
check links to the manual.
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz> Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Updating links to new version. Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Owen Leonard [Tue, 9 Apr 2013 13:29:32 +0000 (09:29 -0400)]
Bug 9925 - Remove unused table-pager include
While the tablesorter plugin has not been completely eliminated from the
staff client yet, there are no more instances where it requires the
include file for showing paging controls. table-pager.inc can be safely
removed.
To test, apply the patch and confirm that the file is gone. A search of
Koha templates for references to table-pager.inc should return no
results.
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com> Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit aadcdf7c7e4c254edea4f2c96229add6ec8c74b1)
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Katrin Fischer [Sun, 14 Apr 2013 21:28:41 +0000 (23:28 +0200)]
Bug 10050: Update German web installer files for 3.12 - Language settings
Activate German and English for OPAC and intranet by default.
To test:
- Run the German web installer
- Check that when logging into Koha the German interface is shown
and you can switch between English and German using the links
at the bottom of the page
- Check language relevant settings in the system preferences
are correctly set
Note: The German po files in master are buggy, please
use files from translate.koha-community.org for testing.
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz> Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com> Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit d8d4d9973fcd992570c6bfc0b2f8d1acd94a2aca)
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Katrin Fischer [Sun, 14 Apr 2013 20:56:30 +0000 (22:56 +0200)]
Bug 10050: Update German web installer files for 3.12 - Optional
This patch updates the German web installer files from the
optional directory.
This includes:
- Adding the bridge/reference.gif to the REF itemtype
- Updating currency rates and setting EUR to active
- Adding branchcode MPL to the sample holidays
- Updating a few strings on the patroncard samples
- Fixing typos and rephrasing
To test:
- Run the web installer with German installed
- Verify all optional SQL files are installed correctly
Note: The German po files in master are buggy, please
use files from translate.koha-community.org for testing.
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz> Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com> Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit 60db9a9e244e1a93522384bf3b715fcfea364927)
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Katrin Fischer [Sun, 14 Apr 2013 20:14:50 +0000 (22:14 +0200)]
Bug 10050: Update German web installer files for 3.12 - Mandatory
This patch updates the German web installer files from the
mandatory directory.
This includes:
- CalendarFirstDayOfWeek defaults to Monday
- gist rates default to 0.07|0.19|0.00
- RoutlingListNote default text translation
- uniqueitemfields default set to barcode stocknumber
- Translation of new user flags and permissions
- Corrections to existing translations and typo corrections
To test:
- Run the web installer with German installed
- Verify all mandatory SQL files are installed correctly
Note: The German po files in master are buggy, please
use files from translate.koha-community.org for testing.
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz> Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com> Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit 40cd834c74d0a8b5b1d92941c0ec651655630103)
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Jonathan Druart [Wed, 17 Apr 2013 13:37:57 +0000 (15:37 +0200)]
Bug 10070: Anonymous search history is not being set in the cookie
Test plan:
1 - turn on EnableOpacSearchHistory
2 - launch some searches at the opac
3 - go to your search history
4 - there is no history!
5 - apply this patch
6 - retry steps 1 to 3
7 - your history search is available!
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
This does fix the bug, but does undo the change to make the cookie
utf-8 safe, however I think that change was done in the wrong way so
I am happy to sign this off
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Wondering if the comment line should be deleted now too.
Patch fixes the problem. Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit 52db043347016e106033c4c372bd9ec34cf8dee1)
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
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: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit 6e4851fa406eb7b5c831c158faa5f83caf723c2a)
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Owen Leonard [Tue, 9 Apr 2013 12:55:45 +0000 (08:55 -0400)]
Bug 9903 - Sort by date broken on patron detail page
When the patron detail page switched to DataTables no accommodation was
made for metric date formats in sorting.
This patch adds sorting based on data in a span's title attribute, and
thus requires that the patch for Bug 9887 be applied.
To test, view the detail page for a patron who has assorted checkouts,
relatives' checkouts, and holds. Sorting of date columns should be
correct with the dateformat preference set to any value.
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
All tests and QA script pass.
Nice improvement. Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit 0c76032738ffd4c18e5a90e68a27b46c9d82a37a)
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Katrin Fischer [Sun, 14 Apr 2013 14:29:40 +0000 (16:29 +0200)]
Bug 10023: Change degree notation for number to No.
This patch changes N<little circle> to No. in three templates.
To test:
1) Search for a vendor with visible baskets.
Check that the first column of the basket table in the
is now labelled No.
2) Print a PDF order in acquisitons with layout2pages.
3) Print a PDF oder in acquisitons with layout3pages.
Check both generated PDFs for the correct syntax.
Note: you need to switch the system preference
OrderPdfFormat in order to test 2) and 3).
The 2 possible settings are:
pdfformat::layout3pages
pdfformat::layout2pages
It's not only Koha - git bz doesn't like the degree
notation either.
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
I prefer "No." over "#" and my survey of the templates shows that "No."
appears more often. Looks like something to add to our style guide. Passed-QA-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit 7d3d347774cf44c02ca133798ead8c99849699ed)
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Katrin Fischer [Sun, 14 Apr 2013 14:57:03 +0000 (16:57 +0200)]
Bug 10023: Change degree notation for number to #
This patch changes N<little circle> to # in three templates.
To test:
1) Search for a vendor with visible baskets.
Check that the first column of the basket table in the
is now labelled #
2) Print a PDF order in acquisitons with layout2pages.
3) Print a PDF oder in acquisitons with layout3pages.
Check both generated PDFs for the correct syntax.
Note: you need to switch the system preference
OrderPdfFormat in order to test 2) and 3).
The 2 possible settings are:
pdfformat::layout3pages
pdfformat::layout2pages
It's not only Koha - git bz doesn't like the degree
notation either. Passed-QA-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit 3b45b745cf5a2a0392b9817e60de8461037feb6a)
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
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)
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
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)
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
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: Jonathan Druart <jonathan.druart@biblibre.com> Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit 9186c2fedacfa1d0063fc67ec1e1e1a923abdcf6)
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
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: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit 815bcbc1d16ad2764fde9f6d3221d2527e48855a)
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
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: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit c02931977e5121b51eb29db6116b768c24a1aadd)
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
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: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit ea23dbeab2a2f5cf6be64e707ea56b3ea89e437b)
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Fridolyn SOMERS [Mon, 11 Feb 2013 13:47:09 +0000 (14:47 +0100)]
Bug 9588: weighted search query with index
When QueryWeightFields is enabled, the searching query is created with several options.
In C4::Search::_build_weighted_query, when no index is defined, the query is build with fuzzy and stemming options. When an index is defined, theses options are missing, only unconditional right truncation is used.
The consequence is that when QueryStemming is disabled, a search with index can give more results (due to right truncation) that a search without.
This patch adds stemming and fuzzy on search with index, conditioned with QueryFuzzy and QuerryStemming sysprefs.
Also changes world list search (wrld) weight to r6 in order to set fuzzy search to r8 and stemming search to r9 (like search without index).
Test plan :
- Go to searching preferences (admin/preferences.pl?tab=searching)
- Set QueryAutoTruncate to "only if * is added"
- Set QueryFuzzy and QuerryStemming to "Don't try"
- Set QueryWeightFields to "Enable"
- Go to advanced search page
- Select an indexe (ie Title) and perform a search on a short word
=> Look at zebrarv log and see that query does not contain right truncation : @attr 5=1
- Set QueryFuzzy to "Try"
- Perform same search
=> Look at zebrarv log and see that query contains fuzzy : @attr 5=103
- Set QueryFuzzy to "Don't try" and QuerryStemming to "Try"
- Perform same search
=> Look at zebrarv log and see that query contains rigth truncation on stemmed word : @attr 5=1
Signed-off-by: koha.aixmarseille <koha.aixmarseille@gmail.com> Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
This patch makes Fuzzy and Stemming influence search results on weighted
queries when using an index. Side-effect is however that the results for a
search like index=term* (add truncation manually too) could be LOWER than the
the number of hits for index=term. Further comments on Bugzilla. Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit 39bf1c502aec95742c81f43d7d631223b399ce5b)
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Jonathan Druart [Wed, 3 Apr 2013 13:31:08 +0000 (15:31 +0200)]
Bug 9984: Remove server-side sort on the hold ratios table
JS is a requirement for the staff client, so the sort link on header is
useless.
Test plan:
Check that there is no regression (sort, data, etc.) on the hold ratios
table.
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Tested on top of patch for bug 9459.
All tests and QA script pass. Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit 91155470ba3cbee869368d6904cb3da4a0197768)
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
projects / koha.git / log