Commit graph

14183 commits

Author SHA1 Message Date
Ian Walls
8d7608cd64 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>
2011-10-22 06:32:03 +13:00
Ian Walls
dcb4ac77fb 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.
2011-10-15 12:58:10 +13:00
Matthias Meusburger
417c9084b4 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>
2011-05-14 04:31:59 +12:00
Nicole C. Engard
10ea4544ea Bug 6330 - Change hold language from 'until' to 'since'
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>
2011-05-12 13:27:04 +12:00
300dbe5d72 Fix for Bug 6284, Reports Filters Need Prettying
1. Moved the form to the left under the menu
2. Added a calendar next to date (and a date format tip)
3. Styled the form like other filter forms for consistency's sake
4. Formatted on-screen message to match standard style

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-05-11 09:10:06 +12:00
c92f9dee40 Bug 6320 Generate Next button doesn't generate next issue
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-05-11 08:55:37 +12:00
9773c746a9 Fix for Bug 6295 - misaligned columns in opac suggestions list
Template variable scope error.

NOTE: this bug only applies when OPACViewOthersSuggestions is turned on; otherwise there is nothing to fix.

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>
2011-05-11 08:51:32 +12:00
Magnus Enger
88b7cc2552 Bug 6308 - Show number of comments - new patch
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>
2011-05-11 08:48:01 +12:00
Chris Cormack
9573f444fc Merge remote-tracking branch 'kc/new/bug_5449' into kcmaster 2011-05-09 08:25:36 +12:00
Ian Walls
e064aba47e Bug 6294: {BIBLIONUMBER} parsing for SearchForTitleIn
Adds support for parsing of the biblionumber into the SearchForTitleIn system preference, allowing
external sites with APIs (like Facebook or Twitter) to do link-backs to the details page for the
title.

Sample code for implementing Facebook "like" links and Twitter "tweet this" are included on the bug report

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-05-07 19:35:50 +12:00
Chris Cormack
ae70c2f790 Bug 6031 : Fix for syntax (bashism crept into a pure sh script)
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-05-02 12:44:48 +12:00
Colin Campbell
c83cdd0767 Bug 6282: HomeOrHoldingBranchReturn missing from pref file
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-05-02 09:12:44 +12:00
Chris Cormack
5d4d5989d0 Fixing a template error 2011-04-29 11:39:18 +12:00
Chris Cormack
c2a5e0fd45 Rewriting the valid templates test to test template toolkit 2011-04-29 11:33:19 +12:00
Chris Cormack
9435c6730d Merge remote branch 'kc/new/enh/bug_6033' into kcmaster 2011-04-29 09:34:58 +12:00
Chris Cormack
23e7662720 Bug 6033 : Follow up fix for bug that crept in with conversion to template toolkit 2011-04-29 09:33:35 +12:00
Katrin Fischer
799126e5b6 Bug 6265: Authority search in OPAC not exact
The search for linked records from the full heading page was not exact.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-29 09:02:38 +12:00
Matthias Meusburger
a9cb5fa1ee Bug 6001 : batchRebuildBiblioTables.pl doesn't crash anymore when GetMarcBiblio fails. Unprocessed biblionumbers are displayed at the end of the execution instead.
Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-29 08:56:57 +12:00
Chris Cormack
e8b7b297c0 Merge remote branch 'kc/new/enh/bug_6143' into kcmaster 2011-04-29 08:55:19 +12:00
Nicole C. Engard
818c26557e Follow Up for Bug 6143: New numSearchRSSResults preferences
This patch updates the language in the pref file to match the format
used in other areas of the preferences by making the preference value
part of a sentence.

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>
2011-04-29 08:53:41 +12:00
Robin Sheat
dfc1038931 Bug 5509 - use an XML parser to get values from config
Using sed and regex was causing issues when LDAP connection details were
added.

See
http://stackoverflow.com/questions/1732348/regex-match-open-tags-except-xhtml-self-contained-tags/1732454#1732454
for more information.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-28 13:35:25 +12:00
Chris Cormack
00655f46b6 Bug 6033 : Template changes 2011-04-28 11:26:42 +12:00
Srdjan Jankovic
8360343fbc Bug 6033 : wr77488 : report selection filter
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-28 11:14:19 +12:00
Jared Camins-Esakov
139f7343f4 Bug 3543: split NLM call numbers in label creator
Split NLM call numbers using the same rules as those used for Library of
Congress call numbers.

Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-28 09:04:48 +12:00
Ian Walls
6059599fac Bug 6259: AllowHoldPolicyOverride causes every hold to need override
Adds a check to make sure that the item is actually unavailable before requiring the override

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-27 16:21:43 +12:00
Katrin Fischer
883bc625b2 Bug 5445: Nicer breadcrumbs when ordering from different sources
Replaces previous patch. Also fixes ordering from existing records.

While it was possible to go back to vendor and basket page when ordering
from a new suggestion the other odering options missed those 'crumbs'.

This patch makes the breadcrumbs for all orderings options consistent and
makes it possible to navigate back to the vendor or basket from all
pages.

- from existing record
- from staged record
- from external source
- from empty record

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-27 16:10:46 +12:00
Chris Cormack
aabd70a4bf Bug 6143 : Fixing missing sysprefs 2011-04-26 22:28:09 +12:00
Chris Cormack
eb9c971e3e Bumping the database number 2011-04-26 20:51:37 +12:00
Stéphane Delaune
97362dd99e Bug #6143 - New feature: capability to limit the RSS results
Signed-off-by: Stéphane Delaune <stephane.delaune@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-26 20:44:01 +12:00
Ian Walls
b08be41d41 Bug 3202: creating new 'child' categorytype patrons doesn't set branch properly
If a guarantor search is not being performed, the creation of any Child category_type patron will
not default to the currently logged in branch, but rather the first branch alphabetically.

Adding a test for the existence of any guarantor branch data before assigning it clears up this problem

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-26 20:37:07 +12:00
Jared Camins-Esakov
694f0fbeaf Bug 6153: Display imprint subfields in order
Prior to this patch, the imprint (field 260) was displayed out-of-order on the
MARC21 XSLT record detail page. For example, the following data:
=260  \\$aNew York :$bHarper,$c2003$g(2005 printing)
Displayed as:
Harper, New York : 2003 (2005 printing)
Instead of:
New York : Harper, 2003 (2005 printing)

Even more problematically, the following data:
=260  \\$a[S.l. :$bs.n.],$c1860.
Displayed as:
s.n.], [S.l. : 1860
Instead of:
[S.l. : s.n.], 1860.

This patch changes the MARC21 OPAC Details display to display the imprint
subfields in the proper order (as the Results display already does).

Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-26 20:33:36 +12:00
Colin Campbell
1c13785fed Bug 6194 Suppress punctuation when no location
Template was showing empty parentheses when no location
data was present. Punctuation should be dependent on
the variable being set

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-26 20:29:37 +12:00
Katrin Fischer
8aa1bac805 Bug 6257: Fix broken MARC documentation links
Another TT issue.

Signed-off-by: Magnus Enger <magnus@enger.priv.no>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-26 20:06:01 +12:00
Katrin Fischer
3a7edeeab4 Bug 6263: shelf browser broken in 3.4
Another problem with TT.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-26 20:01:28 +12:00
Magnus Enger
00f5953924 Move nb-NO-i-staff-prog-v-3002000.po -> nb-NO-i-staff-t-prog-v-3002000.po
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-26 19:58:46 +12:00
Katrin Fischer
0f453776ff Bug 6228: Show active currency in system preferences
Some system preferences like maxoutstanding should show the
active currency behind the value. The code for this was not
translated to Template Toolkit.

Will change strings, so probably for 3.4.1

Signed-off-by: Magnus Enger <magnus@enger.priv.no>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-26 19:55:39 +12:00
091cd69f44 Fix for Bug 2941 Transfers cannot be canceled once initiated
This patch includes the changes by Catalyst found at
http://git.catalyst.net.nz/gw?p=koha.git;a=shortlog;h=refs/heads/bug_2941
and adds a "cancel transfer" link to the transferstoreceive
script, including a redirect check to send the user back to
that report.

Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-23 17:22:05 +12:00
d04ca42111 history.txt updates for April 2011 releases
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-23 08:23:49 +12:00
Nicole C. Engard
975e876c5e Add missing library to release notes
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-23 08:23:47 +12:00
9c8e493d64 Update ALL Koha translation files 2011-04-22 11:31:36 +02:00
1d4673523d textual improvements to release notes
* typo and usage improvements
* alphabetize sponsoring libraries

Thanks to Brendan Gallagher for suggestions.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-22 14:44:24 +12:00
Chris Cormack
b9f0c16ba5 Bumping version number for release 2011-04-22 13:27:37 +12:00
Chris Cormack
8003a1343d Fixing typo in the release notes 2011-04-22 11:31:44 +12:00
Katrin Fischer
300a87a94c Bug 6251: Acq: receiving orders
- numbered pagination links are broken, previous and next work
- link to order line missing supplier id

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-22 10:52:18 +12:00
Katrin Fischer
0e7ecd4fd1 Bug 6250: Link to order in uncertain prices list broken
Missing URL parameter.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-22 10:18:26 +12:00
Katrin Fischer
4770c531af Bug 6249: Can't order accepted suggestions
Order link was missing URL parameters.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-22 10:07:40 +12:00
Katrin Fischer
e7ea2ca4a3 Bug 6248: Acq: order from staged marc file broken
Corrects missing parameters in urls for
- single order from staged marc file
- bulk order from staged marc file

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-22 09:17:15 +12:00
Katrin Fischer
9e87ba24b6 Bug 6247: Acq: order already existing record broken
Another URL missing parameters.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-22 08:47:40 +12:00
Katrin Fischer
caf4c4b37e Bug 6246: Modify/Delete links were missing from basket lines
Another TT problem.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-22 08:32:40 +12:00
Katrin Fischer
74f6bd4f88 Bug 6245: Can't order from z39.50 search in acq
Fixing missing url parameters in z39.50 search in acquisitions.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-22 08:18:01 +12:00