]> git.koha-community.org Git - koha.git/log
koha.git
12 years agoBug 5911 follow-up DBRev number
Paul Poulain [Wed, 12 Sep 2012 13:31:14 +0000 (15:31 +0200)]
Bug 5911 follow-up DBRev number

12 years agobug_5911: Transport Cost Matrix
Srdjan [Wed, 5 Sep 2012 00:47:21 +0000 (12:47 +1200)]
bug_5911: Transport Cost Matrix

Create transport_cost table,  added UseTransportCostMatrix syspref.
transport_cost table contains branch to branch transfer
costs. These are used for filling inter-branch hold transfers.

Moved GetHoldsQueueItems() from .pl to HoldsQueue.pm

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
12 years agoBug 8412: add color icon set
Nicole C. Engard [Fri, 3 Aug 2012 15:17:53 +0000 (11:17 -0400)]
Bug 8412: add color icon set

My goal here is to make it so that libraries can use
one of the authorized values (shelving location or
collection code) to store the color of the material
and then make that searchable on the advanced search
page.

To do this for collection codes you'd need to add
the following jqueries:

intranetuserjs

$(document).ready(function(){
$("#advsearch-tab-ccode a:contains('Collection')").text("Color");
$("#holdings th:contains('Collection')").text("Color");
});

opacuserjs

$(document).ready(function(){
$("#advsearch-tab-ccode a:contains('Collection')").text("Color");
$('#item_ccode').text("Color");
});

And update the frameworks to change the 952$8 label to say Color.

The following SQL could be used to add these colors to the CCODE
authorized value category if you planned on using these this way.
If you wanted to use these colors for another authorized value
you'd have to edit this to use that category:

insert into authorised_values (category, authorised_value, lib,
 lib_opac, imageurl) values ('CCODE','000000','Black','','colors/000000.png');
insert into authorised_values (category, authorised_value, lib,
 lib_opac, imageurl) values ('CCODE','66cc66','Bright Green','','colors/66cc66.png');
insert into authorised_values (category, authorised_value, lib,
 lib_opac, imageurl) values ('CCODE','99cc33','Olive','','colors/99cc33.png');
insert into authorised_values (category, authorised_value, lib,
 lib_opac, imageurl) values ('CCODE','3333cc','Dark Blue','','colors/3333cc.png');
insert into authorised_values (category, authorised_value, lib,
 lib_opac, imageurl) values ('CCODE','006600' ,'Dark Green','','colors/006600.png');
insert into authorised_values (category, authorised_value, lib,
 lib_opac, imageurl) values ('CCODE','6600cc','Plum','','colors/6600cc.png');
insert into authorised_values (category, authorised_value, lib,
 lib_opac, imageurl) values ('CCODE','6666cc','Purple','','colors/6666cc.png');
insert into authorised_values (category, authorised_value, lib,
 lib_opac, imageurl) values ('CCODE','9999cc','Light Purple','','colors/9999cc.png');
insert into authorised_values (category, authorised_value, lib,
 lib_opac, imageurl) values ('CCODE','660000' ,'Burgundy','','colors/660000.png');
insert into authorised_values (category, authorised_value, lib,
 lib_opac, imageurl) values ('CCODE','663333' ,'Brown','','colors/663333.png');
insert into authorised_values (category, authorised_value, lib,
 lib_opac, imageurl) values ('CCODE','990000' ,'Red','','colors/990000.png');
insert into authorised_values (category, authorised_value, lib,
 lib_opac, imageurl) values ('CCODE','996633' ,'Tan','','colors/996633.png');
insert into authorised_values (category, authorised_value, lib,
 lib_opac, imageurl) values ('CCODE','999999' ,'Gray','','colors/999999.png');
insert into authorised_values (category, authorised_value, lib,
 lib_opac, imageurl) values ('CCODE','cc66cc','Pink','','colors/cc66cc.png');
insert into authorised_values (category, authorised_value, lib,
 lib_opac, imageurl) values ('CCODE','cc99cc','Bubble Gum','','colors/cc99cc.png');
insert into authorised_values (category, authorised_value, lib,
 lib_opac, imageurl) values ('CCODE','cc3333' ,'Orange','','colors/cc3333.png');
insert into authorised_values (category, authorised_value, lib,
 lib_opac, imageurl) values ('CCODE','cc6666' ,'Peach','','colors/cc6666.png');
insert into authorised_values (category, authorised_value, lib,
 lib_opac, imageurl) values ('CCODE','cc9999' ,'Rose','','colors/cc9999.png');
insert into authorised_values (category, authorised_value, lib,
 lib_opac, imageurl) values ('CCODE','cccc00' ,'Gold','','colors/cccc00.png');
insert into authorised_values (category, authorised_value, lib,
 lib_opac, imageurl) values ('CCODE','ffff33' ,'Yellow','','colors/ffff33.png');
insert into authorised_values (category, authorised_value, lib,
 lib_opac, imageurl) values ('CCODE','ffffcc','Cream','','colors/ffffcc.png');
insert into authorised_values (category, authorised_value, lib,
 lib_opac, imageurl) values ('CCODE','ffffff','White','','colors/ffffff.png');

I'll add this tip to a blog post and to the manual once this
set of icons has been pushed to Koha.

Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
12 years agoMerge remote-tracking branch 'origin/new/bug_8089'
Paul Poulain [Wed, 12 Sep 2012 12:14:35 +0000 (14:14 +0200)]
Merge remote-tracking branch 'origin/new/bug_8089'

12 years agoRevert "Bug 8089: Use Koha::Cache for all caching"
Paul Poulain [Wed, 12 Sep 2012 11:46:00 +0000 (13:46 +0200)]
Revert "Bug 8089: Use Koha::Cache for all caching"

This reverts commit 215abc8024d93f1b6a10f26427a65bd64d106e52.

The 3 patches for bug 8089 have been reverted, because they break
jenkins & Koha.
A follow-up has been provided, but it does not solve the problem on my
test server, it just changes the error message.

After a discussion with jared, Dobrica should work on another patch, so
the best option is to revert.

12 years agoRevert "Bug 8089: Cache sysprefs using Koha::Cache"
Paul Poulain [Wed, 12 Sep 2012 11:45:51 +0000 (13:45 +0200)]
Revert "Bug 8089: Cache sysprefs using Koha::Cache"

This reverts commit 499f44fa1d0086d4430215648679fd368017df6c.

12 years agoRevert "Bug 8089: Correct cache timeout to 1000"
Paul Poulain [Wed, 12 Sep 2012 11:45:40 +0000 (13:45 +0200)]
Revert "Bug 8089: Correct cache timeout to 1000"

This reverts commit eefeef0c1ff606dc15ad6105537c5e6fb8f7393d.

12 years agoMerge remote-tracking branch 'origin/new/bug_8408'
Paul Poulain [Fri, 7 Sep 2012 16:42:21 +0000 (18:42 +0200)]
Merge remote-tracking branch 'origin/new/bug_8408'

12 years agoBug 8408 - Followup 2 - Add reference to renewing items.
Kyle M Hall [Fri, 3 Aug 2012 11:57:24 +0000 (07:57 -0400)]
Bug 8408 - Followup 2 - Add reference to renewing items.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
12 years agoBug 8408 - Followup - Fix broken messages.
Kyle M Hall [Fri, 3 Aug 2012 11:53:33 +0000 (07:53 -0400)]
Bug 8408 - Followup - Fix broken messages.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
12 years agoBug 8678: XSLT stylesheets output XML, but HTML is needed
Jared Camins-Esakov [Thu, 23 Aug 2012 16:27:49 +0000 (12:27 -0400)]
Bug 8678: XSLT stylesheets output XML, but HTML is needed

Because we are embedding the results of XSLT stylesheets in HTML, we
need to output HTML instead of XML. Outputting XML results in
non-standard-compliant (or at least non-Firefox-compliant) markup.

To test:
View a variety of XSLT-rendered pages on the OPAC and intranet, and
confirm that all look as expected.

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
12 years agoMerge remote-tracking branch 'origin/new/bug_8204'
Paul Poulain [Fri, 7 Sep 2012 16:34:28 +0000 (18:34 +0200)]
Merge remote-tracking branch 'origin/new/bug_8204'

12 years agoBug 8204 follow-up: don't display OpacNav on auth details
Jared Camins-Esakov [Mon, 27 Aug 2012 13:03:30 +0000 (09:03 -0400)]
Bug 8204 follow-up: don't display OpacNav on auth details

Based on the way we handle the bib details page, it seems we should
not be displaying OpacNav on the authority details pages on the OPAC.
This patch removes them.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
12 years agoBug 8089: Correct cache timeout to 1000
Jared Camins-Esakov [Sun, 20 May 2012 12:18:52 +0000 (08:18 -0400)]
Bug 8089: Correct cache timeout to 1000

There was a typo in the original patch for bug 8089 which set the cache
timeout on getAllLanguages to 10000. Correct it to 1000.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
12 years agoBug 8089: Cache sysprefs using Koha::Cache
Jared Camins-Esakov [Tue, 15 May 2012 11:14:01 +0000 (07:14 -0400)]
Bug 8089: Cache sysprefs using Koha::Cache

Cache sysprefs using Koha::Cache in a way that is safe even for
caching-related sysprefs. This lays the groundwork for removing
caching configuration from the httpd.conf and configuring it
using sysprefs.

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
12 years agoBug 8089: Use Koha::Cache for all caching
Jared Camins-Esakov [Mon, 14 May 2012 11:27:29 +0000 (13:27 +0200)]
Bug 8089: Use Koha::Cache for all caching

1. Replace all instances of memoize_memcached with appropriate calls
into Koha::Cache:
* reports/guided_reports.pl
* C4::Biblio::GetMarcStructure
* C4::Languages::getFrameworkLanguages
* C4::Languages::getAllLanguages
* C4::SQLHelper::GetPrimaryKeys
* C4::SQLHelper::_get_columns

2. Replace all references to memcached with the appropriate calls into
Koha::Cache in C4::Context.

Test plan :
* have DEBUG env set to 1
* reach addbiblio page to test the patch in Biblio.pm, or setup more than 1
  language
* you should see in the logs that you're reading and writing from cache
* run the test suite twice both with and without the following environment
  variables set:
export MEMCACHED_SERVERS=127.0.0.1:11211
export MEMCACHED_NAMESPACE=KOHA
export CACHING_SYSTEM=memcached

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
I'm unsure about some of the caching times 10000 is a long long time,
but other than that, works fine.

12 years agoBug 8206: make authority search indexes consistent
Jared Camins-Esakov [Sun, 15 Jul 2012 13:30:58 +0000 (09:30 -0400)]
Bug 8206: make authority search indexes consistent

This commit makes the search indexes used for search authorities in the
staff client and OPAC more consistent by using the Mainentry,
Match, and Any indexes for both, and adjusting the labels so that they
correctly describe what the indexes do.

Note that the Match index was chosen instead of the Match-heading index
because Match-heading has the additional attribute of being for phrase
searches and exact matches, whereas Match is used for keyword matching,
and is more applicable with GRS-1 indexed records (thanks to the
well-known limitations of GRS-1 and exact matching of headings).

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
No problem detected in UNIMARC

12 years agoBug 8206 follow-up: Add Match index to MARC21 record.abs
Jared Camins-Esakov [Thu, 5 Jul 2012 13:15:04 +0000 (09:15 -0400)]
Bug 8206 follow-up: Add Match index to MARC21 record.abs

Although the Match index was correctly configured for UNIMARC
authorities and MARC21 authorities indexed with DOM, the Match
index was inadvertantly removed from the record.abs file for
MARC21 authorities at some point. Since the Match index is required
to make best use of the new search options, this patch adds it
back in.

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
12 years agoBug 8206: Specify index in OPAC authority search
Jared Camins-Esakov [Wed, 30 May 2012 15:02:51 +0000 (11:02 -0400)]
Bug 8206: Specify index in OPAC authority search

Adds a dropdown to allow the user to choose to search the 'mainentry,'
and 'match-heading'indexes, in addition to the 'any' index which is
the default.

To test (you will need authority records with see-from and
see-also headings):
1. Go to the browse subjects and authors section in the OPAC
2. Do a search for a fairly generic term that is used as a
   see-also term in a lot of records. Note that your search
   results include both the record that you wanted and all
   the other records that refer to it.
3. Apply the patch.
4. Repeat the search from step 2. Notice there is no change
   to the results.
5. Repeat the search from step 2, but choose "in main entry"
   and observe that you are now only seeing authority records
   with the search entered in their main entry.
6. Repeat the search from step 2, but choose "in any heading"
   and observe that the results are the same as in step 2. This
   is intentional, so that in the future notes in authorities
   can be made searchable.
7. Search for an obsolete form of heading with the "in keyword"
   option selected. Notice what results you get.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works nicely. Hiding the new options can be done with CSS:

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
12 years agoBug 5327: Testing c4 Images
Bart Jorgensen [Thu, 23 Aug 2012 04:58:24 +0000 (16:58 +1200)]
Bug 5327: Testing c4 Images

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
tested the 9 previous patches, that introduces many new unit tests using
the Mock Module.

12 years agoBug 5327: Unit tests for C4 socialdata
Bart Jorgensen [Thu, 23 Aug 2012 05:46:41 +0000 (17:46 +1200)]
Bug 5327: Unit tests for C4 socialdata

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
12 years agoBug 5327 : Fixing a typo in the test that was causing a false fail
Chris Cormack [Wed, 5 Sep 2012 18:29:15 +0000 (06:29 +1200)]
Bug 5327 : Fixing a typo in the test that was causing a false fail

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
t/db_dependent/Items.t was failing despite valid data before patch,
works fine after

12 years agoAdded tests to installer_perlmodules
Bart Jorgensen [Thu, 16 Aug 2012 05:43:17 +0000 (17:43 +1200)]
Added tests to installer_perlmodules

http://bugs.koha-community.org/show_bug.cgi?id=5327
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
12 years agoAdded a mock-db table and tested a line
Bart Jorgensen [Thu, 9 Aug 2012 05:01:56 +0000 (17:01 +1200)]
Added a mock-db table and tested a line

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

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
12 years agoAdded and tested a mock-db tested a couple of features
Bart Jorgensen [Wed, 8 Aug 2012 09:23:55 +0000 (21:23 +1200)]
Added and tested a mock-db tested a couple of features

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

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
12 years agoBug 5327 Tests for C4::Matcher
Bart Jorgensen [Thu, 2 Aug 2012 04:56:58 +0000 (16:56 +1200)]
Bug 5327 Tests for C4::Matcher

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
12 years agoBug 5327 : Added a few more lines of code to the ItemType.t unit test
Bart Jorgensen [Mon, 30 Jul 2012 08:10:02 +0000 (20:10 +1200)]
Bug 5327 : Added a few more lines of code to the ItemType.t unit test

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
12 years agoBug 5327 follow-up: add DBD::Mock dependency
Jared Camins-Esakov [Mon, 30 Jul 2012 21:44:48 +0000 (17:44 -0400)]
Bug 5327 follow-up: add DBD::Mock dependency

In order for the awesome new t/ItemType.t test to work, we need
DBD::Mock.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
12 years agoBug 6617 - Wrong first indicator value in test
Tomas Cohen Arazi [Thu, 23 Aug 2012 15:58:52 +0000 (12:58 -0300)]
Bug 6617 - Wrong first indicator value in test

Testing the first indicator value=2 should be used for labeling 'Partial content'.

Sponsored-by: Universidad Nacional de Córdoba
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
12 years agoBug 6617: Improve MARC21 enhanced contents display (intranet)
Jared Camins-Esakov [Sat, 4 Aug 2012 15:36:35 +0000 (11:36 -0400)]
Bug 6617: Improve MARC21 enhanced contents display (intranet)

The display of "Enhanced" 505 (contents) fields in the MARC21
XSLT is very poor, resulting in large, unreadable blocks of text,
and -- for some series -- so much unnecessary duplication in the
Notes tab that important information is entirely obscured. This
patch reformats "enhanced" contents fields (MARC21 505 fields with
$t and $r) so as to be more readable by breaking up entries on
separate lines and making titles bold (to make them stand out more).

This patch does not address duplication of information in the Notes
tab, per discussion on the #koha IRC channel.

To test:
1) View record with enhanced 505 field before applying patch. Observe
it is very unfriendly.
2) Apply patch.
3) View same record, note that display is much improved.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Display in staff and OPAC is consistent and improved after
applying the patch.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
12 years agoBug 6617: Improve MARC21 enhanced contents display
Jared Camins-Esakov [Sun, 29 Jul 2012 02:58:31 +0000 (22:58 -0400)]
Bug 6617: Improve MARC21 enhanced contents display

The display of "Enhanced" 505 (contents) fields in the MARC21
XSLT is very poor, resulting in large, unreadable blocks of text,
and -- for some series -- so much unnecessary duplication in the
Notes tab that important information is entirely obscured. This
patch reformats "enhanced" contents fields (MARC21 505 fields with
$t and $r) so as to be more readable by breaking up entries on
separate lines and making titles bold (to make them stand out more).

This patch does not address duplication of information in the Notes
tab, per discussion on the #koha IRC channel.

To test:
1) View record with enhanced 505 field before applying patch. Observe
   it is very unfriendly.
2) Apply patch.
3) View same record, note that display is much improved.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
This first patch works as advertised. It formats the table of
contents on the opac detail display in a cleaner format.

I recommend that future follow ups fix the staff client to match
and update the title notes tabs on the opac and staff client
to also match the cleaner format for table of contents.

12 years agoMerge remote-tracking branch 'origin/new/bug_8550'
Paul Poulain [Wed, 5 Sep 2012 13:54:23 +0000 (15:54 +0200)]
Merge remote-tracking branch 'origin/new/bug_8550'

12 years agoBug 8550: restore ISSN field to Z39.50 search
Jared Camins-Esakov [Wed, 1 Aug 2012 17:40:50 +0000 (13:40 -0400)]
Bug 8550: restore ISSN field to Z39.50 search

Sometime in 2009 or so, the ISSN field was removed from the Z39.50 search
page, and the ISBN field replaced with a combined ISBN/ISSN field. Since
this breaks ISBN search for most Z39.50 targets (due to the
differing treatment of ISBN vs. ISSN), this is a bug not a feature.

A future enhancement would be to use Business::ISBN to search for both
ISBN10 and ISBN13.

To test:
1) Apply patch.
2) Do a search for an ISBN using the ISBN field.
3) Do a search for an ISSN using the ISSN field.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
12 years agoBug 8696: Update Export bibs on Tool Menu
Nicole C. Engard [Tue, 28 Aug 2012 15:00:04 +0000 (11:00 -0400)]
Bug 8696: Update Export bibs on Tool Menu

The tool for exporting bibs is now 'Export data'
this patch changes the label on the menu to reflect
that.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
12 years agoBug 8261: Cannot search system preferences from Local Use tab
Fridolyn SOMERS [Wed, 29 Aug 2012 14:59:49 +0000 (16:59 +0200)]
Bug 8261: Cannot search system preferences from Local Use tab

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
12 years agoBug 8706 - Private lists can be accessed by anyone
Marcel de Rooy [Fri, 31 Aug 2012 09:48:51 +0000 (11:48 +0200)]
Bug 8706 - Private lists can be accessed by anyone

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Confirmed private lists can be accessed directly before patch is
applied. After applying patch, I can no longer access the list
via the same url.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
12 years agoBug 8704 - Typo in etc/koha-conf.xml
Marcel de Rooy [Thu, 30 Aug 2012 12:59:32 +0000 (14:59 +0200)]
Bug 8704 - Typo in etc/koha-conf.xml

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
12 years agoBug 7784 - Improve clarity of batch modification operations
Owen Leonard [Fri, 15 Jun 2012 16:21:15 +0000 (12:21 -0400)]
Bug 7784 - Improve clarity of batch modification operations

- Improve clarity of hint about checkboxes
- Inicate that leaving fields blank will make no change
- Add a hint when checking checkboxes stating that the field will
  be deleted.
- Block deletion of required subfields
- Add "required" style to required subfields (matching additem.pl)

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Works as described

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
12 years agoBug 8514 Restore Patron Name Display Order
Colin Campbell [Fri, 27 Jul 2012 15:32:49 +0000 (16:32 +0100)]
Bug 8514 Restore Patron Name Display Order

Bug 6303 introduced an include file governing patron name display
unfortunately that changed patron display in search result lists and
on the circ screen header. This adds a parameter restroring the
original surname, firstname order, whose absence was perceived
as a loss of functionality

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
12 years agoMerge remote-tracking branch 'origin/new/bug_7613'
Paul Poulain [Wed, 5 Sep 2012 12:54:33 +0000 (14:54 +0200)]
Merge remote-tracking branch 'origin/new/bug_7613'

12 years agoBug 7613: OCLC Connexion web service and desktop client, followup patch
D Ruth Bavousett [Mon, 11 Jun 2012 19:13:01 +0000 (12:13 -0700)]
Bug 7613: OCLC Connexion web service and desktop client, followup patch

Prior patches to this bug had lots of comments like "I don't have a way to test this, so..."

In the OCLC Connexion web, when you choose the option to export to MARC, it'll *send* it, and
say, "Record Exported," but the web client does nothing whatever to confirm that the record
actually landed in Koha.  That's a flaw in their software, but can be easily checked by
looking in Koha to see if an import batch got created.  The desktop client is a little
smarter about this, but needed much more testing, also.

With this patch, both the client and web will actually work.  With a config file and set up as
previously described, The record will be staged and/or imported, and the desktop client returns
a useful message about what happened, *and* the staff client URL to the record.

Oodles of gobs of bunches of thanks to Virginia Military Institute, for loaning me their OCLC
authorization credentials so this could be tested, as well as for great suggestions of cosmetic
improvements to the mechanism and output.

12 years agoMerge remote-tracking branch 'origin/new/bug_8293'
Paul Poulain [Wed, 5 Sep 2012 12:39:16 +0000 (14:39 +0200)]
Merge remote-tracking branch 'origin/new/bug_8293'

12 years agoBug 8293 : Fixing POD to match actuality.
Chris Cormack [Sat, 1 Sep 2012 03:01:49 +0000 (15:01 +1200)]
Bug 8293 : Fixing POD to match actuality.

Signed-off-by: Fridolyn SOMERS <fridolyn.somers@biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
12 years agoBug 7621 follow-up DBRev number
Paul Poulain [Wed, 5 Sep 2012 12:35:28 +0000 (14:35 +0200)]
Bug 7621 follow-up DBRev number

12 years agoBUG 7621 [ENH] Circulation: Match age restriction of title with borrower's age withou...
Marc Veron [Sat, 11 Aug 2012 09:39:44 +0000 (11:39 +0200)]
BUG 7621 [ENH] Circulation: Match age restriction of title with borrower's age without using categories

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
New version implementing Paul's advice.
See Wiki http://wiki.koha-community.org/wiki/Age_restrictiotion

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
fix updatedatabase.pl

New fix updatedatabase.pl to apply to current master by Marc Veron veron@veron.ch
...and fixed missing curly bracket after merging updatedatabase.pl

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
12 years agoSIGNED-OFF] bug 8382: It is not possible to cancel an order on a filtered page in...
christophe croullebois [Thu, 5 Jul 2012 18:07:42 +0000 (20:07 +0200)]
SIGNED-OFF] bug 8382: It is not possible to cancel an order on a filtered page in parcel.pl

Because in parcel.pl page the filter (on the left) makes a table using jscript and
a very different workflow, the "cancel" link does nothing just asking for cancelling.
Principaly due to the use of the "filter" js function that call the parcel.pl page
and does all the job in a separate block with a separate perl function
(SearchOrder) that sends all to js, that constructs html to finally append it to table.
So I have decided to rebuild entirely the filter.
I have choosen to overload the function "GetPendingOrders" to enable it to accept new arguments.
To test : when you are in "parcel.pl" ready to receive orders, simply select a filter on the left
and on the filtered page try to cancel a line.
You'll have the warning message but no more, the line will be not canceled.

Signed-off-by: wajasu <matted-34813@mypacks.net>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
12 years agoBug 8623: Move YUI out of prog
Jared Camins-Esakov [Mon, 13 Aug 2012 01:17:21 +0000 (21:17 -0400)]
Bug 8623: Move YUI out of prog

This patch moves the YUI assets from koha-tmpl/opac-tmpl/prog/en/lib/yui
to koha-tmpl/opac-tmpl/lib/yui.

NOTE: This was tested on Chrome, FF, and Safari on a Mac, and IE and FF
on Windows.

To test:
1) View a smattering of pages on the OPAC and intranet. If the move
   did not work flawlessly, layout will be way off.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
12 years agoBug 8623: Do not accept "lib" as a valid theme
Jared Camins-Esakov [Mon, 13 Aug 2012 00:09:20 +0000 (20:09 -0400)]
Bug 8623: Do not accept "lib" as a valid theme

Since we are going to be storing third-party Javascript libraries in
koha-tmpl/opac-tmpl/lib and koha-tmpl/intranet-tmpl/lib, we want to make
sure that "lib" is not picked up as a theme in the system preferences
editor.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
12 years agoBug 8622: Fix theme fallback
Jared Camins-Esakov [Sun, 12 Aug 2012 23:32:18 +0000 (19:32 -0400)]
Bug 8622: Fix theme fallback

This patch does the following:
1) Enables fallback for includes between different themes and different
   languages (with the exact same precedence as for .tt files)
2) Enable fallback for XSLT files between different themes and different
   languages (again, same precedence)
3) Change the semantics of the TT [% themelang %] variable so that it always
   refers to the preferred theme and language, rather than the fallback
   theme/language. As a result, all themes must include all javascript,
   css and image resources they use.

Note that these changes actually have no impact whatsoever on an
installation where the default (prog) themes are in use.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Mason James <mtj@kohaaloha.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
12 years agoBug 8478 - Update Ubuntu related files Updated installation instructions, cleaned...
Mark Tompsett [Mon, 30 Jul 2012 16:26:59 +0000 (00:26 +0800)]
Bug 8478 - Update Ubuntu related files Updated installation instructions, cleaned up ubuntu-pkg-check.sh, renamed ubuntu*.packages files more consistently, updated files to include missing libraries, corrected incorrect libraries (yaz3->yaz4, mysqlclient v16 to v18, dropped the dev version of the client).

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
12 years agoBug 6886 Follow up for NORMARC
Chris Cormack [Sun, 5 Aug 2012 21:59:54 +0000 (09:59 +1200)]
Bug 6886 Follow up for NORMARC

Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
12 years agoBug 6886 - Follow up for UNIMARC
Chris Cormack [Sun, 5 Aug 2012 21:44:36 +0000 (09:44 +1200)]
Bug 6886 - Follow up for UNIMARC

Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
12 years agoBug 6886 - OPAC XSLT respecting single branch mode
Chris Cormack [Tue, 20 Sep 2011 03:27:08 +0000 (15:27 +1200)]
Bug 6886 - OPAC XSLT respecting single branch mode

This is only for the MARC21 XSLT at this stage, follow up patch for
UNIMARC will come

Conflicts:

C4/XSLT.pm
koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref

Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
12 years agoBug 8594 - prevent the report system from breaking some subqueries
Robin Sheat [Wed, 8 Aug 2012 16:02:13 +0000 (18:02 +0200)]
Bug 8594 - prevent the report system from breaking some subqueries

If you had a report query that had a subquery in the fields list, and
that subquery had a LIMIT specifier, then it would be removed which
could break your query. This patch prevents this case from breaking by
ensuring that only a LIMIT that follows the last WHERE in the query is
removed.

If you don't have a WHERE, then it will behave like it always
did, removing all the cases of LIMIT (which would still break a subquery
but this is a) more rare, and b) would require more intelligent parsing
to deal with.

Also adds test cases and function documentation.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Tested with this report:

select biblionumber, (select itemnumber from items where items.biblionumber=biblio.biblionumber LIMIT 1) from biblio where biblionumber<1000;

and it worked like a charm

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
12 years agoBug 8549 - DataTables upgrade broke display of next/previous buttons in table controls
Owen Leonard [Wed, 8 Aug 2012 14:38:21 +0000 (10:38 -0400)]
Bug 8549 - DataTables upgrade broke display of next/previous buttons in table controls

When the DataTables plugin was upgraded the DataTables CSS
was not updated at the same time, causing problems in the
display due to changes in how the plugin works.

The DataTables upgrade added text lables to the image-only
buttons in order to improve accessibility. This patch
revises the CSS and the four_button pager modification
to conform with the upgrade.

To test, please view tables which use each of three types of
pagers: default two-button (ex: circ/pendingreserves),
custom four-button (ex: members/readingrec.pl) and full
(ex: tools/quotes.pl).

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
12 years agoBug 2553 [Serials report] alphabetize dropdown menus
Owen Leonard [Thu, 23 Aug 2012 14:08:27 +0000 (10:08 -0400)]
Bug 2553 [Serials report] alphabetize dropdown menus

Rebase of a patch originally submitted by gcollum@gmail.com
Original commit message:

Improvement on the previous patch through the use of GetBranchesLoop.
Added code so that the logged in location will be the location that
is selected by default.

Fixed a couple of minor xhtml errors.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
12 years agoBug 8675 Add hours and mins to renewal due date
Colin Campbell [Thu, 23 Aug 2012 13:04:31 +0000 (14:04 +0100)]
Bug 8675 Add hours and mins to renewal due date

If user supplies renewal with a new due date it should add
a time using the same logic as dateduespec in circulation.pl
rather than defaulting to 00:00

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
12 years agoupdate 'onloan' in items and deleteditems
Nicole C. Engard [Tue, 21 Aug 2012 06:49:56 +0000 (02:49 -0400)]
update 'onloan' in items and deleteditems

This field said it was a 1 or 0 value, but it's
a date field.

http://bugs.koha-community.org/show_bug.cgi?id=6716
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
12 years agoBug 8666: Hide 'New basket' link if supplier is inactive
Julian Maurice [Wed, 22 Aug 2012 13:26:58 +0000 (15:26 +0200)]
Bug 8666: Hide 'New basket' link if supplier is inactive

Signed-off-by: Koha Team Lyon 3 <koha@univ-lyon3.fr>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
12 years agoBug 7368: fixed subsribe typo
Kathryn Tyree [Thu, 23 Aug 2012 04:23:58 +0000 (16:23 +1200)]
Bug 7368: fixed subsribe typo

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Corrects typo.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
12 years agoMerge remote-tracking branch 'origin/new/bug_8440'
Paul Poulain [Mon, 3 Sep 2012 15:52:33 +0000 (17:52 +0200)]
Merge remote-tracking branch 'origin/new/bug_8440'

12 years agoBug 8440: Dates does not appear in suggestions management
Fridolyn SOMERS [Wed, 25 Jul 2012 07:39:50 +0000 (09:39 +0200)]
Bug 8440: Dates does not appear in suggestions management

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
12 years agoBug 7168: Add basket group search field in histsearch.pl
Julian Maurice [Tue, 7 Aug 2012 13:07:36 +0000 (15:07 +0200)]
Bug 7168: Add basket group search field in histsearch.pl

Allow to search orders by basket group name

Signed-off-by: Marc Veron <veron@veron.ch>
Displays search field for baketgroup as expected.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
12 years agoMerge remote-tracking branch 'origin/new/bug_7241'
Paul Poulain [Mon, 3 Sep 2012 15:40:17 +0000 (17:40 +0200)]
Merge remote-tracking branch 'origin/new/bug_7241'

12 years agoRevert "Bug 7241: fix for the CIRC logs -> itemnumber stored correctly"
Paul Poulain [Mon, 3 Sep 2012 15:34:03 +0000 (17:34 +0200)]
Revert "Bug 7241: fix for the CIRC logs -> itemnumber stored correctly"

This reverts commit a659d02dbe2e95659f8abcc5cdd985bbb89b89d3.

12 years agoMerge remote-tracking branch 'origin/new/bug_7241'
Paul Poulain [Mon, 3 Sep 2012 15:26:18 +0000 (17:26 +0200)]
Merge remote-tracking branch 'origin/new/bug_7241'

12 years agoBug 7241: fix for the CIRC logs -> itemnumber stored correctly
Adrien Saurat [Fri, 1 Jun 2012 09:08:28 +0000 (11:08 +0200)]
Bug 7241: fix for the CIRC logs -> itemnumber stored correctly

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
12 years agoBug 7412 follow-up
Paul Poulain [Mon, 3 Sep 2012 15:03:09 +0000 (17:03 +0200)]
Bug 7412 follow-up
  * DBRev number
  * removing useless `` in table name

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
12 years agoBug 7412 follow-up
Paul Poulain [Mon, 3 Sep 2012 15:03:09 +0000 (17:03 +0200)]
Bug 7412 follow-up
  * DBRev number
  * removing useless `` in table name

12 years agoBug 7412: Pre-filling items in cataloguing
Matthias Meusburger [Fri, 6 Jan 2012 13:55:45 +0000 (14:55 +0100)]
Bug 7412: Pre-filling items in cataloguing

Pre-filling of items: remember what was in the previous item filled, to be able to create multiple items quickly.

By default, all subfields are prefilled when the PrefillItem syspref is on, unless you specify which fields
you want to prefill in the SubfieldsToUseWhenPrefill syspref.
With a value of "f u v", only the $f, $u and $v will be prefilled, for example.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Rebased and QAed.

12 years agoBug 6494 - opacmysummaryhtml on reading history
Owen Leonard [Thu, 16 Aug 2012 16:53:25 +0000 (12:53 -0400)]
Bug 6494 - opacmysummaryhtml on reading history

This patch re-uses code and markup from opac-user.tt & .pl
to place the contents of the opacmysummaryhtml preference
on the circulation history page in exactly the same way
it appears on the "my summary" page.

The wording of the system preference description has
been modified to reflect this addition.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Works as advertised.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
12 years agoMerge remote-tracking branch 'origin/new/bug_7805'
Paul Poulain [Mon, 3 Sep 2012 13:58:45 +0000 (15:58 +0200)]
Merge remote-tracking branch 'origin/new/bug_7805'

12 years agoBug 7805 Followup for perlcritic messages
Marcel de Rooy [Thu, 14 Jun 2012 10:40:08 +0000 (12:40 +0200)]
Bug 7805 Followup for perlcritic messages

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Tested by going to Lists and doubleclicking a list to see
its contents (in opac or staff). It works. No warnings
in the log. I am ready to sign off.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
12 years agoBug 8569: Paying for lost item overwrites nonpublic notes.
D Ruth Bavousett [Fri, 3 Aug 2012 14:53:23 +0000 (07:53 -0700)]
Bug 8569: Paying for lost item overwrites nonpublic notes.

This patch modifies C4::Circulation::ReturnLostItem to append the Paid-for note
to existing data, rather than overwriting it.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
12 years agoBug 4064 - Uninitialized variable errors in opac-search.pl Merely optimized two if...
Mark Tompsett [Sat, 30 Jun 2012 05:45:25 +0000 (13:45 +0800)]
Bug 4064 - Uninitialized variable errors in opac-search.pl Merely optimized two if statements, already fixed in master.

Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
12 years agoBug 8391: prevent error when viewing circ history with bad dates
Robin Sheat [Fri, 27 Jul 2012 09:34:17 +0000 (11:34 +0200)]
Bug 8391: prevent error when viewing circ history with bad dates

Sometime the circ history will contain "0000-00-00" as a returndate when
an item was lost rather than returned. This currently causes an error
when attempting to parse the dates, this patch causes an empty string to
be returned instead.

Note: a future enhancement should distinguish between "no date provided"
and "invalid date provided" to allow distinctions to be made.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
12 years agoBug 3374 - Display patron attributes in the same format as other patron data
Owen Leonard [Fri, 27 Jul 2012 14:32:47 +0000 (10:32 -0400)]
Bug 3374 - Display patron attributes in the same format as other patron data

This patch revises the interface for displaying and editing
patron attributes so that it is consistent with other
similar interfaces.

Display of patron attributes should match the display of other
kinds of patron data, and codes should be omitted in favor of
descriptions.

Entry of patron attributes should match other patron entry
forms and should also omit codes in favor of descriptions.

To test, view and edit patron attributes. Special functions
like "Clear" and "New" should function as before.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Tested by viewing patrons with attributes, editing those attributes
and editing the entire patron record. In all places the editing/adding
works and the display is improved.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
12 years agoBug 8586: Small bug in die if no mapping in framework for biblioitems.biblioitemnumber
Fridolyn SOMERS [Tue, 7 Aug 2012 12:42:17 +0000 (14:42 +0200)]
Bug 8586: Small bug in die if no mapping in framework for biblioitems.biblioitemnumber

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
12 years agoBug 8012: default values for defaultSortField/defaultSortOrder NULL on install
D Ruth Bavousett [Fri, 17 Aug 2012 12:42:12 +0000 (08:42 -0400)]
Bug 8012: default values for defaultSortField/defaultSortOrder NULL on install

...which *looks* like "relevance/ascending" in the staff client, which doesn't make sense.
This patch initializes the values at "relevance/descending", which is a functional
combination.

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
12 years agoMerge remote-tracking branch 'origin/new/bug_8332'
Paul Poulain [Mon, 3 Sep 2012 10:53:07 +0000 (12:53 +0200)]
Merge remote-tracking branch 'origin/new/bug_8332'

12 years agoBug 8332 follow-up: make strings translatable
Jared Camins-Esakov [Mon, 20 Aug 2012 12:30:17 +0000 (08:30 -0400)]
Bug 8332 follow-up: make strings translatable

I made a silly mistake on the original patch and made the options
untranslatable. This follow-up restores their translatability.

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
12 years agoBug 8332: Add relationships to auth_finder for authority links
Jared Camins-Esakov [Thu, 28 Jun 2012 22:25:55 +0000 (18:25 -0400)]
Bug 8332: Add relationships to auth_finder for authority links

In addition to the work in bug 8207 that enables auth_finder use, it
would be very useful when creating authorities to have the auth_finder
plugin automatically fill out the relationship information in $w (in
MARC21).

To test (note that you must either apply the patch for bug 8207 or
manually add a thesaurus to a 5xx linking field in one of the authority
type frameworks):
1. Create a new authority record.
2. Go to the 5xx tab.
3. Click the authority control plugin ellipsis.
4. Do a search for an authority.
5. Select a relationship type.
6. Note that after you choose an authority, that the $w control field
   is automatically populated with the relationship type.

Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
After applying patch for bug 8207, I had been able to follow the test plan step
by step, and get the expected result.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Rebased on master 1 August 2012

12 years agoBug 8207 follow-up: correct typo in authority types
Jared Camins-Esakov [Thu, 23 Aug 2012 13:23:50 +0000 (09:23 -0400)]
Bug 8207 follow-up: correct typo in authority types

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
12 years agoBug 8207 follow-up: correct typo in authority types
Jared Camins-Esakov [Thu, 23 Aug 2012 13:23:50 +0000 (09:23 -0400)]
Bug 8207 follow-up: correct typo in authority types

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
12 years agoBug 8492 follow-up DBRev number
Paul Poulain [Mon, 3 Sep 2012 09:58:46 +0000 (11:58 +0200)]
Bug 8492 follow-up DBRev number

12 years agoBug 8492 [ENH] Restrict OpacSuppression to IP adresses outside of an IP range
Mirko Tietgen [Mon, 23 Jul 2012 23:31:28 +0000 (01:31 +0200)]
Bug 8492 [ENH] Restrict OpacSuppression to IP adresses outside of an IP range

This enhancement extends the OpacSuppression feature with an optional IP address range within which results are _not_ suppressed.

To test

* turn on OpacSuppression (Administration->System preferences->Cataloging) and enter an IP address range in the OpacSuppressionByIPRange field.
* set at least one bibliographic record to suppress=1 (enter '1' in 942$n)
* fully reindex your data
* do an OPAC search that should bring up your suppressed record
* try with IP ranges that match your IP and ranges that don't

Signed-off-by: Marc Veron <veron@veron.ch>
Tested following the scenario above. Works as expected.

12 years agoBug 8525: Followup Don't reset the hz scrollbar to the top
Jonathan Druart [Fri, 3 Aug 2012 13:37:03 +0000 (15:37 +0200)]
Bug 8525: Followup Don't reset the hz scrollbar to the top

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
12 years agoBug 8525: highlight matches on OPAC detail page
Jared Camins-Esakov [Mon, 30 Jul 2012 21:16:07 +0000 (17:16 -0400)]
Bug 8525: highlight matches on OPAC detail page

After doing a search and going to the details page, it can sometimes
be difficult to see exactly *why* a record was returned by a search.
By highlighting matches on the detail page as well as the results
page, we make it much easier to figure that out.

This patch uses a query_desc CGI parameter which is inserted into links
from the results page with javascript. This serves to avoid the
potential privacy implications of a cookie, and ensures that users
without javascript enabled see no change whatsoever.

To test:
1) Do a search (or two) in the OPAC with OpacHighlightedWords on.
2) View a record or two of the results, and ensure that the correct
   words are highlighted.
3) Disable OpacHighlightedWords and do another search (or two),
   this time ensuring that no words are highlighted.

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
12 years agoBug 8593 - Follow-up - Add unique IDs to pending approval markup on staff client...
Owen Leonard [Wed, 8 Aug 2012 12:39:10 +0000 (08:39 -0400)]
Bug 8593 - Follow-up - Add unique IDs to pending approval markup on staff client home page

This patch adds similar IDs to the tags and comments <div>

Signed-off-by: jorgia <jorgia_m_kelsey@hotmail.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
12 years agoBug 8593 - Add unique IDs to pending approval markup on staff client home page
Jorgia Kelsey [Wed, 8 Aug 2012 07:55:29 +0000 (20:40 +1245)]
Bug 8593 - Add unique IDs to pending approval markup on staff client home page

edited the intranet main-tt file. updated "suggestions pending". (w box)

http://bugs.koha-community.org/show_bug.cgi?id=8593
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
12 years agoBug 8646 - prevent the highlighter from going infinite loop
Robin Sheat [Thu, 16 Aug 2012 14:57:29 +0000 (16:57 +0200)]
Bug 8646 - prevent the highlighter from going infinite loop

On certain search queries, for example
http://koha-intra/cgi-bin/koha/catalogue/search.pl?kw=idx&q=ti:book%20
the highlighter starts going into an infinite loop until the browser
decides to kill it.

This patch prevents the bad input going to the highlighter.

It also includes the fix on the OPAC, even though the issue doesn't come
up there. Better to be safe...

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
12 years agoBug 8573 - Translation difficult in picture-upload.tt due to nested sentence in if...
Marc Veron [Fri, 10 Aug 2012 04:20:55 +0000 (06:20 +0200)]
Bug 8573 - Translation difficult in picture-upload.tt due to nested sentence in if/foreach/if/elsif - construction

Text could not be correctly translated due to poor parsing of nested sentences in Pootle.

*Sentences de-nested to have whole sentence in each if /elsif branch
*Cleaned up <li></li> handling: moved closing </li> outside the for each loop to prevent orphaned closing </li>s.
*Changed indentation for better readibility
*Changed WARNING to ERROR because it is an *Error* during upload.
*Wording simplified (for translation).
*In one case added hint to refer to online help (size).

This way text should be easier to be translated in Pootle.

Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
12 years agoBug 8498 - can't specify an hour when specifying due date
Kyle M Hall [Tue, 24 Jul 2012 17:36:09 +0000 (13:36 -0400)]
Bug 8498 - can't specify an hour when specifying due date

With hourly loans Koha can make items due specific hours,
but if you have the specify due date box on the checkout
screen you can't enter an hour/minute. It will always default
to 23:59.

* Add jquery timepicker plugin
* Update jquery ui to include timepicker prerequisite slider
* Set timepicker's default time to 23:59, remove the hard
  coded 23:59 setting from circulation.pl
* Resize input fields such that the entire date and time are
  visible.

Signed-off-by: Marc Veron <veron@veron.ch>
Works as expected, input field displays entire date and time.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
12 years agoBug 8479 Calculate rank irrespective of display option
Colin Campbell [Fri, 20 Jul 2012 09:45:16 +0000 (10:45 +0100)]
Bug 8479 Calculate rank irrespective of display option

Calculation of rank was being skipped based on display
option but it is used in calculating the rank passed
to AddReserve resulting in reserves being created with
null priorities causing them to be skipped in subsequent
processing

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
12 years agoBug 8556 - "Mark seen and continue" not translatable in inventory.tt
Marc Veron [Thu, 2 Aug 2012 09:25:15 +0000 (11:25 +0200)]
Bug 8556 - "Mark seen and continue" not translatable in inventory.tt

Added missing _(...) wrapper in JavaScript in inventory.tt
Additionaly added two blanks to separate buttons (were sticked together without white space)

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
12 years agoBug 8357: UNIMARCslim2OPACDetail.xsl, title without class and too links to views
Fridolyn SOMERS [Fri, 27 Jul 2012 09:27:40 +0000 (11:27 +0200)]
Bug 8357: UNIMARCslim2OPACDetail.xsl, title without class and too links to views

Signed-off-by: Zeno Tajoli <tajoli@cilea.it>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
12 years agoBug 8522 - Markup errors cause problems with customized CSS
Owen Leonard [Mon, 30 Jul 2012 14:43:55 +0000 (10:43 -0400)]
Bug 8522 - Markup errors cause problems with customized CSS

Some includes and templates contained duplicate "header" ids in
the markup. The problem should have come up in routine page
validation, but was obvious when custom CSS was applied.

To test, load any of the affected pages and validate the
generated HTML. There should be no errors about 'ID "header"
already defined." Or, add custom CSS to intranetusercss:

...and confirm that only the topmost menu background is affected.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
12 years agoBug 8550: Z39.50 searches for ISBN/ISSN problematic
Jared Camins-Esakov [Wed, 1 Aug 2012 17:34:33 +0000 (13:34 -0400)]
Bug 8550: Z39.50 searches for ISBN/ISSN problematic

Rather than treating ISBN and ISSN as the same, this patch breaks
them out into separate parts of the query, as well as changing
the truncation attribute to enable right truncation (the correct
behavior for the ISBN field in MARC21, and valid behavior in
UNIMARC).

Signed-off-by: Joseph Alway <jbalway@gmail.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
12 years agoBug 8533 - Non-numeric cardnumbers screw up autoMemberNum
Kyle M Hall [Tue, 31 Jul 2012 12:14:19 +0000 (08:14 -0400)]
Bug 8533 - Non-numeric cardnumbers screw up autoMemberNum

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Removes a warning from mysql:
    Truncated incorrect INTEGER value: 'P13000'

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
12 years agoBug 8575: Expected items count should not include cancelled orders
Julian Maurice [Mon, 6 Aug 2012 12:20:25 +0000 (14:20 +0200)]
Bug 8575: Expected items count should not include cancelled orders

To test:
  1/ create a new basket with 2 orders, one with 1 item, another with 2
     items
  2/ look at booksellers.pl page, you should see that 3 items are
     expected
  3/ cancel the order with 1 item
  4/ refresh booksellers.pl page, it should remains 2 expected items

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Works exactly as designed

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>