Commit graph

17159 commits

Author SHA1 Message Date
Paul Poulain
7886297f05 Merge remote-tracking branch 'origin/new/bug_7751' 2012-10-12 12:23:08 +02:00
Nicole C. Engard
65accc367b Bug 7751: Decrease loan length with many holds
This patch merges the three preferences in to one sentence
to make it clear that they are all linked together and to
eliminate confusion that can come by having them as
individual preferences.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
2012-10-12 12:21:17 +02:00
Chris Cormack
a4bf495f3b Bug 3652 XSS vulnerability in facets
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Confirmed bug with test plan on the bug and checked that
problem is fixed after applying the patch and that facets
still work.
2012-10-12 12:17:51 +02:00
Chris Cormack
2e30600a58 Bug 3652: XSS vulnerability in page numbering
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Confirmed the problem with test plan on the bug and checked that
paging works correctly after the patch.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-12 12:17:47 +02:00
Chris Cormack
53309fab4b Bug 3652 : [SIGNED-OFF] [SECURITY] XSS vulnerability
Signed-off-by: Magnus Enger <magnus@enger.priv.no>
Works as advertised. After applying the patch, <blink>fish</blink>
is displayed on the page, but no blinking occurs.

Signed-off-by: Magnus Enger <magnus@enger.priv.no>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-12 12:17:41 +02:00
Paul Poulain
6eeb518042 Merge remote-tracking branch 'origin/new/bug_8636' 2012-10-12 11:55:14 +02:00
Jared Camins-Esakov
54d56e303a Bug 8636: Add dependency on Test::Deep
The test t/db_dependent/Koha.t uses Test::Deep to compare data
structures, but that dependency was not listed for the installer.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-12 11:54:19 +02:00
Marc Veron
802dd7baf5 Bug 8812 - Staff Client: Patron search should display branch name instead of branch code in results table
Patch to display branchname instead of branch code.

Signed-off-by: Delaye Stephane <stephane.delaye@biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-11 11:17:06 +02:00
6a4cbbba60 Bug 8633 Manage OPAC alternate templates
Modify /misc/translator/translate script in order to manage properly alternate
OPAC templates.

To test it with new 'ccsr' template:

- Create the .po file:

  ./translate create fr-FR

  Result: existing .po files are not modified. A new fr-FR-opac-ccsr.po file is
  available.

- Install all templates :

  ./translate install fr-FR

  Result: A new koha-tmpl/opac-tmpl/ccsr/fr-FR directory contains translated
  templates.

- Update .po files:

  ./translate update fr-FR

  Result: fr-FR .po files are update, include fr-FR-opac-ccsr.po

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-11 11:15:07 +02:00
Nicole C. Engard
0c75d667d5 Bug 8831: relabel gstrate with Tax rate
This patch changes gstrate to Tax rate to match the standard set
on all other acq pages.

Signed-off-by: Marc Veron <veron@veron.ch>

Small text change. Label displays as expected.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-10 18:00:02 +02:00
a7ef547ec9 Bug 8700 - RESERVESLIP fields not being replaced correctly
The slip RESERVESLIP is not replacing fields correctly.
C4::Reserves::ReserveSlip calls C4::Letters::GetPreparedLetter,
and passes the $reserve hashref to it for each table except branches
( which is passed the branchcode ). The problem is, if you pass a
hashref for a table, it uses that hashref for the replacing, rather
than looking up the data from the database.

Fixed by passing the correct keys for each of the tables requested.

Signed-off-by: Marc Veron <veron@veron.ch>

Tested following the test plan.
Could reproduce the bug.
After applying the patch slip printed as expected.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-10 17:58:30 +02:00
d51f822a5b Bug 8820 - Don't show orders table if there are no orders
This page removes the "basket empty" message in favor of
hiding the orders table altogether when a basket has no
orders. This patch also moves the "Show all details"
checkbox under the "Orders" heading to associate it more
closely with the area it affects.

Other textual changes:

- Correcting capitalization according to coding guidelines
- Correcting terminology (basket group instead of basketgroup)
- Replacing the "Order Details" heading with the more
  succinct "Orders"

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-10 17:51:06 +02:00
Julian Maurice
39ad9abb74 Bug 8801: Add menu entry to delete items in batch
In catalogue/detail.pl you can now select "Delete items in batch" in
"Edit" menu. You are redirected to batchMod.pl for chosing which items
have to be deleted.
You need to have 'tools.items_batchdel' permission to see this menu
entry.

Signed-off-by: Marc Veron <veron@veron.ch>

Works as expected.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-10 17:07:44 +02:00
Mark Tompsett
63f8cb0225 Bug 8742 - Example uses perl 5.8 in Makefile.PL
Changed hardcoded path for a programmatic one. Basing it on:
  grep /\/usr\/share\/perl\//, @INC;
And doing a:
  push @version, ('/usr/share/perl/5.10') if !$version[0];
For a reasonable default otherwise. No more references to
  /usr/share/perl/5.8
hardcoded into the output.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-10 17:03:25 +02:00
Adrien Saurat
081cb47d26 Bug 8441: hides MODS export by default in French install
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-10 16:56:09 +02:00
Paul Poulain
a7714ed6c5 Bug 7873 follow-up s/tab/4spaces/ 2012-10-09 18:03:05 +02:00
Adrien Saurat
98d8e1609a Bug 7873: fixes sort on Title in OPAC basket
Signed-off-by: Marc Veron <veron@veron.ch>

Reproduced wrong title sort without patch.
Sort works as expected with patch.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-09 17:56:07 +02:00
Paul Poulain
238aa44379 Merge remote-tracking branch 'origin/new/bug_8741' 2012-10-09 17:55:33 +02:00
d5cf28406b Bug 8741 - crontab.example missing username, fails in some systems
Simple addition of the koha user to the sample cron file. Might help non-tech
users to get things like incremental indexing to work.

Sponsored-by: Universidad Nacional de Córdoba
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-09 17:55:12 +02:00
Paul Poulain
2f7a787556 Bug 8570 follow-up removing tabs & improving indentation
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-09 17:54:42 +02:00
Paul Poulain
09846ccfbd Bug 8570 follow-up removing tabs & improving indentation 2012-10-09 17:34:58 +02:00
Frédérick
9d38ff1e5f Bug 8570 - Add pagination to the Z39.50 results page
Add paginations to the Z39.50 search results.

http://bugs.koha-community.org/show_bug.cgi?id=8570
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-09 16:23:23 +02:00
94eae1df00 Bug 2930 [REVISED] Put other name on checkout screen
This patch adds other name to the include which is used
to display patron names and adds this include in several
places where it can be used in place of direct output.

The patron-title include has been modified to handle the
two possible variable scopes throughout patron-related
templates. This is a hack similar to having both
circ-menu.tt and circ-menu.inc, but keeping both in the
same file.

Changes to some scripts were necessary to make the
othernames variable available to the include.

This patch also corrects some <title> tags and fixes
some incorrect capitalization (see Bug 2780).

To test, view each of the pages affected by these
template changes and confirm that the patron's name
displays correctly, including their "other name."

Signed-off-by: Marc Veron <veron@veron.ch>
Followed instructions above, works as expected.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-09 12:23:39 +02:00
Mark Tompsett
3779dcd085 Bug 8772 - Uninitialized variable triggers error log entry in smart_rules.pl
Changed declartion from:
  my $op = $input->param('op');
to
  my $op = $input->param('op') || q{};
in order to give an empty string default preventing error
logs from filling needlessly.

Signed-off-by: Marc Veron <veron@veron.ch>

The patch removes warnings like:
Use of uninitialized value $op in string eq at...

However there is one more warning, but it is not related to $op (addressed by this patch):
smart-rules.pl: Use of uninitialized value in string ne at .../admin/smart-rules.pl line 388.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-09 11:52:07 +02:00
Paul Poulain
56553964a6 Bug 8652 follow-up adding more tests
Adding 3 tests to check for the new parameter of output_pref sub
the 3rd parameter, if 1, result in only returning the date (not the time)
2012-10-09 11:47:37 +02:00
Jonathan Druart
9f3ceb1b00 Bug 8652: Followup: add a default value for date_from
This patchis add a third parameter to the output_pref routine. It allows
to specify the output string with or without the hours and minutes
(%H:%M)

Signed-off-by: MathildeF <mathilde.formery@ville-nimes.fr>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-09 11:27:42 +02:00
Jonathan Druart
0f044d6c26 BUG 8652: Add a default value for the lateorders
- By default, the date from value is the today's date
- Replace C4::Dates with Koha::DateUtils

To test:
Check the page displays the late orders by default.
Add values for 'date from' and/or 'date to' and/or delay.
The date interval is based on the estimated delivery date and the delay
param is based on the closed date.
2012-10-09 11:27:39 +02:00
Frédérick Capovilla
37340e3718 Normalize records imported from Z39.50 servers.
Some Z39.50 server may use the MARC-8 encoding, which uses separated
diacritics. By forcing a normalization, all imported records will have
combined diacritics.

Records with separated diacritics might not show up in Zebra searches if
the search terms use accented characters.

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

http://bugs.koha-community.org/show_bug.cgi?id=8610
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
checked it still works after the patch with UNIMARC and BNF server (that
provide utf-8 records)
2012-10-08 18:46:56 +02:00
Jared Camins-Esakov
e883a0f065 Bug 8829: Fix authority importing
A subroutine was not being imported by C4::ImportBatch (ironic, no?)
so this patch makes the call fully-qualified. This patch also cleans
up two warnings in C4::Auth that are raised when logged in as the
database user.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-08 18:06:55 +02:00
Joseph Alway
b769a3cda0 Bug 8680 Z39.50 ISBN Search is problematic and there is a missing ISSN field.
The changes here are duplicate fixes.
The cataloguing directory had the same bugs as the acqui directory.
The bugs in the cataloguing files of the same name were fixed in Bug 8550.
The bugs in the acqui files had not been fixed.
This will fix Bug 8680 which is in the Acquisitions Module.

Changes to the z3950_search.pl file:
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).

Changes to the z3950_search.tt file:
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.

Signed-off-by: Marc Veron <veron@veron.ch>

Works as expected.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-08 17:56:36 +02:00
17298c2042 Bug 6037 [Follow-up] Invalid markup, missing breadcrumbs on Keyword to MARC Mapping page
Extra </div> returned. Killing it again.

After applying the patch the validator should only warn of
invalid "autocomplete" attribute.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
2012-10-08 17:11:12 +02:00
Paul Poulain
d977d0f826 Bug 5409 follow-up DBRev number 2012-10-08 17:03:37 +02:00
Meenakshi.R
a427f95188 Bug 5409 - Call number is not show on Opac search result page.
Fixes Bug 5409, Modified the definition of  'OPACItemsResultsDisplay' in systempreferences and changed the code in opac-search.pl file for 'OPACItemsResultsDisplay'.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-08 17:00:38 +02:00
Meenakshi.R
907fac80d3 Bug 5409 - Call number is not show on Opac search result page.
Fixes Bug 5409, Set the syspref value to 1 if it is itemdetails and 0 if it
is statuses, leaving it alone if it is already 1 or 0 and change the type
of the syspref to YesNo.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-08 17:00:32 +02:00
Amit Gupta
8f06d479a9 Bug 5409 - Fix call number not shown on opac search result page
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-08 17:00:25 +02:00
Fridolyn SOMERS
f941dc341a Bug 8481: Items table is showing in opac-MARCdetail.pl but not in MARCdetail.pl
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-05 17:40:22 +02:00
Julian Maurice
c0bd20db7b Bug 8850: Export CanItemBeReserved in C4::ILSDI::Services
Signed-off-by: Matthias Meusburger <matthias.meusburger@biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-05 17:39:21 +02:00
Julian Maurice
2895bb08cf Bug 8850: Export CanBookBeReserved in C4::ILSDI::Services
Signed-off-by: Matthias Meusburger <matthias.meusburger@biblibre.com>
2012-10-05 17:39:18 +02:00
MJ Ray
fffcf9b9d3 circ/circulation.pl: force issuedate to a string to fix bug 8738
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>

Installed DataTime version 0.53, verified the error occurs.
Applied patch, verified patch removes the error.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-05 17:37:48 +02:00
1749d1da56 Bug 8811 - can't run report after saving
The fix for Bug 7993 removed some lines from guided_reports.pl
which passed a new report's name and id to the template after
saving. For some reason this was removed, making it impossible
to run or edit a new report immediately after saving.

This patch adds back that part of the script which passes those
variables to the template. Before this patch, after adding a new
SQL report you would not see a "run this report" link. The
"run this report" and "edit" buttons in the toolbar would not
work. After applying the patch these should work.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Tested creating reports and was able to run them after saving.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-05 17:25:18 +02:00
Marc Veron
510a7d7347 Bug 8796 - patron cards not starting on designated card
Better wording for the meaning of 'Position' to prevent mistakes on behaviour.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-05 17:16:01 +02:00
40540ce2d1 Bug 8860 - can't merge if you don't have fast cataloging permissions
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-05 16:51:32 +02:00
Fridolyn SOMERS
bd8f01fec0 Bug 8497: Strange behavior when modifying the timeout system preference
Signed-off-by: Owen Leonard <oleonard@myacpl.org>

Tested standard login, patron auto-complete, and system preferences.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-05 16:49:24 +02:00
Marc Veron
624957bf21 Bug 8810 - Opac: Cart should display branchname instead of branchcode
In Opac, the cart should display the branchname instead of the branchcode.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-05 16:25:50 +02:00
Jonathan Druart
96e1c5d80b Bug 8370: Change term issues (smart-rules)
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-05 16:12:41 +02:00
Paul Poulain
4f44847c11 Merge remote-tracking branch 'origin/new/bug_8233' 2012-10-05 12:00:06 +02:00
e11d31cb2c Bug 8233 - SolR-related /etc/ files break deb building
Remove them using debian/rules when building .deb packages until
we figure out what to do with them in a .deb install.

To do this I ran the build script like this:

sudo DEB_BUILD_OPTIONS=nocheck ./debian/build-git-snapshot -distribution precise -D precise -r ~/ubuntu -v 3.9.0-046~git -d

Sponsored-by: Universidad Nacional de Córdoba
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
2012-10-05 11:59:50 +02:00
Paul Poulain
e5a24bbbdd Merge remote-tracking branch 'origin/new/bug_7621' 2012-10-05 11:58:28 +02:00
Nicole C. Engard
337fbb5e98 Bug 7621: Follow up to clarify preference language
This patch changes strings only, not functionality. It will
clarify the meaning of the  AgeRestrictionMarker preference.

Signed-off-by: Marc Veron <veron@veron.ch>

Better wording of preference instructions. No code echange involved.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-05 11:58:12 +02:00
Paul Poulain
81ee945a58 Merge remote-tracking branch 'origin/new/bug_8382' 2012-10-05 11:56:39 +02:00