]> git.koha-community.org Git - koha.git/log
koha.git
12 years agoBug 7278: Follow up fixing display of item informaton on detail page
Katrin Fischer [Tue, 20 Dec 2011 07:40:03 +0000 (08:40 +0100)]
Bug 7278: Follow up fixing display of item informaton on detail page

Fixes a display problem in the item table on staff detail page.

To test:
Add a record with 3 items:
- 1 with copynumber
- 1 with materials specified
- 1 with opac notes

Before patch the table will be broken a bit and the headings
don't match the contents (wrong sequence).

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 52098370f51994b4f89f2e2a0dda03a9700aa26f)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7278 : Additional Materials
Chris Cormack [Thu, 1 Dec 2011 01:19:44 +0000 (14:19 +1300)]
Bug 7278 : Additional Materials

Part 2: This patch shows the message at checkout and checkin

How to test:
* Add a note in cataloguing
* Check it displays at checkout and checkin
* Check items without a note don't display anything

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
(cherry picked from commit a9e080a6fbcdd268a03f82138453bb22224f351b)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7728 : Materials Specified field made larger and displayed
Chris Cormack [Wed, 30 Nov 2011 21:46:52 +0000 (10:46 +1300)]
Bug 7728 : Materials Specified field made larger and displayed

This first page makes the database change, and displays the field on
the detail.pl and moredetail.pl pages in the staff client

How to Test:

* Add a note to the materials specified page in cataloguing (952
subfield 3 for MARC21, but it shouldn't matter as long as you have a
field mapped to items.materials
* Check it displays at catalogue/detail.pl
* Check it displays at catalogue/moredetail.pl

Patch to follow to have the note display at checkin/checkout

http://bugs.koha-community.org/show_bug.cgi?id=7278

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Fixed conflicts in updatedatabase.pl and kohastructure.sql
(cherry picked from commit 67c6c95396fcaeca49da68499b0ceb5b6350b4b8)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 6374: default value for Size in result pages
Adrien Saurat [Tue, 3 Jan 2012 14:28:50 +0000 (15:28 +0100)]
Bug 6374: default value for Size in result pages

When no size info is available, an empty string is
sent to the TT (if nothing is sent, the TT engine
will display another information, irrelevant for Koha).

Signed-off-by: Gaetan Boisson <gaetan.boisson@biblibre.com>
Works beautifully!

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 74506e52deb383589b541848bbb2026aa4991f81)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 3651 Follow-up, Require patron login to send shelves and baskets
Owen Leonard [Thu, 29 Dec 2011 16:47:44 +0000 (11:47 -0500)]
Bug 3651 Follow-up, Require patron login to send shelves and baskets

The fix for Bug 4289, "Add a syspref 'OpacPublic', to hide OPAC
search-bar and force authentication on all OPAC pages" incorrectly
made some page permissions dependent on the value of the OpacPublic
setting. Some pages should require authentication no matter what.

This patch returns opac-sendbasket.pl to the state it was in before
Bug 4289, Bug 4274 notwithstanding. I have added the authentication
requirement to opac-sendshelf.pl to match.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
1) sending cart requires login
2) sending shelf requires login
3) updating personal details requires login

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 9e70695907d97953e097087425ccaaefd3809897)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7220 - Add IDs to check-in message dialogs to facilitate CSS customization
Chris Hall [Thu, 22 Dec 2011 02:43:08 +0000 (15:43 +1300)]
Bug 7220 - Add IDs to check-in message dialogs to facilitate CSS customization

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit c2837b39a4dede60e6d65e01fdaa02c835067e70)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoFix for Bug 7194 - OPAC detail and recent comments pages corrections for XHTML validity
Owen Leonard [Tue, 8 Nov 2011 16:43:38 +0000 (11:43 -0500)]
Fix for Bug 7194 - OPAC detail and recent comments pages corrections for XHTML validity

- Adding html filter to subtitle output to correct unescaped ampersands
- Adding missing alt attributes to libravatar output
- Removing unecessary markup  from comments page

Bonus: Adding html_break filter to output of comments to preserve line breaks
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit fe9312a1240e58a04b0cd0c322d46c34a4b51891)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoFix to make date obviously editable - bug 7193
Duncan Tyler [Mon, 19 Dec 2011 00:43:21 +0000 (13:43 +1300)]
Fix to make date obviously editable - bug 7193

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Patch changes all date fields on subscription entry to be
obvious input fields. This makes it more obvious that you
can enter dates manually and is more consistent with how
we handle dates in other places.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 0d9309e52020d42d4a75e944b7031c886d1be7ca)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7341 - [SIGNED-OFF] Patch to fix error produced when clicking cancel in system...
Duncan Tyler [Thu, 22 Dec 2011 01:32:22 +0000 (14:32 +1300)]
Bug 7341 - [SIGNED-OFF] Patch to fix error produced when clicking cancel in system preferences search results - bug 7341

Signed-off-by: Magnus Enger <magnus@enger.priv.no>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 4f16da0d310c84b6a2fb98adc160a56bb18a0ac0)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7338: Follow up: show link only when there is more than 1 subscription
Katrin Fischer [Mon, 12 Dec 2011 07:39:39 +0000 (08:39 +0100)]
Bug 7338: Follow up: show link only when there is more than 1 subscription

To be tested together with
http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=6690

1) Create a subscription for a title
- check the link 'Show any subscription...' doesn't show now
- check the serials collection page works correctly and shows all
necessary information

2) Create a second subscription for the same title
- check a new link 'Show any subscription...' shows up now
- use links in the issue table to change between viewing the single subscription
and the overview page
- check it works correctly and all information shows up

Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
It works. With this patch, on Serials Collection page, the link, 'See any
subscription attached to this biblio' appears only when there are more than one
subscription attached to the biblio record.
(cherry picked from commit 42265ef21758acd6e44eca3a48ab57529628717c)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7338 Links on Serial Collection page
Frédéric Demians [Fri, 9 Dec 2011 07:32:01 +0000 (08:32 +0100)]
Bug 7338 Links on Serial Collection page

Don't display link to the serial, when the collection page displays just
one subscription. Display it when several subscriptions. Alway display a
link for displaying biblio record other subscriptions.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Patch works nicely, but always shows link to 'any subscriptions'.
I did a follow-up so the link would only show if there was more
than 1 subscription for the record.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 33587674fa85fabfb6183b37bb8c2733ec2b6d6a)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoRevert "Bug 5729 - Add CoinS to intranet"
Chris Nighswonger [Wed, 18 Jan 2012 14:08:46 +0000 (09:08 -0500)]
Revert "Bug 5729 - Add CoinS to intranet"

This reverts commit b05389689590fe1c135b3a6762b899df493a836d.

Removing this enh from 3.6.x

12 years agoRelease Notes for 3.06.03.000 17 Jan 2012 19:39:50 Z
Chris Nighswonger [Tue, 17 Jan 2012 19:39:50 +0000 (14:39 -0500)]
Release Notes for 3.06.03.000 17 Jan 2012 19:39:50 Z

12 years agoRelease Notes for 3.06.03.000 17 Jan 2012 12:46:33 Z
Chris Nighswonger [Tue, 17 Jan 2012 12:46:33 +0000 (07:46 -0500)]
Release Notes for 3.06.03.000 17 Jan 2012 12:46:33 Z

12 years agoBug 6147 : Correcting invalid RSS
Christophe Croullebois [Mon, 16 May 2011 22:16:07 +0000 (10:16 +1200)]
Bug 6147 : Correcting invalid RSS

Signed-off-by: Liz Rea <wizzyrea@gmail.com>
Feed validates using http://feed1.w3.org/ with the following recommendations:

This feed is valid, but interoperability with the widest range of feed readers could be improved by implementing the following recommendations.
line 12, column 149: Relative href value on self link: /cgi-bin/koha/opac-search.pl?idx=kw&q=some&sort_by=acqdate_dsc&format=rss2 [help]
... p;sort_by=acqdate_dsc&amp;format=rss2"/>
                                             ^
line 12, column 149: Self reference doesn't match document location [help]
... p;sort_by=acqdate_dsc&amp;format=rss2"/>
                                             ^
line 20, column 158: Unregistered link relationship: search (10 occurrences) [help]
... _by=&amp;format=opensearchdescription"/>
                                             ^
line 40, column 9: description should not contain relative URL references: /cgi-bin/koha/opac-reserve.pl?biblionumber=10 (10 occurrences) [help]
]]></description>
         ^
line 22, column 5: Misplaced Item (9 occurrences) [help]
     <item>

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit a0a57b9526c244771aac57ad3ac3dee5dec1a16e)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 6627 follow-up
Paul Poulain [Fri, 6 Jan 2012 13:22:59 +0000 (14:22 +0100)]
Bug 6627 follow-up

in installer, some lines where forgotten, and can also be commented
(cherry picked from commit a60101bea074fdd81434c8f047ed7d3a0de8ebce)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 6627 [Signed Off] - Update to improve security in specified log files - bug 6627
Duncan Tyler [Wed, 21 Dec 2011 01:59:21 +0000 (14:59 +1300)]
Bug 6627 [Signed Off] - Update to improve security in specified log files - bug 6627

Signed-off-by: Liz Rea <wizzyrea@gmail.com>
Verified sessionlog file is not written to /tmp when patch is applied. Also verified original bug - logging in did in fact log to /tmp.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 00290e86197bbd0129a4fc943a957f823235210d)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 5369: Follow up fixing quotes
Katrin Fischer [Thu, 5 Jan 2012 07:09:03 +0000 (08:09 +0100)]
Bug 5369: Follow up fixing quotes

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Confirm that this works. My only remark would be that &quot; could have been used.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 6d2ca576e25242015711c33ac114e87db9757639)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 5369: Make series tracings use phrase indexes
Jared Camins-Esakov [Fri, 2 Dec 2011 00:35:43 +0000 (19:35 -0500)]
Bug 5369: Make series tracings use phrase indexes

By definition, series tracings should search for other records in the same
series, i.e., those with the exact same series title. This patch forces the
tracings to use phrase indexes for series tracings.

Note that this patch DOES NOT respect TraceCompleteSubfields. While that may be
desirable, it is outside the scope of the current patch. An additional follow-up
patch could be written to add support for TraceCompleteSubfields, if community
concensus is that series tracings should obey TraceCompleteSubfields.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Thx for the follow up and sign off Jared :)
(cherry picked from commit 9b3e1552c4cfb41f1d85b346515f15450760d7bf)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 5369: se queries with paranthesis fail
Katrin Fischer [Mon, 28 Nov 2011 06:25:37 +0000 (07:25 +0100)]
Bug 5369: se queries with paranthesis fail

This patch does several things to make the search work better:

1) Adding "" around search terms for queries on index se.
2) Make links for 8xx obey the UseControlNumber system preference
3) Fix the indexing for 8xx fields, as they were not included in the se index before

Note: Make sure you copy the new record.abs into your koha-dev directory and reindex
before testing.

To test:
1) Add records using the following fields:
440$a
490$a ind. 1 = empty or 0
490$a ind. 1 = 1
800$a, 810$a, 811$a or 830$a

Example value taken form bug description, should only work after applying the patch:
DHEW publication no. (HSM) 73-1804

Please also test with other examples.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit 4cd81a8d0f2eeccc71d2b1409f35c8ee57314b8a)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 929: Follow up - showing fund code instead of internal number
Katrin Fischer [Thu, 29 Dec 2011 09:51:15 +0000 (10:51 +0100)]
Bug 929: Follow up - showing fund code instead of internal number

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 71d2d81e346846f455e2f673d8983ffd9d00310e)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 929 : Followup fixing date formatting
Chris Cormack [Thu, 29 Dec 2011 08:46:51 +0000 (21:46 +1300)]
Bug 929 : Followup fixing date formatting

This patch introduces a Filter (KohaDates) for use in templates
[% USE KohaDates %]
[% somevariable | $KohaDates %]

This will format the date in the format specified by the systempreference

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
(cherry picked from commit 01875b565d7c04b3b00ba1986f824cae7d1fb2a9)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 929 : Last follow up, implementing the last of Katrins suggestions
Chris Cormack [Wed, 28 Dec 2011 20:08:40 +0000 (09:08 +1300)]
Bug 929 : Last follow up, implementing the last of Katrins suggestions

Date formatting
Links
Nomenclature changes

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
(cherry picked from commit ddb6883b578830c75a4d73ca84d630998f89ee6c)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 929 : Follow up, making some improvements to the spent page More to come
Chris Cormack [Wed, 28 Dec 2011 02:43:47 +0000 (15:43 +1300)]
Bug 929 : Follow up, making some improvements to the spent page More to come

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
(cherry picked from commit c64322e48de53ed64d65f8c86160848a492ea792)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 929 : Reinstating the breakdown of budgets
Chris Cormack [Tue, 27 Dec 2011 20:47:56 +0000 (09:47 +1300)]
Bug 929 : Reinstating the breakdown of budgets

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
(cherry picked from commit 9638053a25a89040c21a38196dc6c4bb09e6010a)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 3184: Show creator and budget on order receive page
Katrin Fischer [Fri, 28 Oct 2011 13:54:53 +0000 (15:54 +0200)]
Bug 3184: Show creator and budget on order receive page

Reimplementing 3.0.x patch from
Nahuel ANGELINETTI <nahuel.angelinetti@biblibre.com>

To test:
1) Create basket
2) Order something, note your fund
3) Receive title
> Verify your name and selected fund display correctly

Additional tests:
1) Set borrowernumber in aqbasket.authorisedby to a nonexistant borrowernumber (like something really big)
> Created by should show "No name"
2) Set borrowernumber to NULL / empty
> Created by should show "No name"

Signed-off-by: Duncan Tyler <duncan@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 37e1f05e8f8617883c02ff1b57f36a4fff3a39ae)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7394 : Fixing scoping issue with XSLT processing. Also bailing out early for...
Chris Cormack [Tue, 3 Jan 2012 06:57:41 +0000 (19:57 +1300)]
Bug 7394 : Fixing scoping issue with XSLT processing. Also bailing out early for 404 inestead of doing unnessecary processing

Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
I can confirm the bug and the solution.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Second sign-off from me, patch fixes display of detail page
for last record on a result page.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit fa1a90fd4f6fcb709bc2bd6ad57e75154ecb63f9)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7328 Expanded options in advanced search
Frédéric Demians [Wed, 7 Dec 2011 07:46:21 +0000 (08:46 +0100)]
Bug 7328 Expanded options in advanced search

In OPAC and intra advanced search, more search options are displayed
depending on expandedSearchOption syspres and user choice. This doesn't
work anymore in HEAD.

This patch restore this functionnality.

To test:

  - enable/disable expandedSearchOption.
  - Load advanced search page. Limited seach options version is always
    displayed
  - Apply this patch and see how it works...

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
The problem only appeared in the staff client for me.
Tested both OPAC and staff with patch applied.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 1730e180cdbe11a7878ddfab54cec7291d12f430)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7333 - Fixing up db_dependent/Search.t to use sample data Thanks to Chris N....
Liz Rea [Thu, 15 Dec 2011 16:21:36 +0000 (10:21 -0600)]
Bug 7333 - Fixing up db_dependent/Search.t to use sample data Thanks to Chris N. for helping figure out that it was because there were no French stopwords in the DB that the test was failing.

Patch changes the French string (with French stopwords) to an English string with English stopwords, as only English stopwords are installed in the default data.

This patch will allow Search.t to run on the database attached to this bug.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 3c12d5f2f63ac06ac8f71c1a5598bc01c82e5802)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug #6142 - Delete sub CanBookBeReserved and delete function's reference on @EXPORT
Alex Arnaud [Fri, 8 Apr 2011 12:02:19 +0000 (14:02 +0200)]
Bug #6142 - Delete sub CanBookBeReserved and delete function's reference on @EXPORT

Original-Author:    Alex Arnaud <alex.arnaud@biblibre.com>, Stéphane Delaune <stephane.delaune@biblibre.com>
Original-Signed-off-by: MJ Ray <mjr@phonecoop.coop>
Correct use statement bug found by Ian Walls

Backporting to 3.6.x

Author: MJ Ray <mjr@phonecoop.coop>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 5729 - Add CoinS to intranet
Paul Poulain [Tue, 27 Sep 2011 16:35:33 +0000 (18:35 +0200)]
Bug 5729 - Add CoinS to intranet

This patch adds CoinS support to biblio displays in staff interface.
librarians can now use zotero on the staff interface

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Modified by: Ian Walls <ian.walls@bywatersolutions.com>

GetCOinSBiblio has changed interface, requiring a $record object instead
of looking one up by biblionumber.  Calls in ISBDdetail.pl, MARCdetail.pl
and detail.pl updated.
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
(cherry picked from commit c96a52a4a0eeda52b219ba29a86685337265ab56)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBUG 5607 : Adds parsing of issues fields in overdue letters
Sophie Meynieux [Mon, 19 Dec 2011 11:31:21 +0000 (12:31 +0100)]
BUG 5607 : Adds parsing of issues fields in overdue letters

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Patch makes it possible to add fields from the issues table to overdue notices.

Template used for testing:
<item>"<<biblio.title>>" by <<biblio.author>>, <<items.itemcallnumber>>, Barcode: <<items.barcode>> , Checkout date: <<issues.issuedate>>, Due date: <<issues.date_due>> Fine: <fine>GBP</fine> Checkout date from items: <<items.onloan>></item>

Possible improvements:
- Dates are not formatted according to dateformat system preference

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 940652a6c7ac45b255d4d9b89bf90ccfca568ccd)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 5565 UNIMARC to DC XSL tidy up
Frédéric Demians [Fri, 31 Dec 2010 06:35:29 +0000 (07:35 +0100)]
Bug 5565 UNIMARC to DC XSL tidy up

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 34e99cf478010e886ea75ccad6d8026ca547fe03)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 5565 Default OAI UNIMARC to Dublin Core XSL adds superfluous blanks
Frédéric Demians [Fri, 31 Dec 2010 06:32:41 +0000 (07:32 +0100)]
Bug 5565 Default OAI UNIMARC to Dublin Core XSL adds superfluous blanks

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit a6eb50747575acec333a76ff08fa04cc9a85656d)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 1623 - Provide view of approved comments
Owen Leonard [Mon, 28 Nov 2011 13:35:21 +0000 (08:35 -0500)]
Bug 1623 - Provide view of approved comments

This patch creates two tabs on the comments administration page:
one for approved comments and one for unapproved comments. Each
display is paginated according to the numSearchResults preference.
The list of approved comments has, instead of a link to approve,
a link to unapprove.

The JavaScript table sorter has been removed since it doesn't make
sense to sort individual pages of a multi-page result set.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit bc2a1d18e246b024e93a88df140281eebeb53a48)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7370 : Missing use call
Chris Cormack [Wed, 21 Dec 2011 19:27:09 +0000 (08:27 +1300)]
Bug 7370 : Missing use call

Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 525c7bc4af45b548e548c2fe6f69c4d22ec1d472)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7311: Only run analytics code if analytics are enabled
Jared Camins-Esakov [Fri, 2 Dec 2011 14:24:42 +0000 (15:24 +0100)]
Bug 7311: Only run analytics code if analytics are enabled

With the addition of the code from Bug 5528 (easy analytic record workflows),
UNIMARC 461$0 and MARC21/NORMARC 773$0 have special meanings. When you import
a record that uses those subfields for different data, you will get an error
in /cataloguing/additem.pl. A check should be added to be sure that
EasyAnalyticalRecords is enabled before trying to handle the 461$0/773$0 as
bib numbers for analytics.

Thanks to Frère Sébastien Marie for spotting this issue.

Signed-off-by: Frère Sébastien Marie <semarie-koha@latrappe.fr>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 97caccbd0fea3245e3f1c701de7ba2a4e46726d8)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoUse MARCAuthorityControlField008 in AddAuthority for empty 008s
Frédérick Capovilla [Thu, 20 Oct 2011 16:05:02 +0000 (12:05 -0400)]
Use MARCAuthorityControlField008 in AddAuthority for empty 008s

The old default value for field 008 didn't have the correct length,
which could potentially cause data corruptions.

Uses the MARCAuthorityControlField008 preference added by BUG4839.

http://bugs.koha-community.org/show_bug.cgi?id=7072
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 6408547cc0d396c8b9d29e1f7617637d9c12a9a6)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoTest to check for XXX in kohaversion.pl or updatedatabase.pl
Chris Cormack [Mon, 8 Aug 2011 21:45:00 +0000 (23:45 +0200)]
Test to check for XXX in kohaversion.pl or updatedatabase.pl

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Works as advertised.

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Amended the original patch of Chris to add two exceptions for a line in SetVersion and TransferToNum.

http://bugs.koha-community.org/show_bug.cgi?id=6700
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit bb92ac1ee01a9b781ca2a7adab4beec28e6edeaa)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years ago6700: Better handling of version numbers in updatedatabase
Marcel de Rooy [Thu, 30 Jun 2011 07:34:23 +0000 (09:34 +0200)]
6700: Better handling of version numbers in updatedatabase

Contains a few lines of code for updatedatabase routines SetVersion and TransformToNum in order to facilitate testing new db revisions which are still marked XXX.
Currently, the XXX as added in a proposed patch generates an error in the version compare. Additionally, running SetVersion while testing the upgrade is annoying and not needed. In testing stage you would like to keep your version number as is. The version number should of course be incremented when the patch is pushed. A simple test accomplishes that.

Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit c8982e1ab41ef54ba66afd3ed313e81cde307004)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 6193 - Use memcached cache koha-conf.xml configuration variables
Tomas Cohen Arazi [Thu, 14 Apr 2011 17:40:21 +0000 (14:40 -0300)]
Bug 6193 - Use memcached cache koha-conf.xml configuration variables

Basically I add some code to Context.pm so it stores koha-conf.xml config vars
in memcached server. It is arguable whether this is an improvement or not,
tests are needed to conclude something about this.

Error handling was an issue with Cache::Memcached, I tried to do it the
simplest I could.

Note: As it was pointless to read the xml file to get the memcached
server info for accessing them for retreiving the info in the koha-conf.xml
file... I passed those values through apache's SetEnv. These variables
are set acordingly through the install scripts and commented out if koha
was setup not to use it.

Bug 6193 - Properly comment the code

Required by slef.

Regards
To+

Signed-off-by: Federico Rinaudo <frinaudo@infocpt.com.ar>
Signed-off-by: MJ Ray <mjr@phonecoop.coop>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 22dca58cbad64841fb12a6e48afa50500c1a5c60)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 6880- Reason for suggestions do not save
Owen Leonard [Wed, 26 Oct 2011 18:17:52 +0000 (14:17 -0400)]
Bug 6880- Reason for suggestions do not save

The fix for Bug 1883 seems to have lacked the necessary
update to the database to add the "patronreason" column
to the suggestions table. This patch does so.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Patch adds database update and change to kohastructure.
After this patch is applied, the patron's reason for
making a suggestion (form in opac) is saved to the database
correctly. The reason is also shown in the detail view
of the suggestion.

Backporting to 3.6.x

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoFix for Bug 3431 - Catalog by itemtype report pulling from holdingbranch
Owen Leonard [Tue, 23 Aug 2011 19:33:34 +0000 (15:33 -0400)]
Fix for Bug 3431 - Catalog by itemtype report pulling from holdingbranch

Plus several other fixes for this report no one uses:

- Clarifying titles and breadcrumbs
- Correcting terminology: branch -> library
- Sorting library select field by library name
- Displaying library name instead of code on output
- Sorting results by itemtype description
- Adding tablesorter to results

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 396efb90c73099e1f87a5a4593b4c5c1020c69c3)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 2307 - Calendar widget cannot be translated
Owen Leonard [Tue, 6 Dec 2011 16:09:46 +0000 (11:09 -0500)]
Bug 2307 - Calendar widget cannot be translated

Implementing the same fix in the OPAC which we now
use in the staff client.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 873ac768b0d557315e3e6067032db78defa4377a)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7226 - can't add tags on list
Owen Leonard [Tue, 6 Dec 2011 14:53:05 +0000 (09:53 -0500)]
Bug 7226 - can't add tags on list

Incorrect check for TagsInputOnList was preventing the
right JavaScript from being triggered, and markup was
nested inside the wrong logic for the confirmation
message to be displayed consistently.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 0b9d4902def55a6ce7c9b0c006a6210b3f7abe97)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years ago6302 follow up
Marcel de Rooy [Wed, 14 Dec 2011 14:54:22 +0000 (15:54 +0100)]
6302 follow up

Updates to_address in message queue when sending an email (when needed).

Signed-off-by: Koustubha Kale <kmkale@anantcorp.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 2ab11c4892f87c054df02763804e34f070d931e1)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 6302: Separate AutoEmailPrimaryAdress and AutoEmailOpacUser
Katrin Fischer [Fri, 2 Dec 2011 06:53:18 +0000 (07:53 +0100)]
Bug 6302: Separate AutoEmailPrimaryAdress and AutoEmailOpacUser

AutoEmailPrimaryAddress is not only used for the patron account mails, but
also for overdues and other email notices to patrons.

This patch separates the system preferences in the system preference editor.

To test:
- Check Patrons tab shows both system preferences separated
- Check you can still change the settings

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Koustubha Kale <kmkale@anantcorp.com>
(cherry picked from commit a5a8d78f0d54acd7606477774d5e94cfcac66e9a)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 6292 : Followup 2. several letters where generated if a borrower had overdues...
Sophie Meynieux [Tue, 30 Aug 2011 14:54:42 +0000 (16:54 +0200)]
Bug 6292 : Followup 2. several letters where generated if a borrower had overdues with different due_date triggering the same level

This patch fixes the SQL request giving the list of borrowers

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 1be4678a57200ba895b73e3b3d38f331a9b8cbb4)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 6292 : Overdue notices not being generated when borrower had an overdue older...
Chris Cormack [Tue, 3 May 2011 00:13:28 +0000 (12:13 +1200)]
Bug 6292 : Overdue notices not being generated when borrower had an overdue older than the max value of the notice triggers

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
(cherry picked from commit 410975a7f777123d255854ecf3d31541b86ff848)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 6292 followup
Sophie Meynieux [Fri, 12 Aug 2011 14:04:13 +0000 (16:04 +0200)]
Bug 6292 followup

selection of items to be listed in an overdue notice included
both limits (upper and lower). So items with an overdue equal
to a limit appeared on both notices. This patch fix this,
including lower limit and excluding upper limit for the selection.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
(cherry picked from commit d86d62adba7f898db26dc58e909f2b91db3248b0)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agobug_2830: Remove reserve when checking out if the borrower is not the first one in...
Srdjan Jankovic [Thu, 13 Oct 2011 03:57:41 +0000 (16:57 +1300)]
bug_2830: Remove reserve when checking out if the borrower is not the first one in the reserve queue

To test:
Create 4 holds on a bib, for patrons A, B, C, and D,

Check in the item to mark hold as waiting for patron A
Check out the item to patron B -> reserve for patron B should be removed
Check in the item to mark hold as waiting for patron A
Check out the item to Patron A, hold should complete normally
Check in the item to mark hold as waiting for patron C
Check out the item to patron D -> reserve for patron D should be removed.
Check in the item to mark hold as waiting for patron C
Check out the item to patron C, hold should complete normally
Check in the item -> there should be no more reserves.

We also tested:
Created 4 holds on a bib with two items, for patrons A, B, C, and D

All worked as expected.

Signed-off-by: Liz Rea <wizzyrea@gmail.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 6e07fd7b004b5cb16ea0bec764993c1e9ffe153c)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7361 Fix default option in encoding dropdown
Duncan Tyler [Thu, 15 Dec 2011 00:51:21 +0000 (13:51 +1300)]
Bug 7361 Fix default option in encoding dropdown

http://bugs.koha-community.org/show_bug.cgi?id=7361
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
This patch changes the pull down for encodings in staged marc import.

Before patch:
- Character encoding preselected was 'Default'
- 'Default' broke diacritics in utf-8 encoded files and was reported
  to not work correctly
- Selecting 'UTF-8' from the drop down worked

After patch:
- Character encoding preselected is 'UTF-8 (Default)'
- There is no longer a 'Default' option and no separate 'UTF-8'

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 86d6e6d3de0a8d935802abe843f7ec407af1c759)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7349: corrects sort order for Patron search
Adrien Saurat [Tue, 13 Dec 2011 15:01:45 +0000 (16:01 +0100)]
Bug 7349: corrects sort order for Patron search

Sorting by cardnumber now works (removed a client-side
sort, the server-side sort is enough).

Signed-off-by: Koustubha Kale <kmkale@anantcorp.com>
1) Verified that before applying this patch, when searching patrons with cardnumber as order by preference, patrons are sorted ny name.
2) Verified that after applying this patch, when searching with cardnumber as order by preference, patrons are correctly sorted by cardnumber.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 1de55f6f088f174431896d33fbe6d94152921758)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 5327: Added unit test for C4/SIP/ILS/Transaction/RenewAll.pm
Duncan Tyler [Wed, 14 Dec 2011 03:42:30 +0000 (16:42 +1300)]
Bug 5327: Added unit test for C4/SIP/ILS/Transaction/RenewAll.pm

http://bugs.koha-community.org/show_bug.cgi?id=5327
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Test requires a database installed using the sample data.
All tests pass.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 3ae23cd6cf97ffbab6080f255e942f2ba73dcd07)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7282 - invalid language selection
Frère Sébastien Marie [Thu, 1 Dec 2011 18:02:11 +0000 (19:02 +0100)]
Bug 7282 - invalid language selection

- ensure that without cookie, language selection is based on browser
  preferences
- refactor function to obtain langugage for stem in search (opac + intranet)

Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
To reproduce the bug:

- Activate en and fr-FR for OPAC
- Clear your browser cookies
- Select your language preference in your browser: fr, fr-fr, en
- Load OPAC main page
- OPAC is displayed in English, rather than French as asked by browser
  preferences

  Apply the patch and test:

  - Clear your browser cookies
  - Load OPAC main page
  - Pages are displayed in French

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 0ad7e76cb7cebf16310a95377f88047f09b66d24)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7319 - Improving title and breadcrumbs on acquisitions Z39.50 search pages
Owen Leonard [Mon, 5 Dec 2011 14:32:07 +0000 (09:32 -0500)]
Bug 7319 - Improving title and breadcrumbs on acquisitions Z39.50 search pages

Changing title and breadcrumbs so that they correctly reflect
the curent stage of the process.

To test: Add to an order from an external source. When filling
out the Z39.50 search form the title and breadcrumbs should read
"Order from external sources." After searching they should read
"Order from external sources -> Search results"

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works as described.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 8a87f15605b23c44a8dac71cd4a3f209add98556)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7324: Show alternate email as mailto: / hide labels when field is empty
Katrin Fischer [Tue, 6 Dec 2011 17:45:33 +0000 (18:45 +0100)]
Bug 7324: Show alternate email as mailto: / hide labels when field is empty

UPDATE 2011-12-15
Fixed wrong div that broke the patron account display.
Thank you Paul for catching this!

Changes made to the patron detail tab:
- alternate email shows as mailto: link

- labels for following fields only show when field is filled
  - initials
  - date of birth
  - gender
  - country (alternate address)
  - email (alternate address)
  - state (alternative contact)
  - country (alternative contact)
  - phone (alternative contact)

To test:
1) Add new patron with minimal data and check the labels don't show
2) Change patron to have data in changed fields and check labels show
3) Check all email addresses are shown as mailto: links now

Signed-off-by: Liz Rea <wizzyrea@gmail.com>
Verified tests 1-3, looks good to me.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 52dca0f4337b83bff4ff2de457f21b8b7ab70134)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agowelcome to Marc Balmer, #167
Paul Poulain [Thu, 15 Dec 2011 17:37:39 +0000 (18:37 +0100)]
welcome to Marc Balmer, #167
(cherry picked from commit 42d6b17851626c547481438138ebc592177c4e75)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBail out early if an invalid language is used.
Marc Balmer [Sun, 11 Dec 2011 14:40:55 +0000 (15:40 +0100)]
Bail out early if an invalid language is used.

Signed-off-by: Marc Balmer <marc@msys.ch>
http://bugs.koha-community.org/show_bug.cgi?id=7346
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit d9f7922ad77406939a5f57a22e9a6474e4c328d3)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7334: Improve 'no address stored' and similar messages in patron account
Katrin Fischer [Thu, 8 Dec 2011 06:19:05 +0000 (07:19 +0100)]
Bug 7334: Improve 'no address stored' and similar messages in patron account

- 'no address stored' is now only displayed when first and second line
  of the address are empty
- added id's to all 3 possible messages so people can change or hide
  them

To test:

1) Check 'no address stored' shows only up when address fields are both
   empty
2) Check address is still correctly displayed

Note: make sure you check the 'checkouts' and other tabs, because there
are 2 different include files used here.

Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
I confirm the bug and the solution. Text messages identification for
customization with JavaScript is a plus.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit ac139f8f63c87123aa6ba50759eed44f0016d81b)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7333 - modifying Members.t to use a branchcode that exists in the sample data
Liz Rea [Wed, 7 Dec 2011 22:32:11 +0000 (16:32 -0600)]
Bug 7333 - modifying Members.t to use a branchcode that exists in the sample data

To test:
Create a fresh koha db with all of the sample data (if you have one that has the sample branches in it, that will work too)
run the test: prove t/db_dependent/Members.t

All subtests should complete.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
All tests complete successfully with my database created from
sample data and with the database provided on the bug.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit b955692c8494a81d46a72efaca9385f980cfd1b1)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7331 - Circulation.pl generates errors in the log
Duncan Tyler [Thu, 8 Dec 2011 01:11:43 +0000 (14:11 +1300)]
Bug 7331 - Circulation.pl generates errors in the log

Fixed error in C4::Dates causing unneeded warnings

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit c2bba3ffc89ffae78635bf271eaccce7c60c22df)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7330 - System preferences editor generates errors in the log with each search
Owen Leonard [Wed, 7 Dec 2011 15:50:06 +0000 (10:50 -0500)]
Bug 7330 - System preferences editor generates errors in the log with each search

Adding a check for an empty value in a couple of places
which seem to always get one.

As far as I can tell these places in the script are looping
over ALL the data in the pref files, and sometimes an empty
value comes through. I wonder if this is because of a minor
syntax error in the pref file?

My correction is a stab in the dark since I haven't determined
where the empty value is actually coming from. This change
quiets the errors in the log and doesn't seem to affect
preference search results.

Signed-off-by: Liz Rea <wizzyrea@gmail.com>
No more messages in the logs. Yay!

Ran unit tests on this (t, xt/author, xt, t/db_dependent)- nothing out of the ordinary in any.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 081790295661662f3d1f22673b1c44eee030fddb)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7326: longoverdue.pl hardcoded to 366 days maximum
Ian Walls [Wed, 7 Dec 2011 00:12:04 +0000 (19:12 -0500)]
Bug 7326: longoverdue.pl hardcoded to 366 days maximum

Adds --maxdays command line flag to longoverdue.pl to allow the user to specify
their own $endrange value.  Because sometimes 366 isn't enough!

Also adds help documentation for both --quiet and --maxdays params

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Simple change, works well

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 1f5f4981c098a7aa2a4323107dd98379a52a4c6e)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7325 - Editing a list generates errors in the log
Owen Leonard [Tue, 6 Dec 2011 21:03:31 +0000 (16:03 -0500)]
Bug 7325 - Editing a list generates errors in the log

Checking for variables before trying to use them in
building the pagination menu

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 17df078261b9054b45f87c42f34d9a9e82fba138)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7323 - Javascript error when editing list
Owen Leonard [Tue, 6 Dec 2011 16:43:10 +0000 (11:43 -0500)]
Bug 7323 - Javascript error when editing list

Correcting check for empty shelf name to prevent
javascript error.

Also correcting unescaped ampersand.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 2cfb3398cf567c72473a98224a2cb0387e1f7fea)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7321: Silence some warns in Koha.pm
Katrin Fischer [Mon, 5 Dec 2011 20:52:44 +0000 (21:52 +0100)]
Bug 7321: Silence some warns in Koha.pm

While testing bug 7013 I noticed a lot of warns in the koha error log.
This patch is silencing them.

To test:
Add or edit an authorised value and check your log files before and after
applying the patch.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit d831a03fdefc56b5462df08cbe626887291c01c8)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7313: Untranslatable strings in 'Search to hold' feature
Katrin Fischer [Sat, 3 Dec 2011 08:55:44 +0000 (09:55 +0100)]
Bug 7313: Untranslatable strings in 'Search to hold' feature

Changed the javascript to include markup for translation _(...) in result
list and detail page tool bars.

Also changed the text shown for each result to match the text in the toolbar
to make things more consistent.

To test:
- Apply patch
- Run "perl translate update <your language code>"
- Open .po file for staff and check for "Place hold on" and "Forget"
- Translate those
- Run "perl translate install <your language code>"
- Activate "Search for hold" feature in patron account
- Do a search and check tool bar on top of result list
- Check link text shown in result list
- Check detail page

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 8374ecbcd68fc0f6f9bc13ed7b45448920490bba)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoRevert "Bug 5327: Added unit test for C4/SIP/ILS/Transaction/RenewAll.pm"
Paul Poulain [Thu, 15 Dec 2011 15:14:35 +0000 (16:14 +0100)]
Revert "Bug 5327: Added unit test for C4/SIP/ILS/Transaction/RenewAll.pm"

This reverts commit 06c822c37ce91e5936542990d7e3299e14271bd3.
(cherry picked from commit 8df873c1a298d9c7e4283372201466d28fa1a784)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoRevert "Bug 5327: Patch removes unneeded self=shift from TTParser::unshift_token"
Paul Poulain [Thu, 15 Dec 2011 15:11:47 +0000 (16:11 +0100)]
Revert "Bug 5327: Patch removes unneeded self=shift from TTParser::unshift_token"

This reverts commit 18bb9c22100ba810944a1341a891bc5b2e765255.
(cherry picked from commit 746deb51279c01176442220a21f7174dc65ff77d)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 5327: Added unit test for C4/SIP/ILS/Transaction/RenewAll.pm
Duncan Tyler [Wed, 14 Dec 2011 03:42:30 +0000 (16:42 +1300)]
Bug 5327: Added unit test for C4/SIP/ILS/Transaction/RenewAll.pm

http://bugs.koha-community.org/show_bug.cgi?id=5327
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Test requires a database installed using the sample data.
All tests pass.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 06c822c37ce91e5936542990d7e3299e14271bd3)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoAdded missing reference case to Boolean.t and corrected count
Chris Hall [Wed, 7 Dec 2011 20:34:36 +0000 (09:34 +1300)]
Added missing reference case to Boolean.t and corrected count

http://bugs.koha-community.org/show_bug.cgi?id=5327
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Test passes.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 64a9c641003f865690956436e27d2a71d9044f1f)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agowelcome to Duncan Tyler, developer 166 !
Paul Poulain [Thu, 15 Dec 2011 12:45:21 +0000 (13:45 +0100)]
welcome to Duncan Tyler, developer 166 !
(cherry picked from commit e60e1cba00ae406942ecdfb6975dd30242420480)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoAdded missing reference case to Boolean.t and corrected count
Chris Hall [Wed, 7 Dec 2011 20:34:36 +0000 (09:34 +1300)]
Added missing reference case to Boolean.t and corrected count

http://bugs.koha-community.org/show_bug.cgi?id=5327
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Test passes.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit dfa4b73737ff32b10fd01fb53937b137d898c770)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 5327: Patch removes unneeded self=shift from TTParser::unshift_token
Chris Hall [Thu, 8 Dec 2011 22:04:19 +0000 (11:04 +1300)]
Bug 5327: Patch removes unneeded self=shift from TTParser::unshift_token

Removed  unneeded self=shift from unshift_token
(as peek and next do not take a self, makes interface more consistent)

http://bugs.koha-community.org/show_bug.cgi?id=5327
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 18bb9c22100ba810944a1341a891bc5b2e765255)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoAdded unit tests for Scrubber
Duncan Tyler [Thu, 8 Dec 2011 21:19:14 +0000 (10:19 +1300)]
Added unit tests for Scrubber

http://bugs.koha-community.org/show_bug.cgi?id=5327
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Test passes.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 47b514cf565f5eaccbefd256f24f82f38b5b4765)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoAdded unit test for AuthoritiesMarc/UNIMARC.pm
Duncan Tyler [Thu, 8 Dec 2011 19:52:34 +0000 (08:52 +1300)]
Added unit test for AuthoritiesMarc/UNIMARC.pm

http://bugs.koha-community.org/show_bug.cgi?id=5327
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Test passes.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit bb79d37b8754114ec670b5806150b61340b99e7c)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoAdded unit tests for Sip Checksum.pm
Duncan Tyler [Thu, 8 Dec 2011 01:38:28 +0000 (14:38 +1300)]
Added unit tests for Sip Checksum.pm

http://bugs.koha-community.org/show_bug.cgi?id=5327
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Test passes.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 7876d4fa8dcc67ec54448edb7c4cd9d454dcf52a)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoUpdating Version Number to 3.06.02.000 v3.06.02
Chris Nighswonger [Thu, 22 Dec 2011 22:55:19 +0000 (17:55 -0500)]
Updating Version Number to 3.06.02.000

12 years agoRelease Notes for 3.06.02.000 22 Dec 2011 22:53:23 Z
Chris Nighswonger [Thu, 22 Dec 2011 22:53:24 +0000 (17:53 -0500)]
Release Notes for 3.06.02.000 22 Dec 2011 22:53:23 Z

12 years ago3.6.2 Translation Update
Frédéric Demians [Thu, 22 Dec 2011 07:18:47 +0000 (08:18 +0100)]
3.6.2 Translation Update
(cherry picked from commit 54c7a82ac861a2f443d142b8e8dd3fa0fd17ce43)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoRelease Notes for 3.06.02.000 14 Dec 2011 17:57:42 Z
Chris Nighswonger [Wed, 14 Dec 2011 17:57:42 +0000 (12:57 -0500)]
Release Notes for 3.06.02.000 14 Dec 2011 17:57:42 Z

12 years agoFollowup on bug 7185 to correct Marcel de Rooy's name
Chris Nighswonger [Wed, 14 Dec 2011 17:57:13 +0000 (12:57 -0500)]
Followup on bug 7185 to correct Marcel de Rooy's name

12 years agoBug 7309 - Add NORMARCslim2intranetDetail.xsl for detail view in intranet
Magnus Enger [Fri, 2 Dec 2011 16:08:44 +0000 (16:08 +0000)]
Bug 7309 - Add NORMARCslim2intranetDetail.xsl for detail view in intranet

Adds two files, to enable XSLT for the detail view in the intranet:
koha-tmpl/intranet-tmpl/prog/en/xslt/NORMARCslim2intranetDetail.xsl
koha-tmpl/intranet-tmpl/prog/en/xslt/NORMARCslimUtils.xsl

To test:
- Set sysprefs: marcflavour = NORMARC and XSLTDetailsDisplay = "using XSLT stylesheet"
- Make sure OPACBaseURL is set correctly
- Check that detail display looks ok
- Check that automatic links for author, subjects etc work
- Check that the "Open in new window" link works as expected
- Empty the OPACBaseURL syspref and check that "Open in new window" does not display

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Great test plan, could reproduce problem and can confirm patch fixes it.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit e4c6f1fc20f6d2f658fd5cf56da77708fd9a9c26)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7287 : Fix overdue notification if a branch given as parameter does not have...
Sophie Meynieux [Fri, 2 Dec 2011 09:04:25 +0000 (10:04 +0100)]
Bug 7287 : Fix overdue notification if a branch given as parameter does not have rules

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit a1e3174668181c06baea11161466a1f7bf3a84c4)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7275 - Pagination lost when click in the option "Show more" of facets column
Juan Romay Sieira [Tue, 29 Nov 2011 09:17:26 +0000 (10:17 +0100)]
Bug 7275 - Pagination lost when click in the option "Show more" of facets column

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 9b9093d2256b18cc0b813894064e527fbc411998)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7270: Removing double itemtype on shelve contents page when no icon is shown
Marcel de Rooy [Wed, 30 Nov 2011 15:42:19 +0000 (16:42 +0100)]
Bug 7270: Removing double itemtype on shelve contents page when no icon is shown

Just adding a check on imageurl in the template.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit a8ddf6acaee4ce7661d8fd4e9027fca1e56de1ae)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7262 - No calendar present in holidays module when there are quotes in title...
Juan Romay Sieira [Thu, 24 Nov 2011 17:01:05 +0000 (18:01 +0100)]
Bug 7262 - No calendar present in holidays module when there are quotes in title or description

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Nice patch, making use of the Template::Toolkit filters

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit a8f3860149cd6b61cc87cb1d4da147359e5b2e43)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agobug 7239 fix to avoid error being thrown even though a record is created
Chris Hall [Tue, 6 Dec 2011 03:03:59 +0000 (16:03 +1300)]
bug 7239 fix to avoid error being thrown even though a record is created

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
When creating an item in acquisitions while ordering and not filling out
any fields, there is no longer shown a perl error message.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 48f25fec431322d8ce47d62793985a5b498ab22a)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoFix for Bug 7227, "Delete all items" action should redirect to the detail view
Owen Leonard [Tue, 15 Nov 2011 16:50:40 +0000 (11:50 -0500)]
Fix for Bug 7227, "Delete all items" action should redirect to the detail view

Using the delete all items function should now redirect back to the
biblio view specified in the BiblioDefaultView system preference.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 8121f5581ff0f39a31302edace0fc2cf66d65e71)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7135 - in addbiblio, make save button floating to have it on always on screen
Owen Leonard [Tue, 13 Dec 2011 19:37:32 +0000 (14:37 -0500)]
Bug 7135 - in addbiblio, make save button floating to have it on always on screen

Follow-up fix corrects z-index of toolbar so that "More" menu
is not hidden behind it.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit edd8e5767d29bbbf28eb88591c00a2e419f4b14f)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7202 - z39.50 search on bib edit not working
Owen Leonard [Fri, 2 Dec 2011 20:14:58 +0000 (15:14 -0500)]
Bug 7202 - z39.50 search on bib edit not working

The pop-up menu's "Import" link did not correctly pick
up the existing record's biblionumber, if present.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
To test:
1) Searched for a record in your catalog
2) Edit > Edit record
3) Start Z39.50 search
4) Pick a new record with different title for import
- using the import link at the end of the table line
- using the pop up menu's import link
5) Save and check if a duplicate was created

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 7fd5098b98007e3a25e6694a5b31ef0828ce4997)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7197 - add a Spanish readme file to the packages
Robin Sheat [Wed, 23 Nov 2011 05:39:25 +0000 (18:39 +1300)]
Bug 7197 - add a Spanish readme file to the packages

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
I don't speak spanish, so my signoff is just a technical view of the patch
(cherry picked from commit 373e49576d023c24e1b649f0a5c2a2570f4bb80f)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7164 follow-up history.txt and perlcritic compliance
Paul Poulain [Wed, 14 Dec 2011 14:10:28 +0000 (15:10 +0100)]
Bug 7164 follow-up history.txt and perlcritic compliance

* in history.txt, added a tab for Stephane Delaune, for display consistency
* fixed a small mistake in about.pl that was resulted in a perlcritic failure
(cherry picked from commit 82ed4696321df9b3f4e16b759b1e1a083a5c5e28)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7164 minor follow-up
Paul Poulain [Wed, 14 Dec 2011 13:49:22 +0000 (14:49 +0100)]
Bug 7164 minor follow-up

tab for Stephane Delaune, for display consistency

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7164 - add Koha history timeline tab to 'About' page
Mason James [Sat, 5 Nov 2011 10:28:48 +0000 (23:28 +1300)]
Bug 7164 - add Koha history timeline tab to 'About' page

Includes follow up by Chris Cormack fixing formatting in docs/history.txt

[MINOR EDIT] Added html filter to output for validity's sake

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
(cherry picked from commit 6bc414a3d418cd5255a178271207121f3cb9878a)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7160: paying fines throws error
Ian Walls [Sat, 5 Nov 2011 03:28:31 +0000 (23:28 -0400)]
Bug 7160: paying fines throws error

The call to ReturnLostItem in C4/Accounts was not properly namespaced to
come from C4::Circulation.  That prefix is added to the call.

To test:

Pay a fine, and confirm the error disappears (and the fines is still paid)

Signed-off-by: Brendan <brendan@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit afd2098f3c82812af7ab7366035e18b953662dab)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7143: Follow up patch for Updating about.tt
Brendan [Wed, 2 Nov 2011 10:04:58 +0000 (03:04 -0700)]
Bug 7143: Follow up patch for Updating about.tt

I had a typo where I put Ian Walls as Release Manager - I have fixed to QA.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
I put in another missing space for Colin Campbell.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 04f8dfec9b7de782d206f61650160b2113e12ccd)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7143: Updating About.tt for Ian Walls, Chris Nighswonger and Paul Poulain
Brendan [Wed, 2 Nov 2011 09:59:41 +0000 (02:59 -0700)]
Bug 7143: Updating About.tt for Ian Walls, Chris Nighswonger and Paul Poulain

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
(cherry picked from commit c3494eaaed4cdb45d7b9f80251fa096a57af143b)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoRelease Notes for 3.06.02.000 13 Dec 2011 20:00:36 Z
Chris Nighswonger [Tue, 13 Dec 2011 20:00:36 +0000 (15:00 -0500)]
Release Notes for 3.06.02.000 13 Dec 2011 20:00:36 Z