Katrin Fischer [Mon, 15 Oct 2012 07:07:50 +0000 (09:07 +0200)]
Bug 3652: [SIGNED-OFF] XSS fixes - follow up
Fixes a typo in the html filter that causes a problem when using the
paging in the OPAC result lists.
(forgot to commit my change when testing the original XSS patches)
Signed-off-by: Magnus Enger <magnus@enger.priv.no>
I triggered the error with this query string:
/cgi-bin/koha/opac-search.pl?idx=kw&q=o'reilly&offset=40&sort_by=author_az
After applying the patch the error is gone.
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Nicole C. Engard [Fri, 12 Oct 2012 01:23:48 +0000 (21:23 -0400)]
Follow up to Bug 8585: add missing word to preference
The preference added in this bug is missing the word
'day(s)'. This patch adds it in.
http://bugs.koha-community.org/show_bug.cgi?id=4118 Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Nicole C. Engard [Thu, 11 Oct 2012 23:52:21 +0000 (19:52 -0400)]
:x
The preference used to read 'loan period by' but it's
actually reducing the checkout period 'to' the number
of days entered in the preference. This patch changes
'by' to 'to'.
Signed-off-by: Marc Veron <veron@veron.ch>
Tiny patch, text change only, text apears as expected.
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Bug 8791: OPAC UNIMARC XSLT details: subject with subfield 3
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
I can reproduce the bug, and confirm that this patch fix it. The issue arises
when $9 come first, and then $3, which is not that usual.
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Magnus Enger [Sun, 23 Sep 2012 10:28:49 +0000 (12:28 +0200)]
Bug 8793 - Fix materialTypeCode/typeOf008 icons for NORMARC XSLT
This patch fixes some issues with icons related to materialtypes in NORMARC:
Remove references to opac-tmpl in the *intranet* NORMARC XSLT files.
Add two new icons to koha-tmpl/intranet-tmpl/prog/img/famfamfam/ and
koha-tmpl/opac-tmpl/lib/famfamfam/
GR.png - Graphical materials
TD.png - Three dimentional objects
Copy PR.png from koha-tmpl/intranet-tmpl/prog/img/famfamfam/ to
koha-tmpl/opac-tmpl/lib/famfamfam/
Rename the XSLT variable materialTypeCode to typeOf008 for increased consistency
between stylesheets.
Make sure the XSLT uses icons that are actually available.
To test:
- No use testing all the different permutations of leader pos. 06 and 019b, I think.
- Set marcflavour = NORMARC and turn on default XSLT for OPAC and Intranet, details
and results.
- Make sure you have a record with something relevant in leader position 6, like
g for movies or c for music
- Check that the icon turns up in results and details, in the OPAC and Intranet
- Toggle DisplayOPACiconsXSLT and check that the results in the OPAC are as expected
Signed-off-by: Mirko Tietgen <mirko@abunchofthings.net> Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
It works: (1) merging's still effective, and (2) two new error messages appear
in staff .po file after update it.
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Kyle M Hall [Wed, 3 Oct 2012 14:49:13 +0000 (10:49 -0400)]
Bug 8869 - Duplicate member check doesn't disable submit button on bottom.
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
I confirm that after applying this patch, the submit button is removed from
patron edit page, avoiding accidentaly clicking on it, without responding to
the question about possible duplicate patron?
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Fridolyn SOMERS [Tue, 2 Oct 2012 14:30:48 +0000 (16:30 +0200)]
Bug 8863: When clearing a patron attribute, they are all cleared
Signed-off-by: Marc Veron <veron@veron.ch>
Tested with a set of 2 additional patron attributes. Cleard both before applying the patch.
Cleared as expected after applying the patch.
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Owen Leonard [Tue, 2 Oct 2012 18:25:26 +0000 (14:25 -0400)]
Bug 8851 - strange blue bar above serials results
Bug 5357 (Subscription search and displays) added an advanced
search form which adds a new interface featured: a collapsible
fieldset with the search form inside. Bug 8851 was filed
because it is not immediately obvious that the search form
is hidden and can be shown by clicking the fieldset's legend.
I contend that this new behavior is unnecessary: In many other
places we put a similar search form in the left-hand sidebar.
This patch amends the template to show the search form in the
main body of the page if no search has been performed. After
searching the form is moved to the sidebar. This keeps the page
consistent with other interfaces and eliminates the confusion
about the collapsed form.
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com> Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Mark Tompsett [Sun, 2 Sep 2012 12:46:03 +0000 (20:46 +0800)]
Bug 8175 - check logs error or displays incorrectly in details.pl
Changed "$item->{'materials'} ne ''" to
"defined($item->{'materials'}) && $item->{'materials'} =~ /\S/"
in if condition to prevent error when it is NULL, and to
properly capture the intent of printing if there is something
visible.
Cases tested include NULL, '0', '', ' ', and 'blah' by using
UPDATE items SET materials=NULL where biblionumber=19158;
where the biblionumber was chosen randomly, because only NULL
was in the items.materials field. The NULL case triggers an
error, but it does display correctly.
The ' ' case displays an apparently empty column, which does not
seem to be the intent of the flag that is being set. This is why
a simple $var check is not sufficient.
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com> Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Owen Leonard [Fri, 28 Sep 2012 14:48:16 +0000 (10:48 -0400)]
Bug 8843 - Cannot export bibliographic records by call number
When building the query for exports by call number the script
has the logic reversed. It tries to select records with call
numbers less than the starting call number and greater than
the ending call number. This should be reversed.
To test, test an export in an unpatched system. An export by
call number will return an empty file. After applying the patch
an export by call number should give valid results.
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Works as expected.
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Owen Leonard [Mon, 24 Sep 2012 19:56:05 +0000 (15:56 -0400)]
Bug 8766 - OPACBaseURL still called as OPACBaseurl in many files
This patch fixes incorrect capitalization of the OPACBaseURL
variable in three templates. The fix can be confirmed in
opac-results.tt by inspecting the link attached to the RSS
icon on the OPAC's search results screen. The same fix is included
in opac-opensearch.tt and search/results.tt but I'm not sure
how you confirm that this change fixes anything, if it does.
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Ivan Brown [Tue, 25 Sep 2012 14:57:43 +0000 (15:57 +0100)]
Bug 7643 - Can't upload and import zipped file of patron images
Fixed problem with re-declaration of $filesuffix
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
patch pushed onto master directly, doesn't merge properly from
new/bug_7643 branch
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.
Chris Cormack [Tue, 9 Oct 2012 01:19:18 +0000 (14:19 +1300)]
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.
Chris Cormack [Tue, 9 Oct 2012 01:11:10 +0000 (14:11 +1300)]
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>
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>
Kyle M Hall [Wed, 29 Aug 2012 12:44:26 +0000 (08:44 -0400)]
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>
Owen Leonard [Tue, 25 Sep 2012 18:28:42 +0000 (14:28 -0400)]
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>
Julian Maurice [Fri, 21 Sep 2012 10:05:19 +0000 (12:05 +0200)]
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>
Mark Tompsett [Tue, 11 Sep 2012 17:25:59 +0000 (01:25 +0800)]
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>
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>
Frédérick [Fri, 3 Aug 2012 17:50:29 +0000 (13:50 -0400)]
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>
Owen Leonard [Thu, 6 Sep 2012 16:31:23 +0000 (12:31 -0400)]
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>
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>
Jonathan Druart [Tue, 14 Aug 2012 15:26:46 +0000 (17:26 +0200)]
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.
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)
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>
Joseph Alway [Thu, 20 Sep 2012 17:39:28 +0000 (12:39 -0500)]
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>
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>
Meenakshi.R [Fri, 15 Jun 2012 05:40:59 +0000 (11:10 +0530)]
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>
Amit Gupta [Mon, 15 Nov 2010 10:53:49 +0000 (16:23 +0530)]
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>
MJ Ray [Fri, 7 Sep 2012 14:17:05 +0000 (15:17 +0100)]
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>
Owen Leonard [Mon, 24 Sep 2012 14:47:27 +0000 (10:47 -0400)]
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>
Owen Leonard [Wed, 26 Sep 2012 12:59:45 +0000 (08:59 -0400)]
Bug 8827 - YUI CSS files no longer found on Yahoo servers
This patch removes the [% yuipath %] variable from the link
to the YUI CSS files in the OPAC and adds a hard-coded path
to the local files.
To test, set your yuipath system preference to "from Yahoo's
servers," clear your browser cache, and view the OPAC. The
style and layout should look the same as if your yuipath
preference were set to "local."
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Fixes broken display.
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
After the changes to YUI path the build process is broken. For testing this I had
to set the build process to ommit the tests as there are some db_dependent test being
called (which failed).
Note: Even when this is fixed, there are still issues with some files missing
dh_install: etc/koha/searchengine/solr/config.yaml exists in debian/tmp but is not installed to anywhere
dh_install: etc/koha/searchengine/solr/indexes.yaml exists in debian/tmp but is not installed to anywhere
dh_install: etc/koha/solr/indexes.yaml exists in debian/tmp but is not installed to anywhere
dh_install: missing files, aborting
make: *** [binary] Error 2
dpkg-buildpackage: error: fakeroot debian/rules binary gave error exit status 2
Sponsored-by: Universidad Nacional de Córdoba Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Please note that debian/rules *must* use tabs. If you have a git hook
that automatically replaces tabs with spaces, please undo those changes.
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Bug 7963 Parallel HTTP requests when checking URLs
Current script check-url.pl checks URL found in 856$u by sending HTTP
requests, one by one. The next request can't be sent before the previous
one get a result, which can be very slow for dead URL. I propose a new
script which send multiple requests simultaneously which improve
drastically URL checking execution time.
This script is based on AnyEvent and AnyEvent::HTTP CPAN modules.
Add new dependencies AnyEvent & AnyEvent::HTTP.
See doc: perldoc check-url-quick.pl
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Owen Leonard [Thu, 23 Aug 2012 15:49:38 +0000 (11:49 -0400)]
Bug 8449 - Improve wording and styling for "cancelled holds" on Holds Awaiting Pickup screen
This patch re-implements and adapts the changes dcook@prosentient.com.au
submitted in a patch which no longer applies. I have changed the
"alert" style messages to "message" style to match the style
which is applied to "hold found" messages elsewhere.
I have also revised the language in a way that I think is more
clear and accurate.
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Mason James [Tue, 8 May 2012 04:59:20 +0000 (16:59 +1200)]
Bug 7589 - tinymce editor broken in .deb packages - in 'en' templates
this patch fixes a glitchy symlink to tiny_mce
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Note that you have to *remove* koha-common then install fresh in order
to recreate the symlink.
VERY IMPORTANT!!! debian/rules MUST USE TABS. USE -n WHEN COMMITING
THIS PATCH, AND DO NOT REPLACE TABS WITH SPACES. Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
David Cook [Tue, 17 Jul 2012 01:33:35 +0000 (11:33 +1000)]
Bug 8454 - Holds to Pull : Show pull list on load. Otherwise, it looks like the pull list is empty.
Currently, when you click "Holds to pull" from the Circulation menu, the only thing that you see is a white screen and a side navigation bar that says "Refine Results".
Since there appear to be no results to refine, the holds to pull list appears completely empty. Staff have to know to click "Submit" on the "Refine Results" form to get anything.
I propose that we have the "run_report" flag set to ON for the initial load. The report uses the default 2 days mentioned in the "Refine Results" form, so there is continuity across the board.
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com> Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
David Cook [Tue, 17 Jul 2012 01:33:35 +0000 (11:33 +1000)]
Bug 8454 - Holds to Pull : Show pull list on load. Otherwise, it looks like the pull list is empty.
Currently, when you click "Holds to pull" from the Circulation menu, the only thing that you see is a white screen and a side navigation bar that says "Refine Results".
Since there appear to be no results to refine, the holds to pull list appears completely empty. Staff have to know to click "Submit" on the "Refine Results" form to get anything.
I propose that we have the "run_report" flag set to ON for the initial load. The report uses the default 2 days mentioned in the "Refine Results" form, so there is continuity across the board.
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com> Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Bug 8744: Thesaurus in authorities should not lock fields
Although fields in the authority editor should support thesaurus
control, they should never be locked, as authority records commonly
refer to other records that may not be in use locally (and therefore
might not be in the authority file).
Test plan:
1) Make sure a 5xx field in one of your authority frameworks is
thesaurus-controlled.
2) Note that you cannot edit the field directly.
3) Apply patch.
4) Note that you can now edit the field irectly.
Signed-off-by: wajasu <matted-34813@mypacks.net> Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>