- Exclude 'marc' & 'item' prefix from UNIMARC util XSL to slim down
result
- Add missing NSB/NSE characters striping
- 200 fields on result/detail page: show all subfields in order, link to
detail page only on $a
- 4xx display, more fields and more subfields, respects subfields order
which matter
- Improve RAMEAU authorities linkings to subdivisions (pure XSLT)
- Add missing fields: 205, 500
- Add missing MARC21 syspref:
- DisplayOPACiconsXSLT, not implemtable in UNIMARC
- OPACURLOpenInNewWindow
- URLLinkText
- ShowISBD
Sidenote: this should have been done by people having introduced those
syspref into MARC21 XSL.
Suite
http://bugs.koha-community.org/show_bug.cgi?id=6314
Signed-off-by: Alex Arnaud <alex.arnaud@biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit fd84f8c2bc)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Fixes the patron name sorting when placing holds.
Testing - See Bug 5674.
Create two patrons. One named SMITH, THOMAS and the other Smith, John.
Search for an item to place on request. Do a patron search for Smith.
Signed-off-by: Liz Rea <wizzyrea@gmail.com>
Confirm both the original bug and the fix, sorting is correct now.
Patch does not change status of tests - prove t t/db_dependent xt no different from master.
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit e1d948ecd6)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Added button to retry attaching item, added default bib view handling, cosmetic changes to the error display (buttons now in error div).
Incorporates changes that should satisfy QA.
To test:
Find a bib with multiple items and grab one of the barcodes.
Go to a second bib and click Edit -> Attach item
Paste your barcode in there and click "Submit"
Click the "Try again with a different barcode" button. It should take you back to the barcode entry screen.
Also try with a non-existent barcode and verify that the button appears and works as intended.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 5bba1353d0)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Signed-off-by: Liz Rea <wizzyrea@gmail.com>
The scripts run with the caveat that you must specify the path to SIPconfig.xml. The followup previously attached should take care of that issue.
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 43b3fb9701)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
This requires Chris C's patch to move the scripts to the new location outside of C4.
To test:
run sip_run.sh with no arguments - it should fail with a message to add the path and try again.
Run sip_run.sh with a path to a valid SIPconfig.xml - it should start and run.
(cherry picked from commit 866bb561dc)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
The "hide window" button in the cart called a quit() function
which deletes any checked items. My understanding of the "hide
window" button is that it should *only* hide the window, not
perform any other operations. I'm removing the calls to the
quit() function in both the OPAC and staff client and adding
a CSS class, "close," which is already tied via jQuery to
the window.close() function.
To test in both OPAC and staff client: Add items to the cart.
Try clicking the "hide window" button with items selected and
without. In both cases the window should close without affecting
the contents of the cart.
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 5528b06fda)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
On payment page, the Edit button doesn't load anymore the current
borrower edit page.
To reproduce the bug:
- Define a borrower category 'foo' with Enrollment fee
- Create a new 'foo' borrower
- Click on Check out tab
- A message is displayed: Fees & Charges: Patron has Outstanding fees &
charges of xx.00. Checkouts are BLOCKED because fine balance is OVER
THE LIMIT. Make Payment
- Click on Payment link
- Click on Edit button
- You reach a page for creating a new borrower
=> you should reach the current borrower edition page
- Same issue on paycollect.tt template
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 9d80ca2775)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Signed-off-by: Aleksa Vujicic <aleksa@catalyst.net.nz>
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Amended to replace some copy-and-paste comments only with consent of MJR.
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit d4b132136c)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
This makes the second and higher public list appear again in the AddTo combo of the search results screen.
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 724e0d520d)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
This patch fixes several errors in reserves_stats.pl and reserves_stats.tt.
Testing -
To test this patch, data must be in either the reserves table or old_reserves or both. The following SQL will give you the raw data that is used by the report.
SELECT priority, found, reservedate, notificationdate, reminderdate,
waitingdate, cancellationdate, borrowers.categorycode, items.itype,
reserves.branchcode, holdingbranch, items.homebranch, items.ccode,
items.location, items.itemcallnumber, borrowers.sort1, borrowers.sort2
FROM reserves
LEFT JOIN borrowers on (borrowers.borrowernumber = reserves.borrowernumber)
LEFT JOIN items on (items.itemnumber = reserves.itemnumber)
UNION SELECT priority, found, reservedate, notificationdate, reminderdate,
waitingdate, cancellationdate, borrowers.categorycode, items.itype,
old_reserves.branchcode, holdingbranch, items.homebranch, items.ccode,
items.location, items.itemcallnumber, borrowers.sort1, borrowers.sort2
FROM old_reserves
LEFT JOIN borrowers on (borrowers.borrowernumber = old_reserves.borrowernumber)
LEFT JOIN items on (items.itemnumber = old_reserves.itemnumber)
To test the notificationdate and reminderdate, I added data to the old_reserves table, since I have never run notices on my test machine.
Ex:
UPDATE old_reserves
SET notificationdate = "2012-01-29",
reminderdate = "2012-01-29"
WHERE timestamp = "2012-01-29 20:09:34";
Signed-off-by: Liz Rea <wizzyrea@gmail.com>
Confirm original bug -- Reports work as expected now!
prove t xt t/db_dependent no different from master.
(cherry picked from commit 67825637be)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
removing an unconditional warn. It was already here before the patch,
but my pre-applypatch script complained, so I fix as a follow-up
(cherry picked from commit 1034b21dea)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Successfully added, edited and deleted authorised values.
No problems found.
(cherry picked from commit f0a6600934)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Fixes the reference to the due date in opac-reserve from date_due to dateDue as defined int opac-reserve.pl.
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit cf15a0e427)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
In the data entry form, there is a (hidden) functionality for note subfields.
MARC21 500-599 and UNIMARC 300-399 subfields are displayed in TEXTAREA rather
than INPUT tags. This is good since usually notes can be pretty long. But if
one of those fields is marked in the framework as 'hidden', then it isn't
displayed at first when you create a record and when you expand the field by
clicking on its label the field is displayed in a one-line INPUT tag.
To reproduce this bug:
- Modify your framework:
MARC21: 500$a, hidden=1
UNIMARC: 300$a, hidden=1
- Create a new biblio record with this framework
- Open the tab containing 500 or 300 field
- 500 or 300 tab is collapsed
- Click on 500 or 300 label to expand the field
- 500$a or 300$a is displayed in a one-line INPUT tag, not in a TEXTAREA
as it should
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Test plan works. Also checked cloning and deleting
subfields still works.
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Works as advertised. Simplifies code too. Well documented test plan.
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 86406bcf91)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
YAML don't like when you try to open a YAML file with just a \n. This patch add a 2nd \n to silence logs.
(cherry picked from commit 1f66e9fa69)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 6b092f0e27)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
- Copying over error handling for timeout(10007) and refused(10000)
- Copying over error handling for submission with no targets chosen
- Correcting "cancel" link in the template which was not modified
when it was copied from cataloging's popup window template.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 952bfc6f07)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit fbfdfa2cc7)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
This commit makes koha-create more flexible by adding a number of command-line
and configuration options.
The biggest change is to add support for pre-determined MySQL credentials using
a file in /etc/koha/passwd (for security reasons, if you use this feature, make
sure the file is not world-readable). The configuration file has the following
format:
instance:user:password:database
The database is optional, but the other two are both required if you want to
specify MySQL credentials. If no credentials are specified for a given instance,
the standard koha_instance username and an auto-generated password are used.
The following additional command line options are now available:
* --use-db - use a pre-existing database, see also --database
* --database - specify the name of the mysql database (still defaults to
koha_instance)
* --passwdfile - specify a custom (Koha) passwd file for MySQL credentials
The following additional variables are now available (for use in
koha-sites.conf or a custom config file):
* OPACPORT (previously added but not documented) - port on which the OPAC
should be served
* OPACPREFIX - prefix for the OPAC's virtual host
* OPACSUFFIX - suffix for the OPAC's virtual host
This commit also adds the --keep-mysql option to koha-remove, which, if
specified, will prevent koha-remove from deleting the database or MySQL user
when removing an instance.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 297d22459f)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
This does two things:
* Allows OPACPORT to be specified to change the default OPAC port,
* removes the port number from the ServerName directive, as it's already
handled by the VirtualHost declaration.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 4437737858)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Followup :
Changes the DeleteBranchTransferLimits signature :
one now needs to delete only the limits for ONE branch
(cherry picked from commit 54e6b44da9)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
The patch which moved the table pager markup into an
include undid the fix which was previously pushed for
this problem. Re-implementing the fix in the pager
include is a simpler fix which doesn't depend on
the Datatables plugin.
The markup change in table-pager.inc fixes the problem
in branch transfer limits and does not affect functionality
on other pages.
The changes in this patch to branch_transfer_limits.tt and
staff-global.css are for cosmetic reasons only.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Saving changes works now correctly. I tried:
- uncheck all for a branch
- check all for a branch
- making changes for different itemtypes on different tabs
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
- backported to 3.6.x
Signed-off-by: Robin Sheat <robin@catalyst.net.nz>
(cherry picked from commit 227cafe8c2)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Made opac-addbybiblionumber.pl page require authentication.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 8eb727d671)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
If I search for a valid ISBN number and hit the Z39.50 search, the title field
is populated with the ISBN number I searched for. This number should populate
the ISBN field and not the title field.
http://bugs.koha-community.org/show_bug.cgi?id=6539
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
To test:
- Search new ISBN using ISBN search from advanced search page
- 0 results - click on Z39.50 search
- Z30.50 form will have your ISBN in ISBN search option
I am signing off on this, because it's an improvement over the current
behaviour.
I see some problems though that should perhaps be addressed in a separate
bug or as a follow-up:
If you use th catalog search field and search for an ISBN or
a keyword the right fields of the Z39.50 search form will be populated, but
the search index will be put in front:
ISBN: kw,wrdl: 9783492251495
or
Title: kw,wrdl: koha testing
If you search for ISBN as keyword on the advanced search page, it will
still populate the Title search.
Signed-off-by: Liz Rea <wizzyrea@gmail.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 22aed769a6)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
- Adding subtitle to the display of titles to be merged
- Adding a link to preview the MARC record of titles to be merged
- Fixing up markup of form to improve appearance
- Correcting breadcrumbs
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 049ac6e2a7)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
ModBiblio() - set framework to "" if "Default"
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
All 4 tests passed:
Test 1: Merge two records with the same framework
Desired result: shouldn't get any prompting to pick a framework, and the
same framework should be used
Test 2: 2 records, different frameworks, into the kept record's framework
Desired result: merge with kept records framework used
Test 3: 2 records, different frameworks, into the discarded record's
framework
Desired result: merge with used records framework used
Test 4: 2 records, different frameworks, into a third framework
Desired result: merge with third framework used
(cherry picked from commit 91d870f67a)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Changed searchResults() interface
Added trailing \n when parsing OpacHiddenItems to make YAML happy
XSLTParse4Display() and buildKohaItemsNamespace() take hidden
items as input param
Removed numbering from the search results, looks wrong with
hidden items
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 706712dd1e)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Signed-off-by: Chris Hall <chrish@catalyst.net.nz>
(cherry picked from commit a0c1414f6d)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Signed-off-by: Chris Hall <chrish@catalyst.net.nz>
(cherry picked from commit 597fabf4f4)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Signed-off-by: Chris Hall <chrish@catalyst.net.nz>
(cherry picked from commit 37c9ffcf7d)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Signed-off-by: Chris Hall <chrish@catalyst.net.nz>
(cherry picked from commit 66fecdd798)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Signed-off-by: Chris Hall <chrish@catalyst.net.nz>
(cherry picked from commit 1e2e7b9dd8)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Signed-off-by: Chris Hall <chrish@catalyst.net.nz>
(cherry picked from commit 0618b9db72)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Signed-off-by: Chris Hall <chrish@catalyst.net.nz>
(cherry picked from commit e81cbd7fe0)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Signed-off-by: Chris Hall <chrish@catalyst.net.nz>
(cherry picked from commit 200b5a8231)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Signed-off-by: Chris Hall <chrish@catalyst.net.nz>
(cherry picked from commit 1a20feb4ca)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Signed-off-by: Chris Hall <chrish@catalyst.net.nz>
(cherry picked from commit 5579abe41f)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Signed-off-by: Chris Hall <chrish@catalyst.net.nz>
(cherry picked from commit 3b9722c7dd)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Signed-off-by: Chris Hall <chrish@catalyst.net.nz>
(cherry picked from commit f918c57e89)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit e824f847b9)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
This tiny patch removes a redunant display.
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 3ea42998cb)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Adding dateformat filter to JavaScript tablesorter
configurations.
Follow-up adds a custom date parser for dates without year ("01/10")
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Tested yearly repeatables under Calendar for all three date formats.
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 9a168e7c94)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Frédéric Demians
Garry Collum
Liz Rea
Chris Cormack
Liz Rea
Owen Leonard
MJ Ray
Marcel de Rooy
Paul Poulain
Adrien Saurat
Srdjan Jankovic
Aleksa Vujicic
Jared Camins-Esakov
Robin Sheat
Henri-Damien LAURENT
Peter Lorimer
Sam Sanders
Connor Dewar
Bart Jorgensen
Kate Henderson
Jono Mingard
Jorgia Kelsey
Stéphane Delaune
D Ruth Bavousett