Commit graph

17301 commits

Author SHA1 Message Date
8c6da900f4 Bug 8872: Changes for opac-showmarc
Simplifies template (eliminating opac-bottom include).
Makes encoding for card and html view more consistent with approach in Templates module.
Rearranges a few lines in script for consistency and performance.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Passed-QA-by: Mason James <mtj@kohaaloha.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-06 07:29:01 -05:00
98c6639aa9 Bug 8872 Add UTF-8 encoding to opac xslt files
Does also fix head and body tags in MARC21slim2OPACMARCdetail.xsl.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Passed-QA-by: Mason James <mtj@kohaaloha.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-06 07:28:33 -05:00
d8ca248848 Bug 8872: Add UTF-8 encoding to intranet xslt files
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Passed-QA-by: Mason James <mtj@kohaaloha.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-06 07:27:39 -05:00
Jared Camins-Esakov
62ce0ba1b0 Merge branch 'bug_8842' into 3.12-master 2012-11-05 08:41:50 -05:00
Paul Poulain
4e5922b387 Bug 8842 fix Plack scoping for holidays
the internal sub add_holiday uses some variables that are defined in the main script, usual fix

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Passed-QA-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-05 08:41:17 -05:00
Jared Camins-Esakov
f47ad199a2 Merge branch 'bug_8949' into 3.12-master 2012-11-05 08:39:58 -05:00
Paul Poulain
039a1e96c1 Bug 8949: Trying to view help on a page without any help results in a nasty error
The problem was probably a side effect of bug 7038

I've checked that things are OK in translated languages.

Test plan:
 * open help on a page with help in english (mainpage.pl)
 * open help on a page with help in another language (mainpage.pl)
=> you'll see the online help, as usual
 * open help on a page without help in english (acqui/addorderiso2709.pl)
 * open help on a page without help in another language (acqui/addorderiso2709.pl)
=> you'll get the "oops, no help available, sorry", no more the Perl error

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Passed-QA-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-05 08:39:23 -05:00
Paul Poulain
7002e5d86a Bug 8490: fix Plack error when creating label layout
This patch fixes "Error message "Can't bless non-reference value at
/home/pi/koha/C4/Creators/Layout.pm line 111." when trying to add a
label layout while using plack."

The $layout_id variable is set to 5001 on my setup. And 5001 is the Unix
port where I run Plack. WTH is this value stored in this variable ?
Because of
> my $layout_id = $cgi->param('layout_id') || $cgi->param('element_id') || $ARGV[1] || '';
in label-edit-layout.pl

Removing $ARGV[1] solves the problem
Also removing $ARG[0] because I also don't think it's useful

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed off after confirming with Chris Nighswonger that these scripts
were not intended to be run from the command line. Works as promised.

Passed-QA-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-05 08:35:06 -05:00
Paul Poulain
b6b6329435 Bug 8904: fix Plack scoping for overduerules.pl
There are 2 Plack scoping errors in tools/overduerules.pl:
the local sub blank_row require that @rule_params and input are global

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Passed-QA-by: Mason James <mtj@kohaaloha.com>y
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-04 19:58:33 -05:00
5011479de3 Bug 8826 - Initialization of hash triggers error log entries - Followup
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-02 12:11:52 -04:00
Mark Tompsett
bf4a7bd65c Bug 8826 - Initialization of hash triggers error log entries.
Changed:
our %renew_failed = {};
To:
our %renew_failed = ();
This prevents an error log about Reference found where
even-sized list expected.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-02 12:11:51 -04:00
Jared Camins-Esakov
369c5382a4 Merge branch 'bug_8945' into 3.12-master 2012-11-02 12:00:32 -04:00
Nicole C. Engard
be0f16aaac Bug 8945: Update Tags help files for 3.10
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-02 11:58:58 -04:00
Nicole C. Engard
c075970daa Bug 8945: Tools Help Files
This patch updates the help files for 3.10 in the Tools
section and adds a help file for the patron modification tool

Signed-off-by: Owen Leonard <oleonard@myacpl.org>

Signed off patch includes one small fix:
Profilemarcfields -> Profile MARC fields
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-02 11:58:57 -04:00
Nicole C. Engard
fbc7b11d5d Bug 8945: Update lists help for 3.10
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-02 11:58:56 -04:00
Nicole C. Engard
e15ea30899 Bug 8945: Update suggestion help file for 3.10
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-02 11:58:55 -04:00
Nicole C. Engard
0d0d5c48bc Bug 8945: Serials Help Files for 3.10
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-02 11:58:54 -04:00
5b8e1548e4 Bug 8804 [Revised] Quiet errors in the log from Auth.pm
Found three cases where variables were being
referenced which did not (in each case) exist. Adding
checks for those variables' existence.

Errors appeared when logged in and viewing a detail
page in the OPAC.

Revision simplifies logic as per RM suggestion.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-01 16:57:19 -04:00
Jared Camins-Esakov
4db3611ee6 Merge branch 'bug_7455' into 3.12-master 2012-11-01 10:31:14 -04:00
Fridolyn SOMERS
9b55ebff65 Bug 7455: Authority subfields are cloned in the wrong field (follow-up 3)
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Passed-QA-by: Mason James <mtj@kohaaloha.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-01 09:50:56 -04:00
Fridolyn SOMERS
7cf5e2e954 Bug 7455: Authority subfields are cloned in the wrong field (follow-up 2)
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Passed-QA-by: Mason James <mtj@kohaaloha.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-01 09:50:53 -04:00
Fridolyn SOMERS
eabe698705 Bug 7455: Authority subfields are cloned in the wrong field (follow-up)
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Passed-QA-by: Mason James <mtj@kohaaloha.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-01 09:50:50 -04:00
Fridolyn SOMERS
2f860e36f6 Bug 7455: Authority subfields are cloned in the wrong field
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Passed-QA-by: Mason James <mtj@kohaaloha.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-01 09:50:32 -04:00
Jared Camins-Esakov
9bcc1f9095 Merge branch 'bug_8931' into 3.12-master 2012-11-01 09:32:53 -04:00
1ce2386e36 Bug 8931 - submit buttons have blue background
This patch specifies a transparent background for fieldsets
and divs with the class "action," which are typically containers
for the submit/cancel actions.

For testers, a good example page to view is the "set library" page.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Passed-QA-by: Mason James <mtj@kohaaloha.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-01 09:32:15 -04:00
Robin Sheat
ba8be1f2f9 Bug 8636 - add Moose dependency to the dependencies
Koha::SearchEngine requires moose, but it wasn't declared as a
dependency.

Also update the debian/control dependencies to match the current state
of the requirements.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Passed-QA-by: Mason James <mtj@kohaaloha.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-01 09:25:15 -04:00
Jared Camins-Esakov
f352b05610 Bug 8846 conflict resolution: correct path
The test was moved since the original patch was written, making the
revised test fail. This patch corrects the mocked template patch so that
the test will pass.

To test:
1) Before applying patch, run
   `prove t/db_dependent/SuggestionEngine_ExplodedTerms.t`
2) Note that it fails.
3) Apply patch.
4) Run `prove t/db_dependent/SuggestionEngine_ExplodedTerms.t`
5) Note that it passes.
6) Celebrate.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2012-11-01 08:41:30 -04:00
Jared Camins-Esakov
e2a702653d Bug 8846: Exploded Terms test sneakily uses database
Even though there is no need for anything stored in the database for the
test, C4::Templates requires the database and a koha-conf.xml. The
solution is to mock all database- and koha-conf-using routines.

To test:
1) Stop MySQL
2) Unset KOHA_CONF
3) Run test

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-01 08:41:29 -04:00
Lyon3 Team
43ba461f39 Bug 8978: Patron's dateexpiry erroneously updated when in UnwantedField
If dateexpiry field was absent because it has been included in
UnWantedField syspref list, the script assumed that the date has
been forgotten and updated it when clicking on 'save' button.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Passed-QA-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-10-31 18:33:44 -04:00
Jared Camins-Esakov
ea9e867a59 Merge branch 'bug_8982' into 3.12-master 2012-10-31 17:22:35 -04:00
MJ Ray
80c75dcc8f Bug 8982 make koha-create accept --database option
Signed-off-by: Robin Sheat <robin@catalyst.net.nz>
Passed-QA-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-10-31 17:20:22 -04:00
f191782d98 Bug 8707 - tags always say approved
Template scope error caused an incorrect state on the
approval/rejection buttons when viewing rejected tags.

To test, go to Tags and view the list of rejected tags.
In the "Actions" column, the "rejected" button should be
greyed out, and the "approve" button active.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Passed-QA-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-10-31 16:48:24 -04:00
Jared Camins-Esakov
5994dd21f7 Correct a typo in docs/history.txt and add 3.6.x releases 2012-10-31 15:10:02 -04:00
715c52977a Bug 8980 - Untranslatable strings in modborrowers.pl
This patch removes the declaration of interface labels
from the script and puts it in the template where the
labels can be translated. The labels have been modified
to match those used on the patron entry form.

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-30 18:28:35 +01:00
Fridolyn SOMERS
678c7c4230 Bug 8936: Search RSS feeds does not show there items when subscribing in Firefox
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-30 18:24:54 +01:00
Fridolyn SOMERS
d12f4e09ee Bug 8973: HTML and URL escape missing in OPAC templates
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-30 18:15:22 +01:00
Jared Camins-Esakov
510a2397fb Bug 8665 follow-up: add missing line to XSLT
The DOM transformer was missing a line from a previous development,
resulting in the MARC21 authorities DOM indexing stylesheet being
regenerated with a missing line. This patch readds the missing line
to the transformer, and provides the corrected authority-zebra-indexdefs.

Signed-off-by: Elliott Davis <elliott@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-29 19:12:41 +01:00
Jared Camins-Esakov
7d9b4d58e3 Bug 8665: DOM indexing fails to index some bib records
Use a user-specified field for z:id.

This patch also fixes an excess space before the index in the MARC21
biblio index definitions, which someone fixed in the generated file
but not in the source file it should have been fixed in.

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Elliott Davis <elliott@bywatersolutions.com>
2012-10-29 19:12:38 +01:00
Maxime Pelletier
5c7fae8e89 Bug 8966 Koha::Calendar::is_holiday truncates the date
* Create a local copy of the date instead of calling truncate directly on the date
* Add a test to properly test that the issue is fixed

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-29 18:27:04 +01:00
Mark Tompsett
f47dceb151 Bug 8749 - Missing Ubuntu library files in ubuntu.*.packages
Added:
   libtemplate-plugin-htmltotext-perl	install
into the four files, as this is available in the
debian.koha-community.org repository.

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-29 18:17:58 +01:00
Nicole C. Engard
b141a35692 Bug 8961: Fix typo in offline circ help
Signed-off-by: Marc Veron <veron@veron.ch>

Tiny typo fix in HTML text.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-29 12:36:21 +01:00
Magnus Enger
000605e939 Bug 8941 - Make title display properly for NORMARC OPAC detail view
Authors and materialtype were displayed to the right of the title.
This patch simly adds class="title" to the h1 that holds the title.

To test:
- Set marcflavour = NORMARC
- Check a detail view in the OPAC and see that the display is wrong
- Apply the patch
- Check that the detail view now looks good

Signed-off-by: Mirko Tietgen <mirko@abunchofthings.net>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-28 19:39:44 +01:00
Jared Camins-Esakov
1d5b614d8b Bug 8823: CatalogModuleRelink Creates Multiple Links between Bib and Auth record
On 3.8.x, it was possible for multiple automatically generated
authorities to be linked to a single heading. This patch deletes
previous links from headings prior to linking them to
automatically-generated headings. This patch also corrects a
potential problem wherein multiple authorities might be generated if
a record is edited repeatedly in quick succession. The latter problem
exists on Master and 3.6.x as well, and the code that corrects the
multiple linkages is equally applicable if seemingly unnecessary.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-28 19:27:27 +01:00
7f628b12d4 Bug 8253 - fix fine doubling, when upgrading from 3.6 to 3.8 - Add de-duplication script
This script will remove these duplicate fines. To use, repeatably run this
script until there are no more duplicates in the database.
(fix_accountlines_rmdupfines_bug8253.pl)

Duplicate fines would happen if you upgraded to a 3.8 version that does not have the
bug8253 patch, and the misc/cronjobs/fines.pl is run. In 3.8 an upgrade to a more
granular date/time was not addressed for pre-existing fine entries and this script
removes the resulting duplicates. It also intelligently preserves the amount outstanding
for payments already applied. If your version already had the bug8253 patch at the time
of the upgrade, duplicate fines should not have been generatd.

Signed-off-by: wajasu <matted-34813@mypacks.net>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-28 19:12:30 +01:00
18297b04c1 Bug 8253 - Fine doubling
Provides a fix that during database upgrade, fines are correclty
formatted. Once the misc/cronjobs/fines.pl is run in the
upgraded database, it will not result in duplicate fines being
generated.

Signed-off-by: wajasu <matted-34813@mypacks.net>
2012-10-28 19:12:27 +01:00
Jared Camins-Esakov
9ea2bb7eca Bug 8947: [SIGNED-OFF] XSLT fallback logic backwards
The logic for the XSLT fallback was backwards, which meant that
non-English installations of the CCSR theme were unable to use XSLT
stylesheets. This patch corrects the logic.

To test:
1) Switch to the ccsr OPAC theme.
2) Switch to a language other than English for the OPAC.
3) Turn on the default XSLT stylesheets for the OPAC.
4) Do a search or view a record that would result in something being
   displayed with XSLT. This will work after the patch, but not before.

Signed-off-by: Magnus Enger <magnus@enger.priv.no>
Works as advertised!

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-26 17:41:08 +02:00
Paul Poulain
be3441d648 Bug 8939 follow-up welcome to Robert Williams 194th contributor
also fixing Mathieu Saby number (193th instead of a duplicate 192nd)
2012-10-26 17:31:31 +02:00
Robert Williams
95b5e2f94e Bug 8939 : Fines being charged during the grace period
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-26 17:26:07 +02:00
Mathieu Saby
44e65ad514 Bug 8958: Make facets more UNIMARC compliant (revision 1)
Suppressions : I suppressed some indexes not existing in Unimarc : 603, 502,
504

Corrections :

  - Places : 651 was Marc21 => I put the right value (607)
  - Topics : 600a => 600ab (name/surname) ;  604a => 604at (author/title)

To test, take a record with 607, 600ab, 601ab, 604at, do a research matching
this record, and check if facets looks nicer that before...

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

Works as described. 607 for Places is very useful! Other tweakings make sense.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-26 17:16:50 +02:00
Jared Camins-Esakov
ae977a9cfd Bug 8914: Blank search that returns invalid authorities fails under Plack
When doing a search with no terms for the default authority type under
Plack, you will get a segfault if it returns any records that do not
have any authority type. As far as I can tell, this cannot be reproduced
under CGI/Apache.

To test:
Confirm that you don't get an error if you click the Submit button in
the authorities sections in the staff client and OPAC without entering
a term or changing the authority type.

You may or may not be able to reproduce the problem prior to applying
the patch, but that is the only situation in which I managed to trigger
it.

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-25 18:41:46 +02:00