Commit Graph

15214 Commits

Author SHA1 Message Date
Marcel de Rooy 9dbc4e6aaf Bug 7367: Add space before display of languages.
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
I am a bit confused why it does not work without the &nbsp;
but patch fixes the display problem.

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2012-01-18 10:10:49 -05:00
Jared Camins-Esakov c63e93efd5 Bug 5226: Add 545 to es-ES and nb-NO
Since the original patches for bug 5226 were submitted, two new translations
have been added to Koha: es-ES and nb-NO. This patch adds the missing 545 line
to the frameworks for those languages.

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit c696bbec65)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2012-01-18 10:10:49 -05:00
Katrin Fischer 7e68cac97f Bug 5226: Follow up to new/awaiting_qa/bug_5226
This patch adds the field definition to
- it-IT (default and sample frameworks)
- de-DE, en, fr-FR, pl-PL (sample frameworks)

I am not sure about the database update. If we want to do that, it should perhaps update all frameworks and languages.
At the moment only en and de-DE default frameworks are updated.

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2012-01-18 10:10:46 -05:00
Jared Camins-Esakov cd511095a5 Add MARC21 field 545 to to framework fix bug 5226
Adds MARC21 field 545 to the English, French, German, and Polish MARC21
frameworks. The labels for the field still need to be translated into
French and Polish.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>

Backporting to 3.6.x

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2012-01-18 10:10:45 -05:00
Frédéric Demians d00c44bb2e Bug 6098 Followup -- doesn't replace NSB/NSE by space
On any page, NSB/NSE characters are replaced by space in Output.pm. It isn't a
good thing:

  - It isn't necessary since Zebra indexer handle properly those characters as
    delimiter.
  - It isn't necessary for display since XSL file already do that.
  - It isn't efficient since a regex is done on every whole page sent by Koha,
    not only on biblio record part.
  - It removes an information that librarian want to keep in their biblio
    records: any record edited in Koha loose its NSB/NSE characters.

Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit d785d9d57d)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2012-01-18 10:10:44 -05:00
Fridolyn SOMERS 17911a0e7d BUG 6098 zebra conf NSB NSE indexed as space
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 1f0bad091b)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2012-01-18 10:10:44 -05:00
Albert Oller 9b4fbc486a Bug 2629 - Diacritics not being ignored when searching
/etc/zebradb/etc/word-phrase-utf.chr
added Cc miniscule and Cc circumflex; added Kk acute accent.

Signed-off-by: Liz Rea <wizzyrea@gmail.com>
- imported marc record from the bug with the offending diacritic
- reindexed
- searched for the title - result found! Yay!
(cherry picked from commit 35bc73eca3)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2012-01-18 10:10:44 -05:00
Paul Poulain 6630a6c031 Bug 7278 follow-up DBrev number
Backporting to 3.6.x

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2012-01-18 10:10:44 -05:00
Katrin Fischer 6b869da833 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 52098370f5)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2012-01-18 10:10:43 -05:00
Chris Cormack 8adc2a84b0 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 a9e080a6fb)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2012-01-18 10:10:43 -05:00
Chris Cormack ffa6d005ff 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 67c6c95396)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2012-01-18 10:10:42 -05:00
Adrien Saurat cbfeca1ec6 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 74506e52de)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2012-01-18 10:10:42 -05:00
Owen Leonard 54ed58310d 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 9e70695907)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2012-01-18 10:10:42 -05:00
Chris Hall a0cccb3967 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 c2837b39a4)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2012-01-18 10:10:41 -05:00
Owen Leonard d0de3716ec 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 fe9312a124)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2012-01-18 10:10:41 -05:00
Duncan Tyler 8c5189d68d 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 0d9309e520)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2012-01-18 10:10:41 -05:00
Duncan Tyler 253ffbe2c6 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 4f16da0d31)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2012-01-18 10:10:40 -05:00
Katrin Fischer d5f95757c0 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 42265ef217)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2012-01-18 10:10:40 -05:00
Frédéric Demians 5ad6d9a72c 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 33587674fa)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2012-01-18 10:10:40 -05:00
Chris Nighswonger 8f163b462a Revert "Bug 5729 - Add CoinS to intranet"
This reverts commit b053896895.

Removing this enh from 3.6.x
2012-01-18 09:23:41 -05:00
Chris Nighswonger 22c5dfac72 Release Notes for 3.06.03.000 17 Jan 2012 19:39:50 Z 2012-01-17 14:42:33 -05:00
Chris Nighswonger 5f2f5921b5 Release Notes for 3.06.03.000 17 Jan 2012 12:46:33 Z 2012-01-17 07:46:33 -05:00
Christophe Croullebois 5ab88df697 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 a0a57b9526)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2012-01-16 15:59:43 -05:00
Paul Poulain 29043d5660 Bug 6627 follow-up
in installer, some lines where forgotten, and can also be commented
(cherry picked from commit a60101bea0)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2012-01-16 15:59:43 -05:00
Duncan Tyler a220304a8d 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 00290e8619)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2012-01-16 15:59:42 -05:00
Katrin Fischer 3b8e95ddf1 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 6d2ca576e2)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2012-01-16 15:59:42 -05:00
Jared Camins-Esakov 4709e7e177 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 9b3e1552c4)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2012-01-16 15:59:42 -05:00
Katrin Fischer 7a54bc53f6 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 4cd81a8d0f)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2012-01-16 15:59:41 -05:00
Katrin Fischer 5c1621bf83 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 71d2d81e34)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2012-01-16 15:59:41 -05:00
Chris Cormack 0942a21db2 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 01875b565d)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2012-01-16 15:59:41 -05:00
Chris Cormack 6790357243 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 ddb6883b57)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2012-01-16 15:59:40 -05:00
Chris Cormack fa6b504e4c 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 c64322e48d)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2012-01-16 15:59:40 -05:00
Chris Cormack 95a44070fd Bug 929 : Reinstating the breakdown of budgets
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
(cherry picked from commit 9638053a25)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2012-01-16 15:59:40 -05:00
Katrin Fischer 0b9c0b7528 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 37e1f05e8f)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2012-01-16 15:59:39 -05:00
Chris Cormack 5481461e07 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 fa1a90fd4f)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2012-01-16 15:59:39 -05:00
Frédéric Demians 33af36ff94 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 1730e180cd)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2012-01-16 15:54:48 -05:00
Liz Rea 0668963124 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 3c12d5f2f6)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2012-01-16 15:54:48 -05:00
Alex Arnaud 93cb222de2 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>
2012-01-16 15:53:30 -05:00
Paul Poulain b053896895 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 c96a52a4a0)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2012-01-16 15:47:31 -05:00
Sophie Meynieux f2adf05026 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 940652a6c7)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2012-01-16 15:47:30 -05:00
Frédéric Demians 12c4cdb244 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 34e99cf478)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2012-01-16 15:47:30 -05:00
Frédéric Demians 0ff647b6e4 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 a6eb507475)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2012-01-16 15:47:30 -05:00
Owen Leonard bad8eea9e1 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 bc2a1d18e2)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2012-01-16 15:47:29 -05:00
Chris Cormack 19c7059573 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 525c7bc4af)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2012-01-16 15:47:29 -05:00
Jared Camins-Esakov c7047cadd9 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 97caccbd0f)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2012-01-16 15:47:29 -05:00
Frédérick Capovilla df6f4d0c34 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 6408547cc0)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2012-01-16 15:47:28 -05:00
Chris Cormack 28c00dd146 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 bb92ac1ee0)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2012-01-16 15:47:28 -05:00
Marcel de Rooy ec259212b3 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 c8982e1ab4)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2012-01-16 15:47:28 -05:00
Tomas Cohen Arazi 9a314c90b1 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 22dca58cba)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2012-01-16 15:47:27 -05:00
Owen Leonard f955b70a67 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>
2012-01-16 15:45:59 -05:00