Jonathan Druart [Mon, 26 Aug 2013 15:37:14 +0000 (17:37 +0200)]
Bug 10684: (follow-up) adjust how undecodable records are logged
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 82233bae255ccf7be85fe4f5b93c5667c6e82835) Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Kyle M Hall [Mon, 5 Aug 2013 13:28:19 +0000 (09:28 -0400)]
Bug 10684: make sure that Koha search does not dies on undecodable records
When a record fails to decode during a search, Koha dies with an error.
Koha should ignore bad records and continue on ( and log the error ).
An example of a record that Zebra will happily ingest but which MARC::Record
doesn't like is one that contains a punctuation character in a tag label.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz> Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com> Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 6a78fad4e038b65eba5d39230f5b70d92ed7edcf) Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Galen Charlton [Thu, 14 Nov 2013 16:50:37 +0000 (16:50 +0000)]
Bug 10684: add regression test
This patch adds a regression test for Koha's ability
to gracefully handle records that Zebra will index but
which MARC::Record won't parse. In particular, MARC::File::USMARC
croaks on records that contain non-alphanumeric characters in the
tag name.
To test:
[1] After applying this test, run prove -v t/db_dependent/Search.t
The test script will die when it gets to the regression test.
[2] After applying the main patches that fix the bug, the test
script should pass.
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 7e6364baee47581615eca0cad9de100afdb49dc0) Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Sophie Meynieux [Tue, 13 Aug 2013 16:14:21 +0000 (18:14 +0200)]
Bug 10720: fix issue that prevented use of HTML tags in overdue notices
Substitution term in overdue notices shouldn't be removed if they don't match.
It prevents use of HTML in notices to use with CSS.
Test plan :
- define an overdue notice containing some valid substitution terms + some valid html tags (<strong> or <div class="my class" to use with a css
- find a borrower with overdues that trigger this notice
- run overdue_notices.pl -html <directory>
Without patch, your html tags are missing in your html file
With the patch, they are present and can be used with a css to generate a formatted pdf file.
If you add some invalid substitution term, with the patch, they are still in the final letter, but the warn in the log helps you to correct your notice template.
Signed-off-by: Srdjan <srdjan@catalyst.net.nz> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 394be84dcd65a4569d0467bc12b99dbd6341fc43) Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Colin Campbell [Tue, 15 Oct 2013 14:09:08 +0000 (15:09 +0100)]
Bug 11054: Specify UTF-8 encoding when creating a child record
When the only non-ascii characters in a new child record
are latin + diacritic in the range covered by Latin-1 they
are not being added to a new child record correctly encoded.
Explicitly setting the record's encodiing ensures that
they are interpreted correctly.
see "Unicode Bug" in perldoc perlunicode for background on
why these characters are special
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Works well. No koha-qa errors.
Same test as before
1) with a record with diacritics in author/title,
2) press new child record, on new record 773adt
with mangled accents
3) Apply patch
4) Repeat 2, now good results
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Passes all tests and QA script.
Tested with a record containing umlauts in the title,
$t was empty before and umlauts in $a mangled.
After applying the patch fields are correctly filled and
diacritics display correctly.
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 8861c8dda545bddb3a4d28abce77c53c173e00d0) Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Galen Charlton [Sun, 20 Oct 2013 20:55:06 +0000 (20:55 +0000)]
bug 10016: munge history in SCO to discourage resubmitting user login
This patch uses history.replaceState (introduced in HTML5) to manipulate
the browser history to encourage returning to the SCO patron barcode
form if the back button is used.
Note that a side effect of this patch is that if the user uses
the help link, they will be prompted to enter their barcode
again. It may be better to put the help inline with the rest
of the SCO forms.
To test:
[1] Start a web-based self-check session.
[2] Enter a patron barcode.
[3] Allow the self-check session to time out.
[4] Use the back button. You should get the patron barcode
entry form; you should not be prompted to resubmit form input.
[5] Enter a patron barcode, perform some transactions, then
use the finish button.
[6] Next, use the back button. You should get the patron barcode
entry form.
Signed-off-by: Galen Charlton <gmc@esilibrary.com> Signed-off-by: Ed Veal <ed.veal@bywatersolutions.com> Signed-off-by: Brendan Gallagher <brendan@bywatersolutions.com> Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 58d469ed4d6891cddf6a5ef35d21caa553dfb8ae) Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Deleted the sco-main.tt file for the bootstrap theme from the patch.
Galen Charlton [Sun, 20 Oct 2013 17:13:22 +0000 (17:13 +0000)]
Bug 10016: force zero browser-side caching of SCO pages
This patch makes the web-based self-check module pages
specify that no browser (or proxy caching) occur at all.
This prevents a security issue where letting the SCO session time out,
then hitting the back button allowed one to view the previous
patron's session.
This patch adds an optional fifth parameter to output_with_http_headers(),
and output_html_with_http_headers(), a hashref for miscellaneous
options. One key is defined at the moment: force_no_caching, which if
if present and set to a true value, sets HTTP headers to specify no
browser caching of the page at all.
To test:
[1] Start a web-based self-check session and optionally perform
some transactions.
[2] Allow the session to time out (it may be helpful to set
SelfCheckTimeout to a low value such as 10 seconds).
[3] Hit the back button. You should not see the previous patron's
self-check session.
[4] Verify that prove -v t/Output.t passes.
Signed-off-by: Galen Charlton <gmc@esilibrary.com> Signed-off-by: Ed Veal <ed.veal@bywatersolutions.com> Signed-off-by: Brendan Gallagher <brendan@bywatersolutions.com> Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 7b165794cd1875b79177f85db59be42a9708554a) Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
D Ruth Bavousett [Sun, 20 Oct 2013 17:23:44 +0000 (12:23 -0500)]
Bug 8070: improve MARC preview display for RTL languages
The Right Answer, according to the cataloger I spoke to,
is to make it LTR when doing "raw" MARC display.
To test:
1) Install this patch, then run misc/translator/translate install ar-Arab
2) search for a bib in the staff client.
3) Switch to Arabic, and click the link to the left of "MARC Preview"
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
At first glace I was unsure about hard-coding this style in the
template. Further testing indicated that this is required as the
showmarc template doesn't inherit any of the CSS from the containing
page.
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 432f5ad400c6679186b27a00b61a3ad72ddda313) Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Bug 11269: fix incorrect use of MARC::Field->subfield()
MARC::Record 2.0.6+ enables the warnings pragma, and as a
consequence, started logging cases where a routine in
C4::Search was calling MARC::Field->subfield() with an undef
subfield label. This patch removes the log noise.
To test:
- Run prove -v t/db_dependent/Search.t
- There will be warnings about
"Use of uninitialized value $code_wanted in string" in MARC::Field.
- Apply the patch.
- Those warnings are gone.
Signed-off-by: Liz Rea <liz@catalyst.net.nz>
Tests now pass
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 2f6f6d2b0c4d4e8a4ed5ab17fbbf66393f8a2c69) Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Bug 10689: make subscription public note appear when making a new order from a subscription
Test by creating a new order to a basket using "From a subscription" link
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Comment: Works as described. No koha-qa errors
When creating a new basket from a susbcription, public note shows
on Notes column.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Tiny enhancement, passes tests and QA script.
Works as described.
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 4ce18e2a86b0af7548caaeaf26f7571d2244e35e) Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Fridolyn SOMERS [Tue, 6 Aug 2013 10:13:34 +0000 (12:13 +0200)]
Bug 10689: make public note appear in subscriptions search
In a serials module, when searching subscriptions, the results table as
a "Notes" column.
In TT code, you see that it tries to display public note
"subscription.notes" and internal note "subscription.internalnotes".
The internal note is displayed well but not the public note.
You can see the 2 notes in serial details in summary tab.
The problem commes from the SQL query. A join is perform on subscription
and biblio, both containing a "notes" column.
This patch solves the problem by using a alias in query for both columns
(biblio.notes is acutally not used in template but could be).
Test plan :
- Edit a subscription
- Add public and internal notes. For example : "too busy" and "on holiday"
- Perform a subscription search that returns this subscription
=> "Notes" column contains both notes. For example : "too busy (on holiday)"
- Test with only public note
- Test with only internal note
Works as described.
Signed-off-by:Mathieu Saby <mathieu.saby@uhb.fr> Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com> Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
All tests and QA script pass.
Works as described, fixes a bug as the templates show that
the intention was to display both notes in the column.
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 4458e86865d09196591646e29a319958c8680578) Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Galen Charlton [Fri, 11 Oct 2013 04:20:18 +0000 (04:20 +0000)]
Bug 10689: add regression test
This adds a test to verify that the public subscription
note is returned by a subscription search.
To test:
[1] Verify that t/db_dependent/Bookseller.t passes.
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit f17fab3ed9b4cef1bd8932376fbdc8733d899fab) Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Bug 10624: add 'status' option switch for the packages init script
This patch makes the init script return the status of the relevant
processes.
To test:
- Apply the patch, build package and install
- Run
$ service koha-common status
Note: it can be tested just copying the debian/koha-common.init script
to a server running koha-common instances and calling it
$ ./koha-common.init status
Sponsored-by: Universidad Nacional de Cordoba Signed-off-by: Robin Sheat <robin@catalyst.net.nz> Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 45b5bef8931470badfacd33eeb31acd634cdeb9f) Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Fridolyn SOMERS [Wed, 28 Aug 2013 13:32:24 +0000 (15:32 +0200)]
Bug 10430: arrived and stopped status are not possible in serial claim
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit bdbe2545cdc111567f565374ae67e23ccac98838) Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Fridolyn SOMERS [Fri, 7 Jun 2013 10:14:02 +0000 (12:14 +0200)]
Bug 10430 - status filter not working in serial claims when translated
With a translated intranet (ie fr-FR) the status filter does not work
for "Late" status. It is because status in combobox filter is
translated "Retard" and status in table is translated "En retard".
This patch changed javascript filter to work on a status code instead
of status name.
The new classes may be used to change CSS depending on status.
Test plan :
- Use a translated intranet (ie fr-FR)
- Go to serials claim of a vendor with issues of multiple status
- Check that status filter does its work
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz> Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Patch passes all tests and QA script.
The status filter should probably be changed to only
allow filtering on status that can appear on the page.
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 9b5d891bf5cf095359c069960f9eae6e318b4126) Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Galen Charlton [Fri, 8 Nov 2013 16:21:26 +0000 (16:21 +0000)]
Bug 11218: (follow-up) fix whitespace
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 87470f394aa58e7ea1d89cadffc8d724b433cd80) Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Katrin Fischer [Fri, 8 Nov 2013 07:33:29 +0000 (08:33 +0100)]
Bug 11218: (follow-up) fix some whitespace and a variable declaration
Fixing some things the QA script pointed out this morning:
- whitespace
- variable declaration
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 1528a6deda468dc4a7391ea7a9fff60c57af314f) Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Katrin Fischer [Thu, 7 Nov 2013 23:31:09 +0000 (00:31 +0100)]
Bug 11218: fix Item Due notices not being generated
To test:
- Check out at least 3 items, due dates should be today, sometime in
the past and one day after tomorrow.
- Edit the message options - activate DUE and PREDUE notices with
days in advance = 2
- Run the advance_notices.pl script with -v -c
Result: Only a PREDUE notice is generated
- Run the advance_notices.pl script with -v -c -m 2
Result: Only the PREDUE message is generated correctly.
- Run t/db_dependent/Circulation.t
- without first patch: all tests pass.
- with first patch: some tests will fail.
- Apply patch.
- Rerun script, now PREDUE and DUE notices should be
generated.
- Run t/db_dependent/Circulation.t again, all tests should pass.
Add more items with different due dates, rerun and check results.
Run t/Circulation.t to confirm all tests pass.
- Apply the patch
Signed-off-by: Liz Rea <liz@catalyst.net.nz>
Passes functional tests and automated tests.
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit a8bc7c9ef8222d0c9292ff5a93f3ecb8d68a2eed) Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Katrin Fischer [Thu, 7 Nov 2013 23:26:45 +0000 (00:26 +0100)]
Bug 11218: Regression tests for Due notice generation
Changes tests for GetUpcomingDueIssues:
days_in_advance should be inclusive:
2 should find items due in 2 days from now.
1 should find items due tomorrow.
0 should only find items due today.
Adds new tests for Bug 11218:
As the advance_notices.pl, the only script using GetUpcomingDueIssues
is not only used for PREDUE notices, but also for
DUE notices, we need to also select items due today.
Signed-off-by: Liz Rea <liz@catalyst.net.nz> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Rebased for 3.12.x
Galen Charlton [Fri, 4 Oct 2013 16:27:55 +0000 (16:27 +0000)]
Bug 7764: (follow-up) editorial tweaks
Besides some grammar and capitalization corrections, this patch
adds a link to the wiki page for installation Koha on Ubuntu
from packages.
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit b9c85431ddf967ecadf88ee9d2cbe14ac95d5be4) Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Mark Tompsett [Tue, 27 Aug 2013 21:29:20 +0000 (17:29 -0400)]
Bug 7764: rework the INSTALL.ubuntu instructions
This is a major rework. Key improvements include:
- Removed confusing multiple versions for Ubuntu leaving only one set
of instructions.
- The packages koha-deps and koha-perldeps are used.
- License has been updated to reflect GPL3.
- More wiki reference links have been included.
- It is aimed to be based on source, not just tarball or just git.
- Sample output has been cut as much as possible.
- Almost cut-and-paste easy, making it friendlier than INSTALL.debian.
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com> Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Fixed a tiny typo: seperate
Makes all sense to me - only wondering a bit about the recommendation
of using lynx for the web installer.
Quite an improvement, so passing QA.
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit c63770d81581080a9c714172fd36ceb86c08062d) Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Bug 10948: make reference labels translatable in OPAC auth results
For some reason the translator script was not picking up the see also
and used for/see from labels on the OPAC. This patch fixes the problem.
To test:
1) Apply patch.
2) Generate PO files.
3) Note that "see from" and "used for/see from" appear.
4) Sign off.
Signed-off-by: Nuño López Ansótegui <nunyo@masmedios.com> Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works nicely, thx for the fix.
Tested by updating the German po files, translating the
strings and installing the templates.
Verified strings show up in German in the authority
result list.
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit bd5aec76494a10b6c908924b3a421f7ce08224f1) Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Bug 5645: improve converting simple search to Z39.50 search
This patch builds on the patch for bug 10742 by ensuring
that when a search initiated from the staff interface simple
search returns results, if you click on the Z39.50 search
button, the search form is populated with the search string
without "kw,wrdl".
To test:
[1] Perform a search in the staff interface that will return
results.
[2] Click the Z39.50 search button.
[3] Observe that the search string appears in the title
field in the Z39.50 search form, but with a prefix of
"kw,wrdl".
[4] Apply the patch.
[5] Repeat steps 1-2. This time, the search string appears
without the index prefix. This will make the Z39.50 search
much more likely to work.
[6] Repeat steps 1-2, but with a search that does *not* return
any hits in the Koha database.
Signed-off-by: Galen Charlton <gmc@esilibrary.com> Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Josef Moravec <josef.moravec@gmail.com> Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit f791dd4770e84a82e15823b055707b15b461d24b) Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
No koha-qa errors.
Fixes problem, but I think is better to remove
=back than to add nother =over 4, but I'm not
a POD expert
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 520244503eaf42636e13cf8a44789c7cadd0445e) Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Jonathan Druart [Fri, 20 Sep 2013 15:21:40 +0000 (17:21 +0200)]
Bug 10925: fix LDAP auth failing if DEBUG is enabled
To reproduce:
1/ Edit your apache virtual host and set the DEBUG environment variable
(SetEnv DEBUG 1).
2/ Try to login with an ldap user
3/ You will be redirected to the 500 error page.
The Koha logs contains:
malformed header from script. Bad header=------------------------------: mainpage.pl
The hashdump routine directly prints to STDOUT (!) and breaks the
headers.
It appears Net::LDAP::?->dump does the same thing.
Signed-off-by: Mark Tompsett <mtompset@hotmail.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Maybe we can kill C4::Utils after getting rid of this
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 561107bb5b348eaa14054e3470f39ff9cf080d22) Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Srdjan [Wed, 5 Jun 2013 04:34:29 +0000 (16:34 +1200)]
Bug 9299: fix LDAP login breakage when ExtendedPatronAttributes is on
To test:
- Configure an LDAP server and $KOHA_CONF, etc.
- Make sure ExtendedPatronAttributes is defined and that
there is no attribute defined that is specified to be
a unique ID.
- Try to log in using an account originating from the
LDAP directory.
- You will got a software error:
Can't use an undefined value as an ARRAY reference at
/home/koha/src/C4/Auth_with_ldap.pm line 183.
- Apply the patch.
- Try to log in again; this time it should work.
Signed-off-by: Nuño López Ansótegui <nunyo@masmedios.com> Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com> Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 4d75243e27cab93cd84ee6bbfd71362326569c21) Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit a1c5d280f67a632ab9e1fdd32cf4967c3de6fdd6) Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Bug 10687: Delete erroneous tags 68a and 68b on default MARC21 auth framework
This patch deletes information for default
MARC21 auth framework on tags 68a and 68b.
Also added update for current installs.
RM note: The 68a and 68b fields were defined in an attempt to include
both MARC21 classification and MARC21 authority records in the same
default framework, but I don't think this has turned out to be useful,
as to my knowledge nobody tries to use MARC21 classification records
in Koha, and if one were to want to, a distinct record type (or at
least auth_type) would be a better way to do it.
To test with current authorities_normal_marc21.sql loaded
1) apply the patch
2) run updatedatabase
3) check on database that there are no more
references to tags 68a and 68b
To test for new installs
1) remove auth frameworks
2) load authorities_normal_marc21.sql
3) check that load without problem
4) check on database that there are no more
references to tags 68a and 68b
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Paola Rossi <paola.rossi@cineca.it> Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 15f28461e09cffe2917f424b8b7e84cd722b1246) Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Katrin Fischer [Thu, 29 Aug 2013 20:26:50 +0000 (22:26 +0200)]
Bug 10803: make "Make payment" in circ easier to translate
To test:
- Choose a patron account
- Add a fine to it
- Switch to the checkout tab of the patron account
- Check for the "Make payment" link. Make is not a link, but payment is.
- Apply patch
- Check again, now both words are linked.
In translation this string is divided into:
. %s Make
payment
Because of this it's difficult to translate it grammatically.
The patch moves 'Make' into the link text, so that both words
will show up together in translation.
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Comment: Works as described. No koha-qa errors.
Not only improves translatability,
also corrects capitalization.
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com> Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 39c435e36fec65dbba795214bdde79932bb4edcf) Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Owen Leonard [Fri, 20 Sep 2013 15:31:57 +0000 (11:31 -0400)]
Bug 10924: fix updating contact note from OPAC
If you update your "Contact note" via the OPAC that change doesn't
appear in the staff client's "Update patron records" interface. The
field is missing from members-update.tt
To test, log in to the OPAC and update your details
(opac-memberentry.pl), modifying the "Contact note" in the "Alternate
address" section.
In the staff client, view "Patrons requesting modifications"
(members/memgers-update.pl). The changed contact note field should
appear in the list of field awaiting approval for that patron.
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Comment: Work as described. No koha-qa errors
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
One line change - contact note now updates perfectly.
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 4713a27280b9ee0956c4f2d9ee0e63b12260db01) Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Kyle M Hall [Wed, 18 Sep 2013 19:24:08 +0000 (15:24 -0400)]
Bug 10911: fix invalid links when displaying records that have 880 fields
Koha intranet search results using XSLT for records with 880 fields have
the details link created by a code path that incorrectly links to some
opac pages.
Test Plan:
1) Enable XSLT for intranet search results
2) Upload or create a record with at least one 880 field
3) Search for the item ( must have multiple hits to avoid redirection )
4) Click the title link, note it is broken
5) Apply this patch
6) Click the title link, note it is correct
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Comment: Work as described, no koha-qa errors.
Test
1) imported two times sample record
2) reindex
3) search, find example record, broken links
4) applied patch
5) refresh, good links
NOTE: A similar (invalid references) problem is present on
UNIMARC and NORMAC files
I'll file a new bug for those cases.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works nicely, tested with a different set of sample
records with Hebrew 880 fields.
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 115a3e6b60cab0e5000483575ca69736bb40ee2c) Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Bug 10465: remove useless reference to fields 780 and 785 in UNIMARC XSLT files
UNIMARCslim2OPACDetail.xsl and UNIMARCslim2intranetDetail.xsl contained
references to 780 and 785 fields, that exist in MARC21 but not in UNIMARC.
This patch remove the code related to 780 and 785 fields. No effect should
be visible.
To test : in a UNIMARC Koha
1. Be sure that OPACXSLTDetailsDisplay, OPACXSLTResultsDisplay,
XSLTDetailsDisplay and XSLTResultsDisplay sysprefs are set to "default"
2. Apply the patch
3. Search some records in staff interface : the list view and the detail
view must be exacty the same as before you apply the patch.
4. search some records in OPAC : the list view and the detail view must
be exactly the same as before you apply the patch.
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Comment: No diplay change, no koha-qa errors.
Removes what can't be displayed.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Checked detail pages in OPAC and intranet still display correctly
and without errors.
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 54befcf59ed85be0041d72760eb1771bcce0492e) Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Katrin Fischer [Tue, 10 Sep 2013 19:18:13 +0000 (21:18 +0200)]
Bug 10847: Open link to vendor's website in new window
To test:
- Create a new vendor or edit an existing one
- Make sure you have entered a valid URL for the website
- Click the link from the vendor summary page and verify it opens
in a new window/tab (depending on your browser configuration)
Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit d67ef01814fb4ba1519d66d9ad749dfa64e62a76) Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Kyle M Hall [Tue, 21 May 2013 19:58:44 +0000 (15:58 -0400)]
Bug 10305 - _increment_barcode is called twice
For some reason, _increment_barcode is called twice in succession in
cataloguing/additem.pl
Test Plan:
1) Enable autobarcode = incremental
2) Catalog an item, not the barcode
3) Apply this patch
4) Catalog another item, the barcode should be the next in line
as previously. No change should be noted.
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
(cherry picked from commit 449fc4e168368cc3b1991152f32a2862b578a04c) Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Owen Leonard [Fri, 13 Sep 2013 18:45:50 +0000 (14:45 -0400)]
Bug 10888: Don't hide authorities module from users who lack permission to edit authorities
It should be possible for staff client users to search and view
authority records even if they don't have permission to edit them.
To test, apply the patch and view the staff client as a user with and
without "editauthorities" permission.
With "editauthorities" permission, authority search results should show
both an edit and delete link. Viewing the details of an authority
record, one should see a toolbar with edit/delete/new options.
The detail view has been altered to use the term "record" in place of
"biblio" ("Used in X record(s)).
Without "editauthorities" permission, authority search results should
show no edit or delete link. Viewing the details of an authority, the
only option shown in the toolbar should be "Save."
On the staff client home page and in the header's "More" menu the link
to the authorities module should now appear with and without permission
to edit authorities.
This patch also corrects the permissions in the authority export script
to allow saving of authority records by users who do not have permission
to edit.
Signed-off-by: Paola Rossi <paola.rossi@cineca.it> Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com> Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 9bd3a44944e6a0cb7920c3c53a88c11a8986b146) Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Bug 7813: (follow-up) use descriptive text for delete link
This patch replaces the "times" symbol for the local cover image
deletion link with more descriptive text. This was done because
the original "X" was small, is not necessarily going to be universally
understood to signify the deletion action, and because "×"
does not give much context to translators.
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit fe3628070a7affddb691ee589ec0e63639d0a36a) Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Jonathan Druart [Fri, 20 Sep 2013 11:06:48 +0000 (13:06 +0200)]
Bug 7813: (follow-up) improvements for deleting local cover images
This patch:
- displays a js alert if a problem occurred on deleting the
image on the server.
- adds a class for the new span (in order to avoid future problem, if
someone adds a new span).
- adds a title for the [X] link.
- deal with the upload_local_cover_images permission (don't display the
delete link if the logged in user does not have it).
- changes the license version.
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
I like the ehancements to the original patch and work as expected.
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com> Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 1dc7d421bc87e3cf027161b08fbb44875c778f49) Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
This patch adds the ability to delete local cover images from the
detail page. It adds an 'X' button to trigger the deletion. It occurs
using a new SVC script called cover_images that accepts the following
parameters:
It then deletes all valid images passed and returns a JSON object
containing the imagenumbers and the deletion status (1/0). The operation
is triggered using jQuery.ajax, and with the response the corresponding
images get deleted.
Note: currently one image is deleted at a time, but the code is there to
be used.
To test:
- Open the detail page fr a biblionumber containing one or more cover
images, go to its images tab.
- Apply the patch, reload the page, go to the images tab.
- Thumbnails should look better than before ;-)
- An 'X' button should show below each cover.
- Clicking the 'X' button should trigger an alert message asking for
confirmation.
a) Cancel: nothing happens, reload the page and check nothing got
deleted.
b) Accept: the deleted image should be gone, reload the page to check
it doesn't exist anymore and is not a browser/DOM manipulation trick.
- Signoff
Note: check having more cover images than those that fit the width and
see it wraps fine.
P.S. I chose not to implement every possible action on the svc script, but
another bug could be filled for more improvements.
Sponsored-by: Universidad Nacional de Cordoba Signed-off-by: David Cook <dcook@prosentient.com.au> Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com> Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit ab362b93a710bddcd385a6a468af6ff682673367) Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Bug 10622: (follow-up) uppercase "SIP" in documentation and help text
"SIP" is an acronym and should be capitalized.
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 67ad9d28f5477124d2bf30c0dc48d693657461a7) Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Magnus Enger [Fri, 9 Aug 2013 08:05:23 +0000 (10:05 +0200)]
Bug 10622 - [SIGNED OFF] Followup: Add --sip, --nosip and --help to man page
The original patch for bug 10622 added the --sip, --nosip and
--help switches to the koha-list command, but did not update the
manpage for the command. This patch does.
To test:
Run these commands and look at the formatted man page:
$ xsltproc /usr/share/xml/docbook/stylesheet/docbook-xsl/manpages/docbook.xsl \
debian/docs/koha-list.xml
$ man -l koha-list.8
Make sure this test passes:
$ prove -v xt/verify-debian-docbook.t
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Forgot the docs this time, good catch Magnus
Signed-off-by: Robin Sheat <robin@catalyst.net.nz> Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 46574c916090a3e7e9ae9157b4053b1d683ac0e3) Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Bug 10622: add --sip and --nosip switches to koha-list
Just added those switches.
Sponsored-by: Universidad Nacional de Cordoba Signed-off-by: Magnus Enger <magnus@enger.priv.no>
I applied the patch on my local dev install, and then copied the
patched koha-list script to a couple of servers with actual
instances running off the packages, to test the script.
- It seems that the -h switch did not work before this patch, now
both -h and --help works nicely
- --sip and --nosip work as expected, also in combination with
--email and --noemail
The patch does not add --sip and --nosip to the man page for
koha-list, but I will do a followup for that.
Signed-off-by: Robin Sheat <robin@catalyst.net.nz> Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 9f6e739ce0893fe7570adfa7cc2b7407351138ae) Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Removed unused stuff, added a new config file /etc/default/koha-common
to control the init script behaviour. Currently is only a stub. The config
file could be put on /etc/sysconfig on RedHat and friends. The init script
should work them too. Added a TODO comment regarding the 'status' switch.
To test:
- Apply the patch on master, build your own packages and install.
- The init script should continue to work as expected.
(it can be tested replacing the /etc/init.d/koha-common file with
debian/koha-common.init on a packages install).
- The absence of the /etc/default/koha-common file should not prevent
the init script from working.
Sponsored-by: Universidad Nacional de Cordoba Signed-off-by: Robin Sheat <robin@catalyst.net.nz> Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 213fbdc5b40dd7638d652a8fd60f7391d0b10bb1) Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Katrin Fischer [Tue, 10 Sep 2013 19:10:28 +0000 (21:10 +0200)]
Bug 10871: Make confirmation message for deleting news translatable
To test:
- Create a news entry in tools > news
- Delete the news entry or multiple entries by selecting them
using the checkboxes to the left and the delete button at the
bottom of the page.
Verify confirmation message shows up correctly with patch applied.
Bonus:
- Update one of the po files and make sure the new strings shows up
there.
Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com> Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit da856fc46cfd4cccb092c339eee0e3ce1262e9d8) Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
David Roberts [Mon, 16 Sep 2013 15:51:33 +0000 (16:51 +0100)]
Bug 10894: Add ID to main address in member entry form
Add an ID to ease customization via jQuery; an ID is already present
on alt address but was missing from main address
Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit ace550530550ba72b93f34b446e681ab72024f8c) Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Marcel de Rooy [Wed, 29 May 2013 12:24:05 +0000 (14:24 +0200)]
Bug 10376: fix ability to print cart from IE9 & 10
Test plan:
1) Test with Firefox (or any other browser except IE):
Add biblio to cart
Go to Cart and click Print
Does the Cart window come back to its original state after confirm/cancel Print?
2) Test with Internet Explorer (I used IE9; testing another version is fine)
Do the same as above. Is behavior now more or less the same?
Signed-off-by: Marc Veron <veron@veron.ch>
1) Test without patch:
IE 10: Does not show print dialog
IE 9 (Developer Emulation in IE 10): Does not show print dialog (as expected)
FF 21.0 OK
Chrome 27.0.1453.110 m: OK
2) Test with patch:
IE 10: OK
IE 9 (Developer Emulation in IE 10): OK
IE 8 (Developer Emulation in IE 10): OK
IE 7 (Developer Emulation in IE 10): OK
FF 21.0 OK
Chrome 27.0.1453.110 m: OK
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Trusting Marc here, as I don't have IE available.
Regression tests in Firefox and Chromium went well.
Kyle M Hall [Wed, 14 Aug 2013 18:36:37 +0000 (14:36 -0400)]
Bug 10731 - IntranetSlipPrinterJS is not working for hold slips [v3.10/v3.12]
Hold slips aren't printing automatically with JS Print Setup because it
appears the system preference IntranetSlipPrint is never being passed to
the template.
Test Plan:
1) Set up JSPrintSetup
http://wiki.koha-community.org/wiki/Setting_up_slip_printer_to_print_silently
2) Place a hold
3) Check the item in to capture the hold
4) Click "Print and confirm"
5) Note the slip does not print automatically
6) Apply this patch
7) Repeat steps 2 through 4
8) Observe that the slip now prints automatically
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Tested successfully in 3.10.x and 3.12.x
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com> Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Bug 10872: UT for GetHiddenItemnumbers and POD fix
This patch adds several unit tests for GetHiddenItemnumbers and fixes the POD for it.
It also wraps the tests for rollback, modernizes and adds a license text to it.
Sponsored-by: Universidad Nacional de Cordoba Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 5d8ad739293ef8cf22a808404e52a9c74275aaf0) Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
"Fixed" 'wthdrawn' column name for 3.12.x
Mark Tompsett [Tue, 10 Sep 2013 20:19:58 +0000 (16:19 -0400)]
Bug 10872 - C4::Items GetHiddenItems fix and optimization
There should be a:
"require YAML;"
or
"use YAML qw/Load/;"
as the GetHiddenItems routine has a reference to YAML::Load.
This was discovered while adding a GetHiddenItems() call into
opac/opac-MARCdetail.pl. I believe this problem dates back to
bug 6488 or bug 5984.
I also added an optimization to GetHiddenItems to prevent
processing if there is nothing in the system preference. Test
by searching for a biblio which has some or all of its items
hidden.
Signed-off-by: Mason James <mtj@kohaaloha.com> Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Maybe
return () unless $yaml =~ /\S/;
or
return () if $yaml =~ /^\s*$/;
would have been easier to read.
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 9ab593440b6d2b1f9c417631a4cf5cabcf1a0032) Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Bug 10897: remove test for module that has become DB-dependent
This is an alternative appraoch to fixing this bug; as the
compilation test for C4::ILSDI::Services also resides
in t/db_dependent/ILSDI_Services.t, we don't need t/ILSDI_Services.t
at present.
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit dcbe50cde84505198dffbd1a65d998287f0902dc) Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Bug 10667: (follow-up) fix reference to UT library in test case
This patch prevents a spurious test case failure if the
test database happens to already have a library whose
code is 'UT'.
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 2a8481a5e2f487c649fc9b2e1c03b42fe42fee07) Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Katrin Fischer [Thu, 12 Sep 2013 05:36:24 +0000 (07:36 +0200)]
Bug 10667: Follow up - prevent t/00-load from failing
To test:
- Apply first 2 patches for unit tests and changes to Services.pm
- Turn off mysql
- Run t/00-load.t
- Verify that the test fails.
- Apply this third patch.
- Run t/00-load.t again.
- Verify this time it passes.
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Comment: Work well, no koha-qa errors.
Without third patch and mysql down, test fails,
with third patch it succeed. Signed-off-by: Mason James <mtj@kohaaloha.com> Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 8e0c21cf38b930c207d2efab4a3b55e359b95b89) Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Katrin Fischer [Sun, 8 Sep 2013 19:42:04 +0000 (21:42 +0200)]
Bug 10667: Allow authentication with cardnumber for ILS-DI
Test authentication via ILS-DI:
- with userid and password
- with userid and wrong password
- with cardnumber and password
- with cardnumber and wrong password
...
Before the patch only userid will authenticate the patron.
After the patch was applied, userid and cardnumber will work.
To test:
- Run t/db_dependent/ILSDI_Services.t - all tests should pass.
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
No koha-qa errors
Test:
Enable ISL-DI
access opac with /cgi-bin/koha/ilsdi.pl?service=AuthenticatePatron&username=XXX&password=YYY
With userid/cardnumber & password returns borrowernumber
With userid/cardnumber & wrong password returns PatronNotFound Signed-off-by: Mason James <mtj@kohaaloha.com> Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit ddb67e32377185df371c85172308be882968b14f) Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Katrin Fischer [Sun, 8 Sep 2013 19:34:37 +0000 (21:34 +0200)]
Bug 10667: Add unit tests for ILSDI::Services::AuthenticatePatron
This patch adds unit tests for Authenticate patron.
To test:
- Run perl t/db_dependent/ILSDI_Services.t
- Verify all tests pass
Note: there are some tests marked as TODO.
Rewriting AuthenticatePatron to make cardnumber and userid
work for authenticating a patron will be implemented in the
next patch. Tests related to this are currently showing as
'not ok', but are still passing.
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
No koha-qa errors
With both patches applied, all test pass. Signed-off-by: Mason James <mtj@kohaaloha.com> Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 995f4b6ecb504e1648816b0841e90efb814f25c7) Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Bug 9372: (follow-up) tidy whitespace in new lines
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit fc84903dfb73212029466764005bb53e5089acc8) Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Sophie Meynieux [Fri, 2 Aug 2013 13:48:27 +0000 (15:48 +0200)]
Bug 9372: replace carriage return with <br /> in printed HTML files for overdues
For PDF generation, HTML files need explicit <br /> HTML tags. With
this patch, carriage return are replaced by <br /> when letters are
written into HTML files.
Test plan :
- Ensure you've got at least one reader with overdue triggering notice
- Ensure that your notice template got HTML checked
- Run misc/cronjobs/overdue_notices.pl -v -n -html <dirname>
and misc/cronjobs/printoverdues.sh <dirname>
Without patch, the content of the letter is all on one line in PDF file
With the patch, PDF file is correctly formated
- remove your reader email
- Run misc/cronjobs/overdue_notices.pl -v -html <dirname>
and misc/cronjobs/printoverdues.sh <dirname>
Without patch, the content of PDF file is all on one line
with the patch, PDF file is correctly formated.
- restore reader email
- run misc/cronjobs/overdue_notice.pl -v -html <dirname>
Verify that the a message has been generated in message_queue table
With or without patch, the message is the same
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz> Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 6dbfe1512dc39e82084f9aa8b8ecce38fa24c5c5) Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Katrin Fischer [Sat, 7 Sep 2013 23:03:35 +0000 (01:03 +0200)]
Bug 10841: Make edit/delete item context links in cataloguing translatable
HTML created with Javascript is not translatable the way HTML is
normally translated. _() syntax has to be used to have strings
translatable.
To test:
- Edit items for a record with multiple items
- Click somewhere in the items table
- Verify the links for editing and deleting items show up and work correctly
- Apply patch
- Verify the links still show the same behaviour
Bonus:
- Run 'perl translate update <languagecode>' in misc/translator
- Verify that Edit item and Delete item show up in the po file, translate them
- Install updated po files running 'perl translate install <languagecode>'
- Verify links show up translated and work correctly
Patch also fixes capitalization for a couple of error messages - only change
there is: Deleted > deleted.
Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
(cherry picked from commit 7c82fe1a670892b07f426f356c67bc3cd60a37f3) Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Owen Leonard [Fri, 19 Jul 2013 13:07:52 +0000 (09:07 -0400)]
Bug 8821: make receive shipment page hide inactive funds like new order form
This patch adapts the fund-handling code from neworderempty.pl
in order to limit the display of funds by default to active ones,
with the option to check a box to display all funds.
This patch also adds "(inactive)" to the display of funds on this and
the neworderempty.tt template because it seemed like that was useful
information.
To test, make sure you have both active and inactive funds.
Start the process of receiving a shipment. The "fund" option
in the receive shipment form should show only active funds.
Checking the "show all" checkbox should allow you to choose
from both active and inactive funds.
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com> Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 04aa35077730bdd4bc8d3c01c461518ecb0d9e60) Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Katrin Fischer [Wed, 10 Jul 2013 20:56:13 +0000 (22:56 +0200)]
Bug 10570: Show nonpublic note on check expiration page
The check expiration page in serials only showed the OPAC note,
but it makes sense to also show the nonpublic note here.
This patch adds it.
To test:
- Add a subscription, make sure to enter different notes in
nonpublic note and OPAC note to check for display later on.
- Go to the check expiration page and search for your subscription.
- Check both notes show up correctly.
Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com> Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 29498bf696d86a761708ec59f0a75be6353feecf) Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Jonathan Druart [Mon, 27 May 2013 13:56:28 +0000 (15:56 +0200)]
Bug 9618: (follow-up) include link to jQuery only if needed
The jQuery lib is useful only if js code is filled into the
intranetuserjs pref.
Signed-off-by: Campbell Reid-Tait <campbellreidtait@gmail.com> Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
To test:
- Use Quick spine label creator
- Make sure you have Javascript in your intranetuserjs system
preference
- Validate Javascript effect on screen or check source code
to make sure your code is visible there.
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 94868f61c4c395f8393d34862a99609247f6dd73) Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Owen Leonard [Mon, 18 Mar 2013 19:13:09 +0000 (15:13 -0400)]
Bug 9618: Add support for intranetuserjs to labels/spinelabel-print.pl
The template for printing a single spine label is a stripped-down
version of a standard Koha template, but it should include
intranetuserjs and IntranetUserCSS so that libraries can make local
customizations.
This patch updates the page's DOCTYPE to HTML5 and adds the missing
markup for including those preferences. Also added is jQuery, since
there's a good chance local customizations are using jQuery.
To test, make sure there is something in your intranetuserjs and
IntranetUserCSS system preferences. Visit
/cgi-bin/koha/labels/spinelabel-home.pl and submit a barcode. View
source on the spine label output page and confirm that your custom js
and css were included correctly.
Signed-off-by: Campbell Reid-Tait <campbellreidtait@gmail.com> Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Template only change, works nicely.
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit cb59e37e56c255219298450f7a289cf7c3fe819b) Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Magnus Enger [Sat, 31 Aug 2013 13:33:24 +0000 (15:33 +0200)]
Bug 10810 - Fix synopsis for -html option to overdue_notices.pl
The synopsis for the -html option used to be:
-html <filename> Output html to file
but the argument to this option should actually be a directory,
not a filename. This patch fixes the synopsis.
To test:
- Run perldoc misc/cronjobs/overdue_notices.pl
- Check that the synopsis is as shown above
- Apply this patch
- Run perldoc misc/cronjobs/overdue_notices.pl
- Check that
- the synopsis asks for a directory, not a filename
- that the description of the -html option further down in the
perldoc now mentions the filename that the HTML file will be
created with.
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Works as described. No koha-qa errors.
If feeded with a filename -html option fails with many messages like
print() on closed filehandle $html_fh at misc/cronjobs/overdue_notices.pl line 384.
Perhaps it could be improved, but that was the old behavior.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Improves documentation, no negative side effects found.
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit b54e33c1f62e4aa2c7e46a7fafa445f33f570326) Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Fridolyn SOMERS [Tue, 13 Aug 2013 12:55:32 +0000 (14:55 +0200)]
Bug 10718: fix items with no checkouts report
Bug 8124 has commented the option to download results items with no
checkouts report into a file. But the perl code of this page uses
the export into a file has default behavior since the input "output"
is no more present. The consequence is that there are never results
in page.
This patch removes the code concerning file output from template and perl.
Such a feature exists in guided reports.
Test plan :
Play with cgi-bin/koha/reports/catalogue_out.pl form and see if you get results
Bug 10718 - select user branch as default
In cgi-bin/koha/reports/catalogue_out.pl report, select in library filter the user logged-in.
Test plan :
- Log into intranet with a normal user
- Got to "Items with no checkouts" reports
=> Your branch is selected
- Run report
=> You see "Filtered on : Branch = <your branch>"
- Come back to report
- Select "Any library"
- Run report
=> You do not see "Filtered on : Branch"
Bug 10718 - items with no checkouts report permission is execute_reports
This report only executes SQL to change reports/catalogue_out.pl permissions from all reports subpermissions to reports/execute_reports.
Test plan :
Test you can access and run this report with only execute_reports subpermission into reports permission.
Bug 10718 - redefine limit input
In reports/catalogue_out.pl form, the limit input is by defaut none.
So by default the report queries all the catalogue.
This may take a very long time (fall into timeout) and since now the results are displayed in page, the page may be huge.
This patch modifies limit input to removes the "none" option.
Also reduces the number of options (same options as guided reports results per page).
Test plan:
- Go to reports/catalogue_out.pl
=> first value "10" is selected
- Launch report
=> You see "Filtered on: limit = 10"
Bug 10718 - perltidy on reports/catalogue_out.pl
Signed-off-by: Liz Rea <liz@catalyst.net.nz>
Tested all of these things, all ok - squashed patch for neatness.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Passes all tests and QA script.
Fixed a tab in one of the comments.
Improves script, but more work needed.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit ec09fe092e302dfbaf8ddf2a26ab361be9ea915e) Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Colin Campbell [Wed, 4 Sep 2013 10:18:11 +0000 (11:18 +0100)]
Bug 10817: return hold items info in SIP Patron Info Response
When requested by the summary flags the sipserver
should return in the patron info response barcodes of
the relevant titles.
For available holds this is the barcode of the captured items.
For unavailable holds ( i.e. current unsatisfied holds ),
we need to send a barcode so that the unit can use this to
request the title info. The barcode could be any one
belonging to the title.
This patch also corrects the erroneous return of empty items
in the patron information response. If the unit supplies a
range 1 - 100 unless the title has a hundred or more copies the
unit expects all copies. The server was erroneously stuffing
the returned arrays with null copies so that all summary requests
returned 100 copies (mainly without barcodes)
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz> Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Testing notes:
Using the test script provided on the bug report, but changed it
to match sip user and patron existing in my database.
Before applying the patch the SIP responses show the behaviour
pointed out above regarding the 100 items. After applying the
patch and restarting the SIP server responses are much more clean
not returning empty IDs.
64 Patron information response
AS = hold items
hold items count is correct.
AS contains barcodes of waiting holds.
Before patch, all AS were empty.
AT = overdue items
overdue items count is correct.
AT contains barcodes of overdue items.
AU = charged items
charged items count is correct.
AU contains barcodes of charged items.
AV = fine items
Judging from behaviour seen and comment in
Patrons.pm currently not implemented.
BU = recall items
Recalls are not implemented in Koha yet.
CD = unavailable hold items
unavailable items count is correct.
CD contains barcode for item level holds and is empty
for title level holds where no item can be determined.
Before patch, all CD were empty.
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 63820d3973dae7514556172665a46c0584aaefc8) Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Bug 10564 - use OPACURLOpenInNewWindow in UNIMARCslim2OPACResults.xsl
When using UNIMARC XSLT for OPAC detail page, if record has an 856$u,
its content is displayed as a link. The syspref OPACURLOpenInNewWindow
adds the option of opening in a new window (attribute target="_blank").
856$u is also used in UNIMARC results XSLT but the use of
OPACURLOpenInNewWindow syspref is missing. It exists for MARC21.
This patch adds the use of OPACURLOpenInNewWindow in UNIMARCslim2OPACResults.xsl.
Test plan :
- In a UNIMARC catalog, enable XSLT for OPAC results page
- Create a record with a link in 856$u and set second indicator to 0
- Set OPACURLOpenInNewWindow syspref on
- At OPAC, perform a search that contains the record
=> You should see the link : "Click here to access online"
- click on it
=> You shoud get to a new window (or tab depending on your browser configuration)
- Set OPACURLOpenInNewWindow syspref off
- re-perform the search
- click on the link
=> You shoud stay in same window
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Comment: Work as described, no koha-qa errors
Tested following plan after applying patch
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
XSLT change only, works as described.
To test: Catalog 856$u and $a, 2nd indicator = 0.
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit bc240a908d0fbc50b099df04e61da9fbb55fab52) Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Janusz Kaczmarek [Fri, 24 May 2013 11:38:10 +0000 (14:38 +0300)]
Bug 10331 - Little errors in unimarc_field_4XX.pl (punctuation)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Comment: Work as described, no koha-qa errors
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Copying the test plan from the bug report:
A.
1) have $a active in one of the linking fields (like 461, 463, etc.).
2) have a biblio record with the field 700 $a, $b, $f filled up
3) go to cataloguing -> field 4XX of your choice, use the plugin to
fetch data from biblio rec. mentioned in 2)
4) see the punctuation in $a -- it will be wrong (no closing bracket)
B.
1) have $a active in one of the linking fields (like 461, 463, etc.).
2) have a biblio record with the field 700 $a, $b, $c, $f filled up
3) go to cataloguing -> field 4XX of your choice, use the plugin to
fetch data from biblio rec. mentioned in 2)
4) see the punctuation in $a -- it will be wrong (dash instead of
semicolon between original $c and $f, no closing bracket)
C.
1) have $a active in one of the linking fields (like 461, 463, etc.).
2) have a biblio record with the field 702 $a, $b, $c filled up
3) go to cataloguing -> field 4XX of your choice, use the plugin to
fetch data from biblio rec. mentioned in 2)
4) see the punctuation in $a -- it will be wrong (unnecessary semicolon
after original $c, n.b. lacking space).
D.
1) have $a active in one of the linking fields (like 461, 463, etc.).
2) have a biblio record with the field 712 $a, $b filled up
3) go to cataloguing -> field 4XX of your choice, use the plugin to
fetch data from biblio rec. mentioned in b)
4) see the punctuation in $a -- it will be wrong (unnecessary opening
bracket at the end).
Test plan, all tests and QA script pass.
Thx Bernardo for his testing and explanations!
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 86c08e63a25afa86c9051f070d819ddac675425d) Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Kyle M Hall [Fri, 1 Feb 2013 15:40:50 +0000 (10:40 -0500)]
Bug 9531: Make SIP2 message terminator configurable via SIPconfig.xml
Add a terminator option to SIPConfig.xml, choices for 'terminator' are
'CR' or 'CRLF'. The default continues to be 'CRLF' if 'terminator' is
undefined.
Test Plan:
1) Apply patch
2) Start SIP server
3) Run C4/SIP/t/04patron_status.t
4) Stop SIP server
5) Add terminator="CR" for account login 'term1'
6) Run 04patron_status.t again, you should see no change
Signed-off-by: Frédéric Demians <f.demians@tamil.fr> Signed-off-by: Adrien Saurat <adrien.saurat@biblibre.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz> Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 90e2aafeb538f2d5e52fd1d32fce528f72076df8) Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Owen Leonard [Fri, 9 Aug 2013 17:43:21 +0000 (13:43 -0400)]
Bug 9943: activate "Pay selected" button only when at least one fine is selected
If you select no fines but click the "pay selected" button the resulting
screen offers to let you pay against all fines, which is confusing. To
simplify things this patch disables the "pay selected" button if no
lines are selected.
To test, apply the patch and find a patron with outstanding fines. From
the "pay fines" page (members/pay.pl) try selecting and deselecting
checkboxes and using the "select all" and "clear all" links. When no
item is selected the "Pay selected" button should become disabled.
Confirm that the form submits correctly when one or more fines is
selected.
Signed-off-by: Melia Meggs <melia@bywatersolutions.com> Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Passes all tests and QA script.
Works nicely in my tests.
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 6434f9264ac0415e1e52904dc953a00ee0806491) Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Owen Leonard [Thu, 1 Aug 2013 14:09:51 +0000 (10:09 -0400)]
Bug 10619 - fix errors in sco.css for the CCSR OPAC templates
sco.css is not missing from CCSR, but some image paths in the CSS are
incorrect, resulting in some missing images. This patch corrects those
broken paths.
This patch also hides the Cart/Lists/login region of the template which
should not be visible in self checkout.
To test, enable self-checkout and switch to the CCSR theme. Load a
patron for self-checkout and confirm that images associated with buttons
appear correctly: By the help link in the upper-right, on the 'Finish'
button, etc. Try checking out an item which is already checked out to
that patron to see more examples.
Signed-off-by: Srdjan <srdjan@catalyst.net.nz> Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
CSS changes only, works nicely.
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 794f0f28c931ae885232c23d02f94bfed66158f5) Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Kyle M Hall [Thu, 5 Sep 2013 19:27:58 +0000 (15:27 -0400)]
Bug 10027: (follow-up) improve display of fine details on printed invoice
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Passes all tests and QA script.
Checked invoice is correctly printed for
- partially paid fines
- paid fines
- unpaid fines
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit e30612bb3f0465363842ff4269245095d32dee3b) Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz> Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 70f23f2a69a66b76d411f81787e8e63e0a87a2a1) Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Kyle M Hall [Wed, 10 Apr 2013 17:45:18 +0000 (13:45 -0400)]
Bug 10027: include fine details when printing a fine
Previously printing a fine invoice would result in a page with both the
single item charge and the total outstanding amount. Right now only the
total outstanding is printed.
Test Plan:
1) Print a fine, note the fine doesn't show, only the total
2) Apply patch
3) Print a fine, not the fine does show
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz> Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 2fa06f48d957f7ea39286a52513a580e2ed5b13e) Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Owen Leonard [Fri, 9 Aug 2013 13:50:49 +0000 (09:50 -0400)]
Bug 7478: fix template translation problem in catalogue_out.tt
The items with no checkouts template has a sections that uses DEFAULT to
set some strings: [% DEFAULT loopro.itemcallnumber="No Call Number" %]
This appears to be untranslatable with our current translation tool.
This patch changes the template so that it uses a simple [% IF %] block
to display the default text if no value is set. Added is use of the
Branches template plugin to show library name instead of code.
This patch also fixes an error introduced in my fix for Bug 8124 causing
the page to default to CSV download instead of output to screen.
To test, apply the patch and confirm that the default text appears
onscreen in reports which include results that have a missing barcode,
title, or call number. Results should be displayed on screen correctly.
Run "perl translate update" for any language and confirm that the newly
generated po file includes "No call number," "No barcode," and "NO
TITLE" for catalogue_out.tt
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works nicely, thx Owen!
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz> Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit b8e1e7e217363a165275dca46e7d123633a64920) Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Bug 10802: make Debian package install history.txt
While bug 8911 fixed a problem regarding history.txt, a proper fix for
packages was missing.
This patch does three things:
- Adds docs/history.txt to debian/koha-common.docs so it gets installed.
- Moves the line installing the release notes from debian/koha-common.install
to debian/koha-common.docs.
- Adds an override_dh_compress entry in debian/rules that excludes
history.txt from the dh_compress routine [1]
To test:
- Take a picture of how /usr/share/doc/koha-common looks.
- Apply the patch and build a package.
- Upgrade and/or install using your package.
- Look for the contents of the /usr/share/doc/koha-common, it should
look the same, but history.txt must be there.
- More > About Koha > Koha Timeline should show the history lines.
[1] As 'man dh_compress' says, it is needed as every file considered for
the doc dir that is plain text and is more than 4k size will be
gzipped unless stated otherwise. We need it uncompressed for about.pl.
Sponsored-by: Universidad Nacional de Cordoba Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz> Signed-off-by: Mason James <mtj@kohaaloha.com> Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit b7cd95bcc909f7db330b5acbfcf9e8f817328a67) Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Mirko Tietgen [Fri, 9 Aug 2013 22:59:27 +0000 (00:59 +0200)]
Bug 8507: (follow-up) fix one reference to __ZEBRA_BIBLIOS_CFG__
Fixed the path to __ZEBRA_BIBLIOS_CFG__ for <server id="mergeserver">
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Good catach drojf.
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz> Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 5868490f026d0632416fdb78a6c0e7047f1e0df5) Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Bug 8507: koha-create now supports using DOM indexing for bibs
This patch makes the koha-create script install the file zebra-biblios-dom.cfg
with the proper string substitutions inside on the new instance koha-conf.xml file.
It also adds two option switches that control the indexing mode for the instance:
--biblio-idx {dom|grs1}
--auth-idx {dom|grs1}
DOM indexing is set as the default for both authorities and bibliographic records.
Following drojf (thanks!) advice I arranged stuff like explained here:
To test:
- Apply the patch
- Build your own packages and install them on a test server
a) Create a new instance without using the new switches like:
$ koha-create --create-db domtest
- Check there's a file /etc/koha/sites/domtest/zebra-biblios-dom.cfg
- Check that /etc/koha/sites/domtest/koha-conf.xml points to:
* zebra-biblios-dom.cfg (biblioserver section)
* zebra-biblios-dom.cfg (publicserver section)
* zebra-authorities-dom.cfg (authorityserver section)
- Success means the new default is DOM
b) Play with the 4 possible combination of option switches
$ koha-create --create-db --auth-idx grs1 --biblio-idx grs1 domtest
$ koha-create --create-db --auth-idx grs1 --biblio-idx dom domtest
$ koha-create --create-db --auth-idx dom --biblio-idx grs1 domtest
$ koha-create --create-db --auth-idx dom --biblio-idx dom domtest
- Check the koha-conf.xml file reflects the chosen options.
c) Run
$ koha-create --help
- It should advertise this addition accordingly.
d) Run
$ man koha-create
- Man page for koha-create should provide good information on the new switches behaviour
Sponsored-by: Universidad Nacional de Cordoba Signed-off-by: Mirko Tietgen <mirko@abunchofthings.net> Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz> Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit aba3db2628f25361fecfbe67b100f8913074835a)
Owen Leonard [Fri, 31 May 2013 16:05:49 +0000 (12:05 -0400)]
Bug 10349 - Don't show empty Descriptions/Title notes tabs in OPAC and staff
The descriptions/title notes tab appears on the detail page in both
staff client and OPAC even if there are no notes. This is probably a
relic of the pre-T:T days when it wasn't possible to use || in an IF.
This patch adds a check for the various variables which might trigger
the display of the tab.
To test, apply the patch and view records in the OPAC and staff client
which do and do not have title notes attached (whether that be in the
MARC record or in the biblio.notes column). In the OPAC Syndetics
content should also be tested if possible. The descriptions/title notes
tab should only appear if there is content.
Signed-off-by: Mirko Tietgen <mirko@abunchofthings.net> Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
That's better - thx Owen!
Works nicely and passes all tests.
Tested in staff and OPAC, also in combination with NotesBlacklist
hiding all notes.
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit f5c7badb31dff9afcbb69e4f58155560e98a922f) Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Works nicely.
Janusz Kaczmarek [Mon, 18 Mar 2013 20:16:22 +0000 (22:16 +0200)]
Bug 10324: fix display of editorial series in normal view (UNIMARC / no XSLT)
The patch corrects the issue -- the content of the field 225 shall be
displayes under Series now.
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Comment: Work as described, no koha-qa errors
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Comparing the XSLT with the normal view the patch seems to
work correctly. Passes all tests and QA script.
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 384566c1295a81dce0d9de001fcde36f2a996dfa) Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
This patch adds a regression test for this bug, effectively
implementing the manual test plan in the previous patch.
To test:
[1] Verify that prove -v t/db_dependent/Reserves.t passes.
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit e831a7eb3fe21561264cc756f40c539333e8ebbc) Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Kyle M Hall [Fri, 17 May 2013 12:08:24 +0000 (07:08 -0500)]
Bug 10272: make CheckReserves respect ReservesControlBranch
CheckReserves was using the CircControl system preference to determine what
patrons an item can fill a hold for. It should be using ReservesControlBranch
instead.
Test Plan:
1) Set ReservesControlBranch to "item's home library".
2) Create an item at Library A, place holds for it for patrons at
Library B, Library C, and Library A in that order,
for pickup at the patrons home library.
3) Make sure the holds policy for Library A is set to
Hold Policy = "From home library" and
Return Policy = "Item returns home".
Make sure the holds policies for the other libraries are set to
Hold Policy = "From any library".
4) Check the item in at Library C, the hold for the patron at Library B
should pop up, even though it's in violation of the circulation rules.
Don't click the confirm button!
5) Apply this patch, and reload the page,
now the hold listed should be for the last hold,
the hold for the patron at Library A, which is correct.
This patch adds the subroutine C4::Reserves::GetReservesControlBranch as
an equivilent to C4::Circulation::_GetCircControlBranch.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz> Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Fixed POD so that arguments and explanation match (C<$item>).
Also tested opac-reserves.pl for regressions.
Passes all tests, QA script, and Reserves.t.
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 78eba2f974ca9e8ff51f64d2356b004e7bfcecff) Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Owen Leonard [Thu, 1 Aug 2013 14:57:02 +0000 (10:57 -0400)]
Bug 10672 - Add subtitle to display of checkouts, overdues, and holds on the patron summary
In the OPAC, the patron summary page (opac-user.pl) should display
subtitle along with title in the lists of checkouts, overdues, and
holds. This patch adds it.
To test, log in to the OPAC as a patron who has checkouts, overdues, and
holds which include titles with subtitles. Titles should appear
correctly with and without subtitles.
Signed-off-by: Srdjan <srdjan@catalyst.net.nz> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit ec070fa8375d9001041fc089ff193b17f87ae4c1) Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Owen Leonard [Tue, 13 Aug 2013 18:50:06 +0000 (14:50 -0400)]
Bug 10721 - Improve DataTables configuration on transfers to receive report
I noticed this template used a hidden span to allow correct sorting of
titles--a relic of the previous table sorting plugin. I have removed
that and added an improved DataTables configuration.
To test apply the patch and view the transfers to receive report for a
library which has multiple transfers to receive. Sorting should work
correctly on all columns, including correct date sorting regardless of
dateformat system preference. Title sorting should correctly exclude
articles.
Signed-off-by: David Cook <dcook@prosentient.com.au> Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Passes all tests and works nicely.
Tested with different date formats.
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 8c3d3eb01a91c073aa9a5f2cb016bba01f0529ab) Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Fridolyn SOMERS [Fri, 16 Aug 2013 13:10:56 +0000 (15:10 +0200)]
Bug 10742: improve converting simple search to Z39.50 search
In intranet, when search does not return results, there is a button
to perform the same search on Z39.50 servers. This works well when
coming from advanced search. But when using simple search from header,
in the Z39.50 search box "kw,wrdl" is added to the operand in title.
This patch simply adds kw as default value when the cgi does not have
idx parameter.
Test plan :
- In intranet, perform a search from header that does not return any
result. For example "afalseword"
- Click on "Z39.50 Search"
=> you get a popup with the searched word in title. For example:
Title: afalseword
- Go to advanced search page
- Enter the same word into first input and submit
- Click on "Z39.50 Search"
=> you get a popup with the searched word in title.
Signed-off-by: David Cook <dcook@prosentient.com.au> Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Small change, fixes an annoying problem.
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 0ab71d32641d092d11228f0e2282dd8805198720) Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
David Cook [Wed, 28 Aug 2013 01:55:02 +0000 (11:55 +1000)]
Bug 10793: XSLT change 780/785 search queries to use ti,phr indexes like other linking entries
This patch adds the ti,phr index to the search queries for the 780
and 785 MARC fields in the XSLT templates.
Test Plan:
1) Use a record with 780 and 785 MARC fields with data in the "a" or
"t" subfields. (You might need to add these fields to an existing
record, or create a new record. You might also need to change your
MARC Bibliographic Framework settings to not "hide" these fields in
your framework(s)).
N.B. The data in the "a" or "t" subfields should be a title that
exists in your database. Otherwise, this test might seem misleading.
2) Set the system preferences "XSLTDetailsDisplay" and
"OPACXSLTDetailsDisplay" to "default".
3) Go to your record (which contains the 780/785 fields), and look
for links with linktext derived from the "a" or "t" fields in the
record. These may or may not be prefaced with labels such as
"Continued by" or "Continues".
4) Note that the links are formatted "q=TITLE". Click this link
and note the possibly high number of results.
5) APPLY THE PATCH
6) Shift+Refresh your record page, and observe that the link should
now say "q=ti,phr:TITLE". Click this link and note that you are
either taken directly to the referenced article or that your
search results are considerably fewer.
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz> Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
XSLT change only, no regressions found.
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 275dfd2fac59c824d9591644fe982e9008032407) Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Mathieu Saby [Thu, 13 Jun 2013 18:22:51 +0000 (20:22 +0200)]
Bug 10218: Add individual CSS classes for bibliographic information in OPAC (UNIMARC)
Follow-up for UNIMARC XSLT Display
This patch adds class to span markup in list and detail display.
XSLT are not build in the same way in MARC21 and UNIMARC, so I had
to add a parameter "spanclass" to 3 templates called in UNIMARC :
tag_title, tag_7xx, tag_comma
To test, apply the patch on a Koha instance with UNIMARC records, and
- activate sysprefs OPACXSLTDetailsDisplay and OPACXSLTDetailsDisplay
- make a search on the OPAC. In the results, check the spans with
"results_summary" class have also more a precise class.
Ex : span class="results_summary publication"
- view some records in detailed view. If possible, a record with
a series, a record with some subjects, a record with different authors,
a record with a link in 856. Check the spans with "results_summary"
have also a more precise class.
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Comment: Works exactly as described on results and detail.
No koha-qa errors
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
XSLT only change.
Tested in a UNIMARC install, HTML source code looks ok.
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 3d6bec745536a3e91e960d55542ec7233c17cfce) Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Bug 10609: Use branch name rather than branch code in serials-collection.pl (3.12.x)
This is the 3.12.x compatible version of the patch for 10609.
Regards
To+
Sponsored-by: Universidad Nacional de Cordoba Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz> Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Serial collection page now displays the branch description
instead of the branchcode.
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
(cherry picked from commit 64332b6b9be9ab71b22433533d529573a2f5297f) Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Bug 10915: (QA followup) warn if cannot read history.txt
This patch makes about.pl test if success opening history.txt, and
shows a convenient warning to the end user. No more warnings in the logs
(about.pl: readline() on closed filehandle $file at /usr/share/koha/intranet/cgi-bin/about.pl line 166)
and better problem solving information for the end user.
Sponsored-by: Universidad Nacional de Cordoba Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 45b85a700fcb4c9db07ec0bd13ecd8463696c4c2) Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Mason James [Thu, 19 Sep 2013 12:06:20 +0000 (00:06 +1200)]
Bug 10915: fix About->timeline breakage on incompletely upgraded Koha
This patch supplies a default value for the koha-conf.xml
setting docdir to handle the case where the user neglects
to set it upon upgrade.
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Fixes dev and standard installs without docdic tag in koha-conf.xml.
Doesn't break when docdir present either. Warning still present
on packages install that didn't add the docdir definition in koha-conf.xml
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 3ae471a352fa2b00782c29c5c40f39db04fe510a) Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Sophie Meynieux [Wed, 14 Aug 2013 13:51:10 +0000 (15:51 +0200)]
Bug 10727: Replace carriage return with <br /> when printing hold notices
This patch replaces carriage return with <br /> in the content of
hold notices for printing. This is necessary to convert html file
into well formatted pdf file.
Test plan :
- check in an item reserved by a borrower
that has not activated email notification
- verify in message_queue table that you've got a
new HOLD_PRINT notice with status 'pending'
- run gather_print_notices.pl <directory>
Without the patch, the script generates a html file without <br /> tags.
If you run printoverdues.sh <directory>, the text in the resulting PDF
file is all on one line
With the patch, the script generates a html file with <br/> tags and
the PDF file created by printoverdues.sh is well formatted.
Signed-off-by: Srdjan <srdjan@catalyst.net.nz> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 30b32d99381a8296e41e6843c440cd9e3594eb8a) Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
projects / koha.git / log