Chris Nighswonger [Wed, 7 Dec 2011 17:43:47 +0000]
Updating Version Number to 3.04.07.000
Frédéric Demians [Wed, 7 Dec 2011 17:16:20 +0000]
3.4.7 Translation Update
(cherry picked from commit
d26c11e97b599b018495880e71b7e5fac98e3a5b)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Chris Nighswonger [Wed, 7 Dec 2011 16:48:03 +0000]
Release Notes for 3.04.07.000 07 Dec 2011 16:48:02 Z
Chris Nighswonger [Mon, 5 Dec 2011 02:07:49 +0000]
Adding a git mailmap file to allow standardizing of commit author's names/email
(cherry picked from commit
5dc48be361fd66db512f8c4caaa022535efa3485)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Chris Nighswonger [Mon, 5 Dec 2011 02:27:30 +0000]
Adding template for autogeneration of 3.4.x release notes
Chris Cormack [Fri, 25 Nov 2011 07:38:35 +0000]
Bug 6629 fix for vulnerability
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Chris Cormack [Fri, 25 Nov 2011 18:39:51 +0000]
Bug 6628 fixing security vulnerability
Signed-off-by: Frère Sébastien Marie <semarie-koha@latrappe.fr>
- patch taken from master
- I also corrected two invalid calls to themelanguage (tests are not possible else)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Paul Poulain [Fri, 18 Nov 2011 22:28:38 +0000]
Joy nelson was already in history.txt, removing the entry
(cherry picked from commit
9c5d3ea3aa28b71f0fb4148b8fdf9f2a002f79f5)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Frédéric Demians [Sat, 27 Aug 2011 11:32:08 +0000]
Bug 6799 rebuild_zebra.pl -x produces invalid XML records
This patch allow to handle properly items containing extended characters and
send valid XML records to zebraidx
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit
4ce57a102b1c0404bc4ae67032bcb1cbbc769fc7)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Chris Nighswonger [Wed, 26 Oct 2011 15:14:05 +0000]
Bug 7095: Fixing cut and paste error and removing the use of diag() as this does not produce output when the test is run in a harness
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit
a340ded2ca5b95b1ae4f14423cab3fda107ed597)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Frédérick Capovilla [Fri, 21 Oct 2011 16:04:03 +0000]
Bug 6977: Follow-up patch : catch CloneSubfield errors
A javascript error could occur if the CloneSubfield function failed for
any reason. This would prevent the popup from disappearing.
Example : Importing informations of a UNIF_TITLE authority with multiple
$x subfields in the biblio's 440 field. 440$x isn't repeatable, so an
error occurs when trying to clone it.
http://bugs.koha-community.org/show_bug.cgi?id=6977
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit
6dac7273fbc2eff7805d2a9bda1eb9a275962c00)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Salvador Zaragoza Rubio [Wed, 22 Jun 2011 16:18:40 +0000]
Bug 6475 - Edit it's not possible in subfield "0" in MARC framework
When trying to modify the subfield "0" on a field in the
MARC subfield structure admin -> Tag xxx Subfield Constraints,
the boolean condition on liblibrarian fails for the initial "0" value.
Modified condition to allow the value "0"
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit
042f89e939984b2b9e568622e0b99c95db09750e)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Ian Walls [Thu, 17 Nov 2011 15:27:47 +0000]
Bug 7134: patron records getting corrupted birthdates
If no date of birth is provided in a new member form, the borrower gets the birthdate of "00/02/0", which
is obviously incorrect (the result of passing 0 to the database directly)
The fix is to remove a conditional check buried deep in C4::SQLHelper. This is in a helper subroutine that was changed
for the Unified Member Search dev (bug 6253). Reverting this small change to the conditional does not seem to break
search, but testing will be required.
To test:
1. apply patch, and create a new patron with blank birthdate. The new patron should now have a blank birthdate instead of '00/02/0'
2. search for a borrower by 1 part surname, confirm search works
3. search for a borrower by 2 part surname, confirm search works
4. search for a borrower across firstname AND surname; confirm
5. search for a borrower and include categorycode/branchcode filters
Signed-off-by: Liz Rea <wizzyrea@gmail.com>
I confirm all working tests 1-5
1. Created patron with blank birthdate - birthdate was blank
2. Searched for patron "henry james acevedo III" by using "acevedo" - result was correct
3. Searched for mr. acevedo using "Acevedo III" - result was correct
4. Searched for Henry James Acevedo III, Henry Acevedo and James Acevedo - results were correct
5. Searched for Mr Acevedo with the branch he was not in, with the branch he is in, with a category he was not, and a category he was. All results were correct.
also noted: inner searching seems to be working now? Example: Henry James (firstname) Acevedo III (surname) - searching James Acevedo brings back the correct patron.
Not complaining, just noting. :)
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit
440c0f21ee59664bfbd2238c638f84a6af3d9d80)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Paul Poulain [Thu, 17 Nov 2011 15:50:54 +0000]
updating history.txt : 3.6.0 & 3.4.6 & KohaCon11 & Joy Nelson 160th
(cherry picked from commit
2216cd4371a72d95491dc51455d1ae7a6c783147)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Frédérick Capovilla [Fri, 14 Oct 2011 19:52:30 +0000]
Make all strings translatable in marc21_field_007.tt
http://bugs.koha-community.org/show_bug.cgi?id=7033
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Test plan:
- apply patch
- update po files using 'perl translate update <language-code>
- check po files for new strings from 007 plugin
- translate some / all of them
- update templates with changed po files 'perl translate install <language-code>
- verify 007 still works and got translated
(cherry picked from commit
8fde30912ec89c8855a7b4d468f5e48e7b886e85)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Joy Nelson [Mon, 14 Nov 2011 22:23:49 +0000]
Bug 7221: C4/Biblio.pm documentation is incorrect.
$dbh is not a valid first parameter. Removed $dbh from line 392 to show correct syntax.
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
(cherry picked from commit
1d0192b85ceabca3dbb0add7df218a4d768ea104)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Liz Rea [Mon, 24 Oct 2011 20:26:32 +0000]
Bug 7084 - Re-arranging results_summary for tags so that it applies where it is supposed to
To test:
Verify that New Tag text is the same size as all of the other surrounding text.
Verify that it is consistent in size with results that have existing tags.
See screenshot for what it looked like before:
http://screencast.com/t/hnt15kpS7SH9
Notice that the Add button and New tag text were slightly larger than the
similar constructions for results with existing tags. This patch should fix
that.
Signed-off-by: Magnus Enger <magnus@enger.priv.no>
I made sure I had a results list with on record with tags and one without.
Before applying the patch the "New tag" text and "Add" button were
inconsistent for the two records, after applying it they look the same. Nice!
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit
1d42be9e7670a3489be681494a8b782c855d52fb)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Chris Nighswonger [Wed, 9 Nov 2011 19:51:01 +0000]
Bug 7207 - Reverting a portion of commit
607b5449bd5cb which breaks the label export script.
squashed chris_n's two patches. Label export works again. Also changed the pattern for the item_number to the known working, critic friendly pattern.
Don't change $_ in a list context
Changed the 3rd bit to the critic friendly pattern chris_n suggests in the previous two lines.
Signed-off-by: Brendan <brendan@bywatersolutions.com>
(cherry picked from commit
7824a1bc8da020b11fa9473f09fb7c6429390034)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Nahuel ANGELINETTI [Mon, 17 May 2010 13:43:37 +0000]
(bug #4518) enhance 2.2 to 3.0 scripts
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit
e0b029a4f5ff378291e86fa55e07841297d611e7)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Katrin Fischer [Mon, 24 Oct 2011 15:48:29 +0000]
Bug 4161: Preselect active currency for new vendors
Currently when creating a new vendor in acquisitions the alphabetical first
currency will be preselected. For better usability and less mistakes the
active curency should be preselected.
To test:
Check your currency settings in administration.
Your active currency should not be the first in the list.
1) Create a new vendor
Verify the active currency is selected for list and invoice prices.
2) Check vendor summary page
Verify the correct currencies from the vendor record are shown here.
3) Edit vendor
Verify the correct currencies from the vendor record are shown here.
Signed-off-by: Liz Rea <lrea@nekls.org>
Verified with tests 1, 2, and 3.
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit
5d5a04798449d1725042adb872d4acf51af672f8)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Ian Walls [Mon, 26 Sep 2011 20:38:39 +0000]
Bug 2629: Add diacritic support for Ů (U with ring)
Adds Ů and ů support to word-phrase-utf.chr. These characters are used in
Czech, for example the author Martinů, Bohuslav (1890-1959)
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit
1e2f697e3bca3c9068e1864db63d0b112b4273a4)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Ian Walls [Fri, 4 Nov 2011 10:26:01 +0000]
Bug 5945: email not searchable in patron search
Adds 'email' to valid search parameters in members/member.pl
To test:
1. give a patron a unique email address in your test database
2. search on the full email; should work
3. search on the part of the email before the domain; should work
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit
c3abbedebedd34948b664a4d2a6b34dc4863802d)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Katrin Fischer [Wed, 2 Nov 2011 23:44:36 +0000]
Bug 7138: Can't print basket group order pdf
PDF print of basket groups is broken.
To test:
1) Make sure OrderPdfFormat is set to pdfformat::layout2pages or pdfformat::layout3pages
2) Create a basket with orders
3) Close the basket and create a basket group checking the checkbox
4) Print the basket group as PDF
Before patch the file is broken and when opened in an editor contains an error message.
After the patch the PDF should be generated correctly again.
Thx to Chris for helping me to fix the problem.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit
7a3dc5102e82bbb4c0c8487a0f128c20d4fe8248)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Chris Cormack [Mon, 31 Oct 2011 07:57:19 +0000]
Bug 6679: Fixing admin/aqplain :encoding(UTF-8) gives strict validation
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
tested with diacritics, no changes before and after the patch
(cherry picked from commit
ee0627f20bee5df234ab284d1fdacebb857de57f)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Chris Cormack [Wed, 2 Nov 2011 03:27:48 +0000]
Bug 6679 : Tidying changed parts of file
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit
3b0474950c791bbf0367f6c819203180205f7aa8)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Chris Cormack [Wed, 2 Nov 2011 03:24:05 +0000]
Bug 6679 : Don't declare variables in conditionals
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit
21e4d79be8b0a7204dd592528e20f5b8e29553ee)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Chris Cormack [Wed, 2 Nov 2011 03:19:36 +0000]
Bug 6679 : Not using strict .. bad script, no cookie for you!
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit
e8ea58270dc08aac8c1eaccc59e17d96daf56860)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Chris Cormack [Wed, 2 Nov 2011 03:13:20 +0000]
Bug 6679 : Don't declare variables in conditionals Don't change $_ in a list context search.cpan.org/~elliotjs/Perl-Critic-1.116/lib/Perl/Critic/Policy/ControlStructures/ProhibitMutatingListFunctions.pm
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit
607b5449bd5cb79dd8964e46bb970c3975497969)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Chris Cormack [Wed, 2 Nov 2011 03:00:01 +0000]
Bug 6679 : Declare variables outside of conditionals
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit
6bb73a04c4c67e5b14eb209ec56ae6585547c593)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Paul Poulain [Fri, 16 Sep 2011 22:58:41 +0000]
Bug 7188: C4::Context::db_scheme2dbi does case-insensitive grep
Checking NYTProf in C4::Context, it appears that the /i flag is highly time-consumming
As we don't support anything outside from mysql, returning directly mysql directly
If in a future version PostgresSQL works, then we will have to update this sub. But if an ORM is introduced, this code will be removed completly anyway
Testing note:
Drops execution time of the line from 300ms to 20 microseconds (in my testing).
(cherry picked from commit
0f8db0c53866afaf5171869359c558d1e9f4325e)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Paul Poulain [Sun, 6 Nov 2011 08:36:52 +0000]
Bug 7184 raise mySQL error if debug is set
Before this patch, if a mySQL occured in Koha (any error), then the user was seeing nothing.
With this patch, if DEBUG is set in Koha VirtualHost, any mySQL error will make Koha die and display the SQL error
Step to test:
=== BEFORE PATCH ===
go anywhere, and change a mySQL statement to make it invalid.
Launch a page using the SQL you've made wrong, you'll see nothing, except you won't see the expected results
=== AFTER PATCH ===
Modify koha-httpd.conf, and add the following line, in the virtualhost (if it does not already exist)
SetEnv DEBUG 1
restart/reload Apache
Launch the same page, you'll get a Perl statement saying something like:
DBD::mysql::st execute failed: <<blablabla SQL error>> at <<where the error was raised line <<error line>>
(cherry picked from commit
016e66c6f25fbe3b648bcb8dad8d59f80d11b992)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Liz Rea [Tue, 1 Nov 2011 19:01:17 +0000]
Bug 7128 - adding some ID's to make styling opac-main.tt a bit easier
To test:
verify that the loggedin id is added when user is logged in
verify that the notloggedin id is evident when no user is logged in.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Bug 7128 : Follow up, adding the id to the case when a user is not logged in
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit
4ccb8649f88abaf9012f1bbec06fc840046cb7ff)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Katrin Fischer [Mon, 24 Oct 2011 18:59:57 +0000]
Bug 6994: Wrong 'no budget defined' alert
When ordering from an existing record the 'no budgets and funds defined' error
message was shown below the result list.
To test:
A) No budgets defined for this user and library
Basket summary page shows a warning instead of the link for creation
of orders.
B) Budgets and funds are properly defined for this user and library
Basket summary page shows links for order creation.
Before patch: A search for an existing record had the alert at the bottom
of the search result list.
After patch: The links for creation of orders are shown instead.
Signed-off-by: Liz Rea <lrea@nekls.org>
Verified A and B.
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit
488f4be86537211214ede7e0e703128c0cc4c92f)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Frédérick Capovilla [Wed, 5 Oct 2011 19:12:04 +0000]
Notify the user on his account page when his account is almost expired
New feature : If the "NotifyBorrowerDeparture" system preference is defined, a
notification appears in the user's account page if his subscription is almost
expired.
http://bugs.koha-community.org/show_bug.cgi?id=6978
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
works perfectly with date formatted DD/MM/YYYY as well
(cherry picked from commit
e676e117fccfaa8208742c17a08cb92056286f95)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Ian Walls [Tue, 20 Sep 2011 13:22:46 +0000]
Bug 6471: add tablesorter to Holds Queue
This patch adds the table sorter to Holds Queue. Sponsored by Farmington Public Library.
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit
0ea8ff7c4c81c183ba8da64d7939b041c7de8301)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Katrin Fischer [Mon, 31 Oct 2011 00:06:17 +0000]
Bug 7117: Bug 7117 - Small display problems when organising suggestion tabs by name
To test:
1) Add some suggestions
2) Go to suggestions in staff
3) Choose from filters 'suggested by' or 'managed by'
4) Compare names shown on tabs with names in list of suggestions
Before patch: tab name has the wrong order, while list name is correct.
After patch: all names should be consistent and correct.
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit
e660cef0e2f0ab4a64f8f1b4b0b4ad612255c03b)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Marcel de Rooy [Thu, 3 Nov 2011 12:41:24 +0000]
7146 (Update timestamps when deleting a biblio)
Currently, when you delete an item, the timestamp column in deleteditems is
updated with current time. (This comes from an [unintentional] additional
update statement in DelItem.) It makes deletion time visible.
In the past, the marcxml was updated too at that moment, resulting in an
updated timestamp in biblioitems too. The timestamp in biblio was not touched.
If you delete a biblio however, the timestamps in deletedbiblio and
deletedbiblioitems do not reflect time of deletion. They still show the time of
last update before the record was deleted. This last update can be extracted
from MARC field 005 too.
This behavior is not consistent nor logical. I would suggest to add a statement
in DelBiblio to force updating the timestamp in deletedbiblio(items) too. It
makes the time of deletion visible in the record too. The time of deletion of a
biblio can be very useful for e.g. synchronizing purposes.
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit
7ee0565f5ce75fac16de2dc06c170bc06a171e56)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Owen Leonard [Fri, 4 Nov 2011 18:56:50 +0000]
Follow-up fix for Bug 3958, Standardize vendor/supplier/bookseller terminology
Fixing two stray instances of "supplier."
(cherry picked from commit
0038b0df15a838468bf7c23a389c260075dfd1c4)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Ian Walls [Wed, 19 Oct 2011 00:17:17 +0000]
Bug 7061: unnecessary global variables declared in C4::SQLHelper
Removes $tablename and $hash from global scope of C4/SQLHelper.pm. They are never used;
all instances of $table are locally scoped to the subroutines, and $hash is never used.
This may help with persistance; if not, it's at least a bit of trivial cleanup.
To test:
1. Search for a patron
2. Create a Contract in Acquisitions
3. Modify that Contract
4. Delete that Contract
All instances should return error free. This checks the subroutines of SQLHelper
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit
36d8e5df96d17df3d19a4693fff2ba52504fae51)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Frédéric Demians [Sat, 8 Oct 2011 13:30:59 +0000]
Bug 6989 Patron categories not properly displayed if not pure ASCII
C4::Category module returns badly encoded patron categories when they are
containing non pure-ASCII characters.
To reproduce this bug:
- Go in Administration > Patron Categories
- Add a new category. Give it this code for example:
Café
- Click on Patrons link on top menu
- Click on New button
=> You get 'Café' displayed without accent
Signed-off-by: Piotr Wejman <ropuch@bagno.be>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit
d998166ea30e9d798c97d457afe39c748eed38ae)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Paul Poulain [Wed, 15 Dec 2010 13:05:04 +0000]
Bug 5885 : UNIMARC XSLT changes
dealing with some BNF/SUDOC invalid utf-8 (in title, the removed fields are used to mark non-sorted words)
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
I can't test this works ok for UNIMARC, but it does not cause any
problems with the translation scripts or MARC21 so signing off
(cherry picked from commit
cc6c1acb38b8797f71f37ebfd7b26ebcac6806ef)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Ian Walls [Fri, 21 Oct 2011 15:43:17 +0000]
Bug 7076: Lists render OPAC XSLT on staff side
Adds a small check in C4::VirtualShelves::Page::shelfpage to only render
OPACResultsXSLT if the $type is 'opac'. Since parsing the XML is such an expensive
thing, and the resulting XSLTBloc is not used on the staff side, this will increase
performance for Lists in the intranet
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit
a0a9368beccd1748e720966f25869259a30e68f2)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Frédérick Capovilla [Mon, 17 Oct 2011 20:01:29 +0000]
Follow-up patch : use the subfield associated with items.barcode
Instead of using the 'p' subfield directly, use the subfield letter
associated with the items.barcode column.
http://bugs.koha-community.org/show_bug.cgi?id=6963
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Test cases tested:
- 1 item, barcode empty
- 2 items, barcodes both empty
- 1 item, existing barcode
- 1 item, new barcode
- 2 items, one barcode empty, one existing
All test cases worked nicely and gave correct error messages.
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit
61e1eeee84083f835a85d43128f4b6cbeef636dd)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Frédérick Capovilla [Mon, 3 Oct 2011 19:00:05 +0000]
Bug 6963: Corrects a problem when a new order is created with a duplicate barcode.
If the AcqCreateItem preference is set to "ordering" and the barcode for
the new item is already in use, no error is returned, but an invalid
itemnumber is saved in the aqorders_items table and the item is never
created.
This patch adds a duplicate barcode verification in neworderempty.pl
_koha_add_item is also modified so it won't return an invalid ID when
an item can't be added.
http://bugs.koha-community.org/show_bug.cgi?id=6963
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Test plan on second patch.
(cherry picked from commit
327be442bd6e63e5ff8c0a5e2461ae836e8deffb)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Chris Cormack [Wed, 5 Oct 2011 03:39:08 +0000]
Bug 6895 : First attempt at fixing the diacritics bug
This is a fairly hacky solution, a counter patch would be more than
welcome
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Updated, translated and installed German po files after applying this patch.
No problems found.
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit
afaf7eaffa2b7e18675eb5d5a9fdd00fd31c5685)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Maxime Pelletier [Wed, 19 Oct 2011 19:28:16 +0000]
Bug 7069: Put strings in "" instead of '' to fix the javascript not working when the translated string has a ' in it.
http://bugs.koha-community.org/show_bug.cgi?id=7069
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Patch changes '' to "" to make it work for strings which contain '.
Patch does NOT add new strings to the po files.
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit
7ff9d9d03cc0efd07a8667b093927af4a9c3fb29)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Owen Leonard [Mon, 3 Oct 2011 12:59:18 +0000]
Fix for Bug 6955, Toolbar on reading history broken
Table sorter script causes error if there is no <tbody> to sort.
JS errors cause the YUI toolbar js to abort, causing the problem
observed. When there are no results the whole table should be
omitted and a message displayed in its place.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
To test:
- check toolbar on top of patron reading history with no entries
- check toolbar on top of patron reading history after a few checkouts
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit
54226b60f3e31ba52d6be88eeebcaf534ada296f)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Maxime Pelletier [Wed, 21 Sep 2011 18:15:39 +0000]
Use unitprice in neworder so that the value is saved in the database and so it will be the same field used as to receive shipments
http://bugs.koha-community.org/show_bug.cgi?id=6414
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed off with a note: this doesn't fix everything mentioned in the bug.
It also might clash with bug 4831 and should be tested with that patch.
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit
0faf91c591cf8bd02f5e70cc14caeb5257f4d1c5)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Chris Cormack [Fri, 4 Nov 2011 06:46:45 +0000]
Sorry pushed this by mistake when trying to fix Pauls permissions
Revert "Fix for Bug 5974 - Bogus auth check for "StaffMember" role"
This reverts commit
a867bfcff7201a7fa3b56bee4dd484a49ece35e3.
(cherry picked from commit
7a82e508f020aed3691222e08695a0f7cfd86b48)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Owen Leonard [Mon, 28 Mar 2011 18:08:00 +0000]
Fix for Bug 5974 - Bogus auth check for "StaffMember" role
Also removing some YAHOO.widget.Button declarations which
are redundant.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit
a867bfcff7201a7fa3b56bee4dd484a49ece35e3)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Chris Nighswonger [Wed, 9 Nov 2011 18:54:18 +0000]
Updating Version Number to 3.04.06.000
Chris Nighswonger [Wed, 9 Nov 2011 16:50:37 +0000]
Release Notes for 3.04.06.000
Frédéric Demians [Fri, 4 Nov 2011 06:38:45 +0000]
3.4.6 Translation Update
(cherry picked from commit
2bc8e34587ea9402eead735700833a84ce3c5854)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Chris Nighswonger [Wed, 26 Oct 2011 14:56:26 +0000]
Removing merge conflict markers
Chris Nighswonger [Wed, 26 Oct 2011 00:06:11 +0000]
Updating Version Number to 3.04.05.003
Also fixing up two typos in db version numbers
Robin Sheat [Fri, 23 Sep 2011 02:50:08 +0000]
Bug 6905: [3.4.x] change which page clicking users in circ history takes you to
Adds a syspref (borrowerhistorylink) that allows you to choose where
links to borrowers on the item circulation page go, choosing between the
circ page for them, or their details page. Default is the current
behaviour (go the the circ page.)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Ian Walls [Fri, 14 Oct 2011 20:37:54 +0000]
Bug 5995 Followup: checkpw was returning inconsistent values
In the case of LDAP, checkpw was returning the cardnumber of there user, but it was being treated as the
userid. This patch updates checkpw_ldap to return the cardnumber AND the userid, and updates checkpw to
uniformly return cardnumber and userid in all instances, so that whoever is authenticating can use the
desired value in the right way.
(cherry picked from commit
dcb4ac77fbfd813cc0eb39e060b49a7b8d491016)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Matthias Meusburger [Fri, 5 Feb 2010 11:00:15 +0000]
Bug 5995 : MT2892: Fix security issue in CAS intranet login
Users could log in intranet using their cardnumber, with superlibrarian
rights.
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Srdjan Jankovic [Tue, 6 Sep 2011 04:07:49 +0000]
bug_6770: removed doubled override increment when using AllowHoldPolicyOverride
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Srdjan Jankovic [Thu, 20 Oct 2011 01:21:26 +0000]
bug_5533: Improved marking items as lost
Call LostItem() whenever an item is lost
Disable lost status on catalogue item edit
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Ian Walls [Fri, 21 Oct 2011 18:41:03 +0000]
Bug 7078: Remove HTML::Template::Pro from Koha perl dependencies list
Removes HTML::Template::Pro as a requirement (since we're now on Template::Toolkit).
To test:
On a system without, HTML::Template::Pro installed, run perl koha_perl_deps.pl -m -u
Shouldn't return anything about HTML::Template::Pro
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit
d52095b48c9ef2a7249d367554da07277dd7bd09)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Ian Walls [Fri, 21 Oct 2011 18:16:51 +0000]
Bug 7063: add available perl packages for Debian in install_misc/debian.packages
Takes work done by Eduardo Trápani, alphabetizes, and adds two other packages:
libuniversal-require-perl
libgravatar-url-perl
From my testing, only CGI::Session::Driver::memcached remains missing; it is only
packaged for sid and wheezy at this time
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit
0953e8ca09d8f6010991523c2713e4546b12d907)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Ian Walls [Tue, 18 Oct 2011 14:18:14 +0000]
Bug 5995 Follow up: variable scope in koha/sco/sco-main.pl
The patronid value (cardnumber) set by checkpw in the case of SelfCheckoutByLogin
was improperly scoped with 'my' inside a conditional. The changes followup to 5995
made this more apparent, causing logins to fail.
Also added "parts copyright" statement to the script, since ByWater Solutions did make some
significant contributions to the operations of the page
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Ian Walls [Fri, 21 Oct 2011 14:49:58 +0000]
Bug 7060 Followup: AddReturn needs GetMemberDetails
In my haste, I overlooked circ/returns.pl's need for borrower flags. This patch
changes back the call in AddReturn from GetMember to GetMemberDetails
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit
c5bc35b6945a03e27dd369d368be33d97f76e509)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Frédérick Capovilla [Wed, 7 Sep 2011 18:15:35 +0000]
Bug 6854: Correct a double password encryption problem in import_borrowers.pl
When the CSV file has no password column and no default value was set for
the password :
If we try to modify an existing user, the password from the BD is sent
to ModMember, which then encrypts the already-encrypted password a
second time.
http://bugs.koha-community.org/show_bug.cgi?id=6854
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Confirmed bug on current master.
1) Import new patron with password provided
> OPAC login works
2) Overwrite patron record, password provided
> OPAC login works
3) Overwrite patron record, password not provided
Before patch: OPAC login broken, password in database changed
After patch: OPC login works with same password as before
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit
906ef4b28c376254743f948808e8ae47bb6f0a01)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Marcel de Rooy [Mon, 17 Oct 2011 09:32:50 +0000]
7042 Improving cleanup_database.pl: handling quotes in a_session and interpreting sessdays parameter
Improving the cleanup_database.pl script in two aspects:
1) In some cases CGI::Session seems to place quotes around the atime and ctime
data in the a_session field. Two regexps now take this into account.
2) If the --sessdays parameter is used, the --sessions parameter is now
implicitly enabled too.
With thanks to Ian Bays and Tom Hanstra.
Signed-off-by: Ian Bays <ian.bays@ptfs-europe.com>
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit
a7ee2993f02fb45f704c92ffdc49f840e05f5bd0)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Marcel de Rooy [Thu, 20 Oct 2011 07:57:12 +0000]
6094 Follow up for cleanup_database
Adds purging completed entries from need_merge_authorities table.
If you set dontmerge to ON, you need to periodically remove records.
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit
c56d12c721684bfd3bac0e9bd9cf17f8f29651a9)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Ian Walls [Tue, 18 Oct 2011 23:55:22 +0000]
Bug 7060: GetMemberDetails unnecessary in C4::Circulation
Replaces all instances of GetMemberDetails with the more efficient GetMember. Since
no hash values other than the borrowers table's fields are used in this module, the
transition is safe.
To test:
1. Checkout a material; the page should load without error
2. Renew a material: the page should load without error
3. Return a material: the page should load without error
The above test plan invokes all the subroutines affected by this patch; any call to an undefined
value in a hashref should give a warning
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit
769acee41ae258ea4efb0114eb7995736496a9cf)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Ian Walls [Tue, 18 Oct 2011 21:56:18 +0000]
Bug 7057: CheckReserves uses GetMemberDetails unnecessarily
Replaces call to GetMemberDetails with a call to GetMember. Much more efficient,
and since only branchcode is used, no required data is lost.
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit
a1e3975067bf484f8d5f621e042e41baeb69d7b7)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Katrin Fischer [Mon, 17 Oct 2011 20:04:53 +0000]
Bug 7049: [SIGNED-OFF] Item form on order receive has lots of blank space
The item form on the order receive page (AcqCreateItem = on receive) contains a
lot of blank space which makes it hard to read and fill out.
To test:
- set AcqCreateItem = on receive
- create basket, order something, receive shipment
- check item form is nicely formatted and doesn't include lots of blank space
Note: It will be easier to test if you have an ACQ framework created to hide some
unnecessary subfields, because the hidden fields create the blank space.
Signed-off-by: Magnus Enger <magnus@enger.priv.no>
Created an ACQ framework and hid some of the fields (hidden = 5). Before the
patch there were gaps between the fields as shown in the screenshot from
Katrin. After the patch fields line up nicely, with no extra space between
them.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit
224140a2b60aa7bbf4aeb352e1c31f80974a05db)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Katrin Fischer [Thu, 13 Oct 2011 21:47:16 +0000]
Bug 7027: [SIGNED-OFF] Corrections to German web installer txt files
Rephrasing, correcting typos, removing blank lines
Signed-off-by: Magnus Enger <magnus@enger.priv.no>
Does not break the web-installer and I'm assuming
Katrin is doing the right thing when it comes to
the German text, so signing off!
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit
a46cbc03ee60b8894e5f37f830d2deea4629aa05)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Chris Nighswonger [Tue, 25 Oct 2011 23:38:33 +0000]
Updating Version Number to 3.04.05.002
Marcel de Rooy [Mon, 25 Jul 2011 09:33:23 +0000]
6094 Fixing ModAuthority problems
Only contains db revision to insert new table need_merge_authorities.
You can apply the revision by running
cgi-bin/koha/installer/install.pl?step=3&op=updatestructure. (Will not change
your version while testing.)
Oct 19, 2011: Rebased after functionality patch signoff.
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Marcel de Rooy [Thu, 7 Apr 2011 08:14:08 +0000]
6094 Fixing ModAuthority problems
Pref MergeAuthoritiesOnUpdate does not exist; should be dontmerge
(AuthoritiesMarc.pm).
Instead of folder modified_authorities, now introducing a table for this
purpose: need_merge_authorities. This eliminates several permissions and
security issues. This change applies to AuthoritiesMarc.pm and
merge_authority.pl.
POD lines added for ModAuthority. Deprecated parameter $merge removed.
Test this patch by applying the db revision first from the second patch.
August 4, 2011: Rebased.
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Thanks Marcel. It works as advertised. Both modes are functionnal
(back):
- Immediate with dontmerge=0: After modifying an authority record, its
linked biblios are immediately modified. This isn't the case in 3.4.5.
- Delayed with dontmerge=1: After modifying an authority record, its
linked biblios are not modified. But an entry is added to
need_merge_authority new table and 'merge_authorities.pl -b' script
updates biblios.
Comment: need_merge_authority, like zebraqueue, should be cleared
from time to time.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit
05d35b0ae0af257b51fbd14a9ec010c957157a8f)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Ian Walls [Mon, 3 Oct 2011 15:22:30 +0000]
Bug 6553: parentheses in authors break tracings
If an author's name includes parentheses or other escape-characters, the tracing links
produced in the OPAC and staff client fail in XSLT mode. This patch wraps the author names
in double-quotes, providing the necessary escapement.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Test plan:
- Create a new framework, delete Thesaurus from 700 and other fields
- Create a new record in this framework
- Add 700$a - use parentheses
- Check the search links in OPAC and staff detail pages
> before patch link was broken, after it works
Note: Links are only broken when no authorities are being used.
When using authorities the link uses the auth number instead of the text
for linking, so the parentheses don't matter for search.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit
0ae2c3c4ceab85993ee23360d2c0d5409f465df6)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Ian Walls [Wed, 19 Oct 2011 15:46:21 +0000]
Bug 6253 followup: explicitly check ref value for ARRAY before casting
in C4::SQLHelper::_Process_Operands, $operand has been modified to be cast as an array ref
if the incoming $operand is not a ref. However, the incoming $operand could be some other
kind of ref (hashref for example), which would case the dereferencing in line 419 to fail and exit.
Adding an explicit test for whether the ref is ARRAY seems to clear up this issue.
To test, run t/db_dependent/Members.t. Before, it fails after test 3. After, it completes all tests.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit
d80cf35e9ba39112bfdefc3ce6ba8ddae121347c)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Chris Cormack [Wed, 19 Oct 2011 12:52:52 +0000]
Bug 6972 : Followup fixing bad indentation
(cherry picked from commit
d50de1f040be4b6498cc054689f524fd7d13321f)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Maxime Pelletier [Tue, 4 Oct 2011 18:32:08 +0000]
Bug 6972: Hardcoded template paths to en in showmarc
Couldn't help but reformat the indentation a bit.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Card view works correctly in cataloguing search.
Plain view/labelled show correctly in OPAC.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Fixing merge conflict.
(cherry picked from commit
030fe0570f6ae2d0561756ee2168c1d3528af985)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Magnus Enger [Fri, 7 Oct 2011 11:38:15 +0000]
Bug 6982 - Don't show MARC tag documentation links for NORMARC
Links to UNIMARC documentation were being shown when marcflavour =
NORMARC. This patch hides the doc link functionality for NORMARC
by hiding:
1. The checkbox for turning doc links on/off
2. The hyperlinked questionmarks
This patch does not hide e.g. the JavaScript functions related to
the doc link functionality, in order to make it easy to add
doc links for NORMARC in the future (hopefully).
The doc link functionality was passing a variable called MARC21
(based on the contents of the marcflavour syspref) to the
template and testing the value of this to decide if MARC21 or
UNIMARC doc links were to be shown. I have replaced this variable
with he standard/full marcflavour syspref, in order to make it
possible to test for more then two MARC dialects.
To test:
- Set the marcflavour syspref to MARC21, NORMARC and UNIMARC, one
after the other.
- Check that correct doc links are shown for MARC21 and UNIMARC
on the cataloguing screen, and that no checkbox and no doc links
are displayed for NORMARC.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works as described - thx for the great test plan!
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit
c7a2ef33177f176b8c5a5c12da9586de77569af1)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Paul Poulain [Fri, 29 Apr 2011 17:31:40 +0000]
Bug 6285 strange order in CSV upload
uploading the circ overdues result in a csv with columns in a strange order
and not the order of the screen
This patch reorder the column by putting the usefull ones first
Signed-off-by: Magnus Enger <magnus@enger.priv.no>
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit
f6043fbbe49eba279ee0635c43dd5a46a20eeb52)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Marcel de Rooy [Mon, 10 Oct 2011 11:04:34 +0000]
Bug 5616: UTF-8 problem in Card View / Follow up
Decode data only if needed.
Add instruction to use UTF8 in html header.
Force utf8 on output handle.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Umlauts and other diacritics in card view of z39.50 search are now
correctly displayed.
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
removed 2 commented lines
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit
980d8fbed45b3d43341347e612b777b54fd12d10)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Marcel de Rooy [Wed, 12 Oct 2011 12:43:53 +0000]
Bug 6996: Encoding problem in opac-showmarc
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
No more encoding problems spotted.
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit
a7d0255f19bf2de5a9bfc50eb76e108ed32e85c0)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Robin Sheat [Wed, 28 Sep 2011 06:09:01 +0000]
Bug 6929 - ensure that koha-stop-zebra will try to stop everything
Currently, if it attempts to stop a zebra process that doesn't exist,
the script will abort, which leaves things running. This patch prevents
it from aborting.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit
aca414977ac3f16cec353c23c59a298ee828d24c)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Srdjan Jankovic [Thu, 22 Sep 2011 14:43:12 +0000]
bug_6253: Unified member Search()
Removed SearchMembers() and replaced with more generic Search()
Amended Search() to try cardnumber first
Replaced SearchMembers() calls with Search()
Replaced SELECT with Search() where appropriate
C4::SQLHelper:
- added support for '' key for search filter.
- when passing an array to filter, join with OR (rather than AND)
- added support for key => [val1, val2] in filter
- did not document - there was no input documentation to start with,
and SQLHelper should be replaced with something better anyway
Signed-off-by: Liz Rea <lrea@nekls.org>
(again - testing merge issue)
The functionality of the patch seems to be maintained with Biblibre's changes.
I tested the following:
Extended attribute searching: works
3 part name searching: works
2 part name searching: works
1 part name searching: works
From:
mainpage.pl
members-home.pl
Patron search limited by branch: Works
Patron search limited by patron category: works
Ordering by cardnumber instead of surname: works
The "Check Out" field in the masthead.
Circ Autocomplete is not reliably functional at this time, but the problem appears to predate this patch.
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit
18b8991cf1832a0ee79a526e6438b51fdb4f3208)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Robin Sheat [Thu, 23 Jun 2011 09:09:30 +0000]
Bug 6526 - make the reserves code use the borrowernumber
Previously it used the cardnumber, which caused numerous issues if your
users don't have card numbers.
Signed-off-by: Liz Rea <wizzyrea@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit
218a35776e0e212567c15db4a486969debd67859)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Jared Camins-Esakov [Tue, 11 Oct 2011 19:21:04 +0000]
Bug 7007: 490 series statements should appear when not traced
Although the MARC21 standard requires libraries to set the first indicator to
'0' when a 490 field is untraced, many libraries leave it blank. Previously,
this resulted in a blank line with the label "Series:" but no actual series
information. This patch fixes that by showing untraced series headings for
490s whenever the first indicator is not set to '1'
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Checked that series shows correctly when first indicator is 0, 1 or not set.
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit
fb3272febd08e2e570931f1a0eba4c3dbacc89b2)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Frédéric Demians [Mon, 17 Oct 2011 06:03:29 +0000]
Bug 7026 Web installer does not switch language
Language installer should switch to template files of language selected in
first step. It used to do that, but the feature seems to be broken now. Web
installer remains English after selecting a different language.
To reproduce:
- make sure your database is empty
- run 'perl translate install <some language>
- access web installer
- select language other then en on the first page
=> templates should change to translated templates
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Test plan provided works, correct language and sample files are selected.
In a second test I deleted the staff templates for de-DE and repeated
the steps. de-DE is not offered in the language selection of the web installer
now, but does appear in the opaclanguages list after running the web installer.
(Bug 5660)
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit
1bf7550a82e7fc8b1c608fde3ff236af65b83dfc)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Paul Poulain [Fri, 16 Sep 2011 22:32:54 +0000]
Bug 7051 de-nesting C4::Reserve, 1st step
C4::Search is not used, so removing it from C4::Reserves
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit
7631bae2b2e5f6f2f71ddc4fe841816cd4688047)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Paul Poulain [Fri, 16 Sep 2011 22:31:10 +0000]
Bug 7037 de-nesting C4/Print.pm
removing use C4::Circulation, that is useless
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit
86e9c29f54e16a276889b10c1245ad1588147e35)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Paul Poulain [Fri, 16 Sep 2011 22:30:44 +0000]
Bug 7036 de-nesting C4::Circulation
Just removing use C4::Koha, as other packages are widely used.
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit
56b9412562599d1decabb27e7d4f562ec63c005a)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Paul Poulain [Fri, 16 Sep 2011 17:29:47 +0000]
Bug 7035 de-nesting C4::ClassSource & ClassSortRoutine
just removing use C4::Koha, that are useless
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit
94b067b53c566c320478eb074e4250ed9c86b51d)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Paul Poulain [Fri, 16 Sep 2011 16:09:57 +0000]
Bug 7034: de-nesting C4/Branch.pm
use C4::Koha was loaded only to call C4::Koha::get_infos_of in get_branchinfos_of
the sub get_branchinfos_of was used nowhere
(checked with "grep -R get_branchinfos_of *")
only one reference was made to get_branchinfos_of, in reserve/request.pl, but the sub was not used in fact (maybe removed previously & silently)
This patch removes sub get_branchinfos_of and use C4::Koha in C4::Branch, as well as the reference in request.pl and the t test
The patch doesn't remove use C4::Branch in reserve/request.pl, as it's still used for other subroutines.
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit
69732f5c62337a97269d8b0b09343805a970c6fa)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Ian Walls [Thu, 13 Oct 2011 14:11:46 +0000]
Bug 6949: cannot remove owner from fund
The Javascript to remove an owner from a budget cleared the name from the screen, but did not remove
the actual value in the form, so when saving, the original owner was retained.
This patch adds the command to set the value to ''.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
I could reproduce the bug on current master. Patch fixes the problem, fund
owners can now be added and removed without any problems.
Thx for providing a test plan!
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit
9c84f38b3496f32037a97b441aab21e8c2647250)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Chris Cormack [Tue, 18 Oct 2011 13:57:18 +0000]
Updating perl version required to match reality
(cherry picked from commit
5faaa7f13a17d29197b1bced3bd86731d61ee0d7)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Owen Leonard [Mon, 17 Oct 2011 15:51:16 +0000]
Fix for Bug 7043 - masthead_search id used twice in template
Changing ID of library selector, and moving inline styles to
the CSS as requested by kf in the bug comments.
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit
72f826963c20dfdc6c5934693089e3d3e83ec1ec)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Owen Leonard [Thu, 6 Oct 2011 19:13:30 +0000]
Fix for Bug 6983 - Item type filter on overdues report does not respect item-level_itypes
This patch adds a check for the item-level_itypes preference
when building the SQL for the overdues report.
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit
15e846d74aa30d3bfa5222d009171313594590d7)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Nicole C. Engard [Sat, 15 Oct 2011 02:39:56 +0000]
Bug 7044 OPAC Branch Selector Fix
There was a typo in the OPAC branch selector added by
the OpacAddMastheadLibraryPulldown preference where the
current branch wasn't selected. This patch fixes that typo.
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit
5938eb306acc2668b00178d88f319ad18c93e775)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Owen Leonard [Thu, 13 Oct 2011 14:02:38 +0000]
Fix for Bug 7024 - Can't delete other library's messages with AllowAllMessageDeletion on
The display of messages "to the patron" on the checkout screen
lacked the same logic controlling messages "to other librarians,"
affecting conditions under which the [Delete] link would be shown.
This match makes the two categories consistent with each other:
A delete link will be shown if the logged in branch matches the
branch where the message was set OR if AllowAllMessageDeletion
is turned on.
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit
41928b088075a5da9bffb19edf906e94aa84466f)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Owen Leonard [Thu, 13 Oct 2011 15:59:48 +0000]
Fix for Bug 7019 - Circulation History Sort Order Wrong
The return column sort was not using the right sort algorithm
because it was confused by the combination of date data and
text data ("Checked out"). I've added an explicit instruction
to sort by date. The downside to this change is that checked
out items are sorted with the oldest checkouts rather than
the newest:
Checked Out
Checked Out
10/14/1988
07/14/2005
Not perfect, but an improvement over completely incorrect
sorting. This patch also adds the necessary check for system
dateformat preference to properly sort metric dates.
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit
bfaf07b2780ed033677683ef40ce04e55d7c2b3d)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Liz Rea [Thu, 29 Sep 2011 17:31:09 +0000]
Bug 6942 - Add link to manual to help/authorities/authorities-home.tt
To test:
Verify link to manual shows on authorities home page in-app help.
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
(cherry picked from commit
5affbfc9fd5b6e5974aa9e64d074235046359950)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>