Jonathan Druart [Thu, 17 Sep 2015 11:45:15 +0000 (12:45 +0100)]
Bug 5371: Force no caching for private pages at the OPAC
In order no to slow too much the browsing, it is certainly not a good
idea to add this cache-control value for all pages at the OPAC.
This patch just adds where the author found it could be useful.
Test plan:
1/ Login at the OPAC
2/ Go on the account page (opac/opac-account.pl)
3/ Click log out
4/ Use the back button of your browser
Without this patch you will see the previous page.
With this patch, the previous page will be reloaded and you will be
redirected to the login form.
Signed-off-by: Marc Véron <veron@veron.ch> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Tomas Cohen Arazi <tomascohen@unc.edu.ar>
(cherry picked from commit 542ab0bce949eba3abc98ff1c433fe6099db105d) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Conflicts:
opac/opac-discharge.pl
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 30a0365e915cce4e9b08bde790db69ef6d8ce9bd) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit 2f5b29ef19d85c40ed386be3fb4490387471d35c) Signed-off-by: Liz Rea <wizzyrea@gmail.com>
David Cook [Tue, 17 Nov 2015 02:03:59 +0000 (13:03 +1100)]
Bug 15198: Make OpacSuppression work even if there are no records suppressed
This patch adds the Zebra special attribute 14 to ccl.properties and
opac-search.pl, so that we can turn on OpacSuppression and still return
results even if there are no records in Zebra for the Suppress index.
_TEST PLAN_
Before applying:
1) Make sure that you have no suppressed records indexed in Zebra
2) Turn on OpacSuppression system preference
3) Search using a keyword which should bring up records
4) Note that no records are returned in the results
5) Change UseQueryParser system preference to "Try"
6) Repeat steps 3-4
Apply the patch.
After applying:
7) Repeat step 3 (ie search using a keyword which should bring up records)
8) Confirm that records are appearing in the results!
9) Change UseQueryParser system preference to "Do not try"
10) Repeat step 3
11) Confirm that records are appearing in the results!
Signed-off-by: Hector Castro <hector.hecaxmmx@gmail.com>
Works as advertised. No more, won't need to have at least one record with the
value "1" in the field mapped with this index. All records in OPAC returned.
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit dd9a4ed6c6fbc078d43880e4adf8cfe28179888d) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit c0928321a062fed31ce4ca841237be36d3e14cc2) Signed-off-by: Liz Rea <wizzyrea@gmail.com>
Jonathan Druart [Sun, 24 May 2015 15:52:25 +0000 (17:52 +0200)]
Bug 14264: Fix export of late orders when translated
Bug 7298 tried to fix this issue, but it was not correct.
We have 3 files in acqui/csv:
basketgroup.tt, basket.tt and lateorders.tt
The first 2 don't contain translatable string, and are not modified on
translating the templates (`translate install`)
On the contrary, lateorders.tt has some strings to translate ('Author:',
'Published by:', etc.). After being translated, all carriage returns
between TT tags are removed.
Test plan:
1/ choose a language and update + translate the templates
for instance:
cd misc/translate;
./translate update es-ES; ./translate install es-ES
2/ Go to acqui/lateorders.pl using this language
3/ Generate a csv for 1+ late orders and confirm the first line only
contains the headers.
Signed-off-by: Laurence Lefaucheur <laurence.lefaucheur@biblibre.com> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit b2706884a1916827229ad6f818790ec47a43cbf5) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit 9fa3b18924addd2c468435b13bc1fc84157fff28) Signed-off-by: Liz Rea <wizzyrea@gmail.com>
Jonathan Druart [Tue, 22 Sep 2015 11:11:34 +0000 (12:11 +0100)]
Bug 4502: Changing wording again...
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Just a string patch, others are signed.
No errors
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 379329861d19b178f14d360d9fee2518a462d8a7) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit 9d691b2a85d494b66352d2d3de05480fe170fd89) Signed-off-by: Liz Rea <wizzyrea@gmail.com>
Mark Tompsett [Mon, 6 Apr 2015 23:50:30 +0000 (19:50 -0400)]
Bug 4502: An attempt to make things more sensible.
The reason the budget_period_id was not defined was because in
two cases it was not passed! This patch adds those missing
parameters. And as a result, cuts out the attempt to default the
authcat to '' unless the budget_period_id is defined.
Additionally, the start and end months don't seem to be passed,
so rather than have it blow up, checking them forces the else
case logic.
budget_period_id is the budget id. If you have two budgets,
you can craft a URL to work with budget_period_id matching
those two ids. Anything else should trigger the new error which
was modified to reflect more of what the problem is.
Follow the test plan in comment #6. Feel free to also to attempt
crafting URLs and triggering errors.
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Well, works and does not explode any more
No errors
To trigger the new message simply put /cgi-bin/koha/admin/aqplan.pl
on your staff page, an intriguing 'Planning for by Asort1' appears :)
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit fea7b9b4d444a6bdf3f1326c54eddd68670be7f7) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit 4ca1bac3106728450cef9feb9df942e78a1256a9) Signed-off-by: Liz Rea <wizzyrea@gmail.com>
Jonathan Druart [Tue, 24 Mar 2015 14:54:37 +0000 (15:54 +0100)]
Bug 4502: Catch software error if no active budget defined
TEST PLAN
---------
0) Back up your database.
1) In mysql client:
> DROP DATABASE {your koha database name};
> CREATE DATABASE {your koha database name};
> QUIT;
2) Go to the staff client, and install all the default
and optional things -- except patrons. :)
3) Log into staff client.
4) Create a patron -> New Patron -> Staff
5) Enter data and Save
6) More -> Set Permissions
7) Make superlibrarian
8) Log out
9) Log in as new superlibrarian
10) Acquisitions -> Budgets -> New Budget
11) Enter a non-active budget with some funds.
-- Once saved, it should list in the inactive budgets.
12) Click on the name.
13) Click on one of the Planning submenu options.
14) Click the 'Submit' button in the Filter area.
-- This should trigger the blow up.
15) Apply the patch
16) Repeat steps 12-15
-- The kaboom is avoided and a nice message given.
NOTE: This does not solve all the problems in this ugly, ugly
module area. It does solve the one thing it is meant to:
that nasty kaboom.
Signed-off-by: Mark Tompsett <mtompset@hotmail.com> Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 0a391237710aec779b000c3dff219e54b22fb76a) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit e5d59cad73a4b6c16aca72bf478ce8df4e5f8f3e) Signed-off-by: Liz Rea <wizzyrea@gmail.com>
Kyle M Hall [Mon, 2 Mar 2015 14:06:58 +0000 (06:06 -0800)]
Bug 13411: (QA followup) Add logging
Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit feafa273e443e56021959153e91bd999a68daf29) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit fc5804e6f1c175e40708b0a7604c4bf7ba5344bd) Signed-off-by: Liz Rea <wizzyrea@gmail.com>
Kyle M Hall [Thu, 27 Aug 2015 14:56:22 +0000 (10:56 -0400)]
Bug 13411: Koha's SIP server returns not ok for checking in items that are not checked out
If an item is not checked out when a checkin via SIP2 is attempted,
Koha's SIP server sends back an "ok" of 0, and the AF message "Item
not checked out". I am not entirely sure this is good and correct
behavior by the SIP2 protocol.
In particular, this will cause SIP2 book sorting devices to fail on
all items that are not checked out, causing them all to be put into
the "special handling" been that should be reserved for things like
items checked in at the wrong library and items on hold.
Test Plan:
1) Apply the patch for bug 13159 so you can use the new enhanced
SIP2 command line emulator
2) Use a command similar to the following to check in an item:
sip_cli_emulator.pl -a localhost -su <sip user> -sp <sip password> -l <instituation id> --item <barcode> -m checkin
3) Note the 3rd character is 0, and there is an AF field saying the item is not checked out
4) Apply this patch
5) Restart the SIP server
6) Repeat steps 2-3, note that nothing has changed
7) In the SIP config file, Add the parameter checked_in_ok="1" to the SIP account you are using.
8) Restart the SIP server
9) Repeat steps 2-3, note that this time the 3rd character is 1, and you do not recieve the item not checked out message.
Signed-off-by: Benjamin Rokseth <benjamin.rokseth@kul.oslo.kommune.no> Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 181d3aa56de8377c67247db26932c4e5a7cb83d9) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit c87520d90a99c06a7f6194643ead55c1ebd3a867) Signed-off-by: Liz Rea <wizzyrea@gmail.com>
Respect IntranetBiblioDefaultView on intra search result page, on cover image
link, when XSLTResultsDisplay is empty.
TO TEST:
1. Empty XSLTResultsDisplay
2. Activate intranet local and Amazon cover images
3. Play changing IntranetBiblioDefault, and observe the links respectively on
biblio record title and cover image. Title's link is OK, cover image
link goes to detail.pl page independently of IntranetBiblioDefault.
4. Apply the patch.
5. Repeat 3.
Signed-off-by: Hector Castro <hector.hecaxmmx@gmail.com>
Link to right display according with IntranetBiblioDefaultView is fixed.
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
http://bugs.koha-community.org/show_bug.cgi?id=14175 Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 0fe08231f427bdc65b1ff1219ad7507c284f1dbd) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit c9d030f75f338fea183895010e8787ae1fe48c67) Signed-off-by: Liz Rea <wizzyrea@gmail.com>
Jonathan Druart [Fri, 13 Nov 2015 15:45:04 +0000 (15:45 +0000)]
Bug 15114: Fix typo in opac-suggestion template
There is a $ in front of the loggedinusername variable, which is
obviously not what is expected here.
It fixes the wrong warning message "You are not authorized to see
pending purchase suggestions." when it should be "There are no pending
purchase suggestions."
Signed-off-by: Frédéric Demians <f.demians@tamil.fr> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 621f2ce9ac960d93466c9da5b4c6559e71519e3d) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit c262b16abec3d23eea864eed91dd132685ff6285) Signed-off-by: Liz Rea <wizzyrea@gmail.com>
Jonathan Druart [Fri, 13 Nov 2015 09:17:49 +0000 (09:17 +0000)]
Bug 15109 - Regression in patron search results ordering
In Koha 3.16 or earlier, before the introduction of the ajax datatable
for patron searching, the search results were ordered by name. In
master, the results are currently ordered by cardnumber, which is not
very useful.
Test Plan:
1) Do a "browse by last name" or a patron search
2) Note the results are sorted by card number
3) Apply this patch
4) Reload the page, start a new search
5) Note the results are sorted by name
Signed-off-by: Nicole Engard <nengard@bywatersolutions.com> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit cc65a5fed2afd27b2a45af49d6fe08d54fef7de9) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit 1524cb1119db421bd67a22e461cb53bdadd75ec7) Signed-off-by: Liz Rea <wizzyrea@gmail.com>
This patch loads Koha::NorwegianPatronDB if it can, or adds a warning
to the log if it can't load it.
Since the Koha::NorwegianPatronDB functionality in C4::Members is
wrapped in system preferences, the loading of the module is
irrelevant unless one actually wants to use the module and its
associated functionality.
NOTE:
This patch fixes a problem where we were getting errors saying
Crypt::GCrypt couldn't be loaded even though it's not a required
dependency.
This patch will likely only affect people not using Debian-based
systems where libcrypt-gcrypt-perl is available. The current
version of Crypt::GCrypt doesn't build so it's not an option
for most non-Debian users to install this not required
dependency in order to work around this issue...
Signed-off-by: Hector Castro <hector.hecaxmmx@gmail.com>
Works as advertised for Debian-based systems
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 1801a9462e190231f3303b01247b834f6e1d99bd) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit 3b510cee00e5960eff43800d9df978123061b9b6) Signed-off-by: Liz Rea <wizzyrea@gmail.com>
The first email contains badly encoded subject & message. The second email
contains badly encoded subject, but correct message.
2. Apply the patch
3. Repeat 1 => No more strange characters.
Signed-off-by: Liz Rea <liz@catalyst.net.nz>
Characters are correctly encoded now, thanks for that good spot.
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 9515db57bdd13cdff33d9056963455fb850ad877) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit bfbddd183c9c97b05b1e9305ff5e8f45ac19c179) Signed-off-by: Liz Rea <wizzyrea@gmail.com>
misc/cronjobs/runreport.pl --subject="My fancy subject!" --to=you@youraddress.com 1
where 1 is the number of your favourite saved report.
Success is your email arrives with the subject "My fancy subject!" Failure is
(with --subject defined) you get either the description of the report, or "Koha
saved report" as the subject. This is success without --subject defined.
Signed-off-by: Frederic Demians <f.demians@tamil.fr>
Bug repeatable and fixed by this patch.
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 4f8476e09c2de223f73692521b8f8e533ef8400f) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit 5288b0d9b579a90e287348c8650d9d92a36f8ca2) Signed-off-by: Liz Rea <wizzyrea@gmail.com>
Bug 14542: Transliterate rule for all single quote forms
Single quotes in common language (not in programming) are usually ', but
there is also the form known as ’ in HTML. See
https://fr.wikipedia.org/wiki/Apostrophe_%28typographie%29
This bug proposes to transliterate all forms into a space.
Test plan :
(I'll use the code ’ instead of the unicode character)
- Without the patch
- Create a record with title : L’avion d’argile
- Index this record
- Search for "L’avion d’argile" => You find the record
- Search for "L'avion d'argile" => You do not find the record
- Apply patch
- Search for "L’avion d’argile" => You find the record
- Search for "L'avion d'argile" => You find the record
- Search for "L avion d argile" => You find the record
Signed-off-by: Frederic Demians <f.demians@tamil.fr> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit b11eb03a4c9674f4f4dedadaa8790257e30fb1d0) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit c7f90a22be27a8960b6429a5a7e66bf77371f8da) Signed-off-by: Liz Rea <wizzyrea@gmail.com>
Bug 14078: converting from ISO5426 is not complete
Conversion of MARC from ISO5426 is defined in C4::Charset::char_decode5426().
Each character or combined characters conversion is defined in a map.
This patch changes some odd actual conversions.
In char_decode5426(), only characters between 0xC0 and 0xDF will be used for combining with following charater :
($char >= 0xC0 && $char <= 0xDF)
So conversion like "$chars{0x81d1}=0x00b0" will never be used.
Rules for "h with breve below" use combining with 0xf9 but looks like the correct caracter is 0xd5.
See http://www.gymel.com/charsets/MAB2.html
Signed-off-by: Frederic Demians <f.demians@tamil.fr> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 5e3882bcecede59f24a6b3c4aa9c4324390a29c3) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit 2ceab7145e2c337a8737d2f3a4b20ff9a6c20315) Signed-off-by: Liz Rea <wizzyrea@gmail.com>
Hector Castro [Sat, 7 Nov 2015 06:16:02 +0000 (00:16 -0600)]
Bug 15154: Allow correct translation for upload local cover image
To test:
-Set syspref LocalCoverImages and OPACLocalCoverImages to Allow
-A new tab 'Images' appear in bib record detail on Intranet.
-Notice about the phrase "Please upload one"
-Apply the patch and reload the page.
-New phrase appear "Select the image file to upload" with button Upload
-Update translation files : cd misc/translator; perl translate update es-ES
-You will see in es-ES-staff-prog.po the new entry
"Select the image file to upload. %sUpload%s"
-You can see the result installing the translation
cd misc/translator ; perl translate install es-ES
Signed-off-by: Frederic Demians <f.demians@tamil.fr>
A native English speaker could confirm that the wording is ok: Please select
the image file to upload
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit dfa757af927aaa5b80a4dd8c90210d12531cfcd7) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit ffa12f38437792b927e7189ec9fbe3f3429065a9) Signed-off-by: Liz Rea <wizzyrea@gmail.com>
Jonathan Druart [Fri, 13 Nov 2015 15:18:56 +0000 (15:18 +0000)]
Bug 15137: Display ISBN and author info when sending list by email
Disclaimer: this is not caused by bug 14544 :)
And can be backported!
Both isbn and author information are missing when a list is sent by
email.
Emails sent from OPAC and staff should be (almost) the same.
Test plan:
1/ Sent a list by email (Button "Send list")
2/ The email you will receive should contain the isbn and author info
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
On top of last patch of Bug 14544
Works ok, mail with authors and ISBN
No errors
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit eb286ebbc3c594e8e81e1e8b1848ca1d52b8bccb) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit caf0e23032c0ced4bba07ab4d888bd74695c9110) Signed-off-by: Liz Rea <wizzyrea@gmail.com>
Jonathan Druart [Thu, 17 Sep 2015 13:31:55 +0000 (14:31 +0100)]
Bug 6657: Prevent biblionumber to be duplicated
If the biblionumber field is displayed in the framework, on editing a
biblio the field/subfield will be duplicated.
To prevent that this patch adds a check when building the field list.
Test plan:
1/ map biblio.biblionumber with 999$c
2/ Display 999$c in a framework
3/ Edit a biblio using this framework
4/ Save => The field should not have been duplicated
5/ map biblio.biblionumber with 001
6/ Display 001 in a framework
7/ Edit a biblio using this framework
8/ Save => The field should not have been duplicated
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Works as described, aldo removes duplicate values.
No errors
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 9ae556a21243ecae669bda2c5f42a67769ae9d78) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit c32edbd6e1d25583b8bf040e472727b0058a87d6) Signed-off-by: Liz Rea <wizzyrea@gmail.com>
Kyle M Hall [Thu, 29 Oct 2015 11:48:02 +0000 (07:48 -0400)]
Bug 15079: Batch Delete Records Error
When using the batch deletion tool, if the script attempts to delete an
undeletable item, the script will die with the error:
Label not found for "next BIBLIONUMBER" at
/usr/share/koha/intranet/cgi-bin/tools/batch_delete_records.pl line 172.
Test Plan:
1) Attempt to batch delete a record with an item that cannot be deleted
2) Note error
3) Apply this patch
4) Repeat step 1
5) Note the error no longer occurs
Signed-off-by: Hector Castro <hector.hecaxmmx@gmail.com>
Works as advertised. Follow comment 5 to reproduce the issue
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
I have not tested this patch, but looking at the code it is obviously a mistake.
If an error occured, we rollback and skip this record. Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 706a31b50d52ef1ba48c568d7e60c376cfe87983) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit dc39e4b410c173d497ce41651dbf39d6a72dd461) Signed-off-by: Liz Rea <wizzyrea@gmail.com>
Bug 14553: Silencing warn triggered when clearing item rating on OPAC
To test:
1) Go to any item and clear the star rating (don't have to set a rating first)
2) Notice the warn
3) Apply patch and reload page
4) Clear star rating
5) Notice no warn
6) Click a star to add a rating
7) Make sure your rating, the average rating and amount of votes are all
correct
8) Could be beneficial to log in as another user and try to add a rating on the
same item from their account. Check the average rating is
cacalculated and amount of votes increases
9) Confirm still no warns
Signed-off-by: Frederic Demians <f.demians@tamil.fr>
Can see the warning in logs, and its disappearance with this patch. Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 94c5f8d5f06b588da0903c9607349adbf16344be) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit 0a325ab7ba740b69819d89bb1d6de18015289cae) Signed-off-by: Liz Rea <wizzyrea@gmail.com>
Jonathan Druart [Tue, 10 Nov 2015 15:17:12 +0000 (15:17 +0000)]
Bug 14735: Save cache_expiry on modifying a report
The cache_expiry is not saved when updating a SQL report.
Test plan:
0/ Enable memcached
1/ Create a sql report
2/ Edit it and change the cache expiry value
3/ Edit again
=> The value should have been updated.
Signed-off-by: Frederic Demians <f.demians@tamil.fr>
Repeatable bug. Solved with this patch. Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 27a15d5a429620dbad0a16292d714e3389ea057e)
(cherry picked from commit eeb9a6c1e577245387604987a5ed1cd5c1ab1411) Signed-off-by: Liz Rea <wizzyrea@gmail.com>
David Cook [Tue, 21 Jul 2015 03:09:39 +0000 (13:09 +1000)]
Bug 14575: OPACURLOpenInNewWindow should apply to item-level urls too
This patch applies the OPACURLOpenInNewWindow system preference
to item-level urls (in addition to the pre-existing bib-level url
handling).
_TEST PLAN_
Before applying:
1) Set OPACURLOpenInNewWindow to "don't" and click on an item-level url
2) Note that the current tab changes to that url
3) Set OPACURLOpenInNewWindow to "do" and click on an item-level url
4) Note that the current tab changes to that url
Apply the patch.
After applying:
5) Click on an item-level url
6) Note that the url opens in a new tab (as OPACURLOpenInNewWindow
should be set to "do")
7) Set OPACURLOpenInNewWindow to "don't" and click on an item-level
url
8) Note that the url opens in the current tab
9) Repeat the above steps 5-8 alternating
"TrackClicks" between "Don't track" and either "Track" or
"Track anonymously".
Followed test plan. Works as expected. Signed-off-by: Marc Véron <veron@veron.ch> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit e815d1e010a20b73327cba1eaa78d08f06ec50a8)
(cherry picked from commit 219df070e8beaede19914e995e7eb60be37ae854) Signed-off-by: Liz Rea <wizzyrea@gmail.com>
Colin Campbell [Tue, 20 Oct 2015 13:19:35 +0000 (14:19 +0100)]
Bug 15036: Do not overwrite complete status in basket ops
Reopening or closing a basket should preserve the completed
status for receipted orders.
This patch excludes orderlines with the completed status
from having their status rewritten as a result of the
change in basket status
Made the subroutines involved more efficient by removing an
unnecessary loop and by not fetching a large amount of
superfluous data
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 4a4dbbf1237c93e0233eef0600015c9be3320bf0) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit 9dace4e21e33f1b92e1e2db7ef72435539895794) Signed-off-by: Liz Rea <wizzyrea@gmail.com>
Bug 14867: userid not generated when defined in BorrowerUnwantedField
When userid is not provided when creating a new patron, it is generated
using surname and firstname. The bug is when userid is defined in
syspref BorrowerUnwantedField, the input text is missing in patron
creation form. When saving you always get an alert message :
"Username/password already exists". No patron can be created.
This patch corrects by adding this case to userid generation conditions.
Test plan :
- add 'userid' in syspref BorrowerUnwantedField
- try to create a new patron : /cgi-bin/koha/members/memberentry.pl
- there is not input text for userid
- choose non-existing surname and firstname
- click on save
=> Without patch : patron is not created, you see the alert message
"Username/password already exists"
=> With patch : patron is created, userid is generated with surname
and firstname
- remove 'userid' in syspref BorrowerUnwantedField and check it can be
defined in patron creation form
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
The issue is there, and this patch fixes it.
Joonas Kylmälä [Mon, 17 Aug 2015 12:40:05 +0000 (12:40 +0000)]
Bug 14687: Patron's transaction history changes items' order after paying fines.
Sorts Patron's accounting data consistently from newest to oldest.
It doesn't depend on anymore to timestamp (which can be same for multiple
entries) from database but instead uses accountline's id to sort.
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@theke.io>
(cherry picked from commit 307fe0ac533c2dc8116a183d104c864717a91fc5) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit eea56d412461d9b673306697dcf5335d8686afc8) Signed-off-by: Liz Rea <wizzyrea@gmail.com>
Jonathan Druart [Tue, 22 Sep 2015 10:16:28 +0000 (11:16 +0100)]
Bug 12540: Display "Every" on editing a MMT action if previously selected
On creating a marc modification template action, the "All" is changed with
"Every" if the condition field is the same as the original field.
But on editing, the "All" value is not replaced. For consistency, it
should.
Test plan:
1/ Create the following action:
Copy field 650$x to 650$y if 650$z matches "foobar"
Note that the "All" is replaced with "Every" when the condition is the
same field as the original field.
2/ Save
3/ Edit the action.
The "Every" should be selected.
Without this patch, "All" is selected.
Signed-off-by: Alex Arnaud <alex.arnaud@biblibre.com> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 384dceeef583c444ac8350c928a2e1aed34e536b) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit 868bdc355d9f5d7e098fd00eff2fbc29597659c7) Signed-off-by: Liz Rea <wizzyrea@gmail.com>
In order to avoid loading Koha::NorwegianPatronDB a DB query was
used. Instead, a require should be used. This causes non-db_dependent
tests that load C4::Members to fail.
To test:
- Shut mysql down
$ sudo service mysql stop
- Run the tests:
prove t/Circulation_barcodedecode.t
=> FAIL: DB connection is expected, tests fail
- Apply the patch
- Run the tests:
prove t/Circulation_barcodedecode.t
=> SUCCESS: Tests pass
- Sign off .-D
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
cherry-picked from f25fe6ddb4a340f12613784dc841ab5bfd672d6b Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit bc668dccd3af3fba14e04a764499b0d762c63455) Signed-off-by: Liz Rea <wizzyrea@gmail.com>
Mason James [Wed, 16 Sep 2015 01:56:23 +0000 (13:56 +1200)]
Bug 15035: Anti-spam for opac-suggestions - FOLLOW-UP
to test this patch...
1/ enable 'suggestion' and 'AnonSuggestions' sysprefs
2/ edit the koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-suggestions.tt file,
to reveal the hidden 'negcap' field
replace line 87 opac-suggestions.tt, from...
<li id="negcap" style="position: absolute; left: -2000px;">
to ...
<li id="negcap">
3/ attempt to add another suggestion, and populate the 'negcap' field
adding the suggestion is supposed to fail, but actually succeeds!? :/
4/ apply patch
5/ repeat step 3, suggestion attempt should fail as expected
modified: opac-suggestions.pl
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Confirmed insertion with negcap before patch.
With negcap value suggestion fails silently
Without negcap suggestion is inserted
No errors
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 6b31947c3bb6517ecdc7d21440ba79895c270749) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit 49d2b2c84dbd85da2a2495ac3b81e450f4e522b4) Signed-off-by: Liz Rea <wizzyrea@gmail.com>
Lyon3 Team [Wed, 4 Nov 2015 16:06:10 +0000 (17:06 +0100)]
Bug 15130: useless unitialization warnings when updating authorities
Signed-off-by: Frederic Demians <f.demians@tamil.fr>
Fixes a trivial coding error.
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 6c94dc79878c727b47f0617548613e1b7f5794a3) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit 34ae0f50aedc693091d462a000fe93bc02b63e82) Signed-off-by: Liz Rea <wizzyrea@gmail.com>
Bug 14632: Fix alert message for single item batch
Fixes the incorrect msg "Please select at least label to delete."
for attempts to delete from single patron batches. Notifies the
user that doing so will delete the batch. It disallows direct
deletion, instead suggests the users to use the 'Delete batch'
option assuming the users know what they are doing.
Test plan
=========
1/ Load a single patron batch in edit mode and attempt to delete
the single record. The JS alert message will inform that "Please
select at least label to delete."
2/ Apply patch and refresh page and try to delete the single record
again.
3/ This time the alert will inform the user that doing so will delete
the batch and should that be desired action to choose the 'Delete
batch' option from the toolbar.
Signed-off-by: Frederic Demians <f.demians@tamil.fr>
It works as before but with an understantable warning message.
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 85ae12e5864d8fd35f42a53c66440f00f7f4a35d) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit a698cd39dba4595b9094c097db8d4108d11f1a4f) Signed-off-by: Liz Rea <wizzyrea@gmail.com>
Marc Véron [Wed, 4 Nov 2015 09:13:46 +0000 (10:13 +0100)]
Bug 15117: Transfer Order: Better user information and translation handling
While transferring an order, a untranslatable JavaScript confirmation
dialog pops up.
This patch moves the information about the order to be transferred to the
top of the screen to better inform the user what order is to be transferred,
and simplifies the confirmation dialog.
To test:
- Apply patch
- Transfer an order from a basket to another basket
- Verify, that on top of the screen an information is displayed about which
order from which vendor and basket is to be transferred
- Verify that the transfer works OK
- Update a po lang file and confirm you see the string and you are able
to translate it.
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 571ec9a94b9323cd23f9012d9b1f837fd9bf974c) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit 57a8479bf36f530a55fd93ba67fe965efb0e0373) Signed-off-by: Liz Rea <wizzyrea@gmail.com>
Colin Campbell [Tue, 11 Aug 2015 15:51:53 +0000 (16:51 +0100)]
Bug 14673: Work around change to AddIssue return
Return from AddIssue used to be due date or undef.
Now it is less straightforward returning am issue object
if an issue row is created or undef. If the issue is a renewal
undef is returned. As that case was not handled properly it
caused the server site to crash the listener causing a
communications error on the client.
Signed-off-by: Frederic Demians <f.demians@tamil.fr> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit b4967bf0ed60c5cca0c7f60591d21d2919f477a1) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit 374f5f4a38883d351d441412cfdf4785bbe7f4b6) Signed-off-by: Liz Rea <wizzyrea@gmail.com>
Marc Véron [Fri, 4 Sep 2015 07:50:07 +0000 (09:50 +0200)]
Bug 14781: Creation of barcode types 2of5 not functional
This patch fixes the rendering of "COOP2of5" or "Industrial2of5" barcodes in the label creator module.
To test:
- Create a label layout with COOP2of5 barcode type
- Create labels (make sure that the items's barcode values are numeric only!)
- Export batch and download PDF.
Without patch:
- No barcodes rendered
With patch
- Barcodes should render as expected. Test for both barcode types.
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Works as described, tested both formats.
Non digit barcode is not printed.
No koha-qa errors, no t/ & xt/ errors
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Note: To be printed, barcode should be numerical. Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 2b88f0cb38d74da93a723fd1cf3cbcf68030649e) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit 0d0b4ae8486888a37ab09bd1e8f211c30e43b943) Signed-off-by: Liz Rea <wizzyrea@gmail.com>
Sophie Meynieux [Wed, 4 Nov 2015 18:04:26 +0000 (19:04 +0100)]
Bug 14157: Notices tab in the patron record should not depend on EnhancedMessagingPreferences to display
Overdue and Hold notices can be sent even if EnhancedMessagingPreference
is set to "Don't Allow", so Notices tab have to be visible in all cases.
Test plan :
- without patch :
- set EnhancedMessagingPreference to "Don't Allow" and go to patron
record : there is no Notices tab
- set EnhancedMessagingPreference to "Allow" and og to patron
record: there is a Notices tab
- apply this patch :
- go to patron record, you cas see a Notices tab
- change the value of EnhanceMessagingPreferences, Notices tab is
always visible.
Followed test plan, works as expected Signed-off-by: Marc Véron <veron@veron.ch> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 471b1a8b69ff3842fbddda1e0aa068d439c85a0d) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Conflicts:
koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc
3.20 had some other new (unrelated) things, resolved conflict and retested, all ok.
Fridolin Somers [Mon, 26 Oct 2015 07:44:17 +0000 (08:44 +0100)]
Bug 15059: Line break in html attribute in branchoverdues.tt
In circ/branchoverdues.tt, there is a line break inside href attribute.
This generates an attribute with a lot of spaces %20.
Test plan :
- at intranet go to ciculation module
- click on "Overdues with fines"
- look at links "Phone", "Notice" and "Considered lost"
=> Without patch the URL contains a lot of spaces
=> With patch the URL is correct
Signed-off-by: Marc Véron <veron@veron.ch> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 3e0b35c15db408593b0d1a1a4c381750f8d3bec8) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit 345d4a0341fc7452f11c7faabefdb2750af36ca6) Signed-off-by: Liz Rea <wizzyrea@gmail.com>
Jonathan Druart [Wed, 2 Sep 2015 16:13:41 +0000 (17:13 +0100)]
Bug 10799: Limit the SCO user to the SCO module
The SCO user should only be allowed to access to the SCO module.
This patch make the session ends if the user tries to access another
page after the SCO module.
Test plan:
0/ Configure the SCO module correctly
1/ Go on the sco main page (sco/sco-main.pl)
2/ Try to go somewhere else: you should not be logged in
Signed-off-by: Marc Véron <veron@veron.ch> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 02feeca14f4c27a05f46920545734c3a9e5455d7) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit 7853b503ab8aadd98d5908768dd4252208850b04) Signed-off-by: Liz Rea <wizzyrea@gmail.com>
This patch prevents adding items to invalid (empty)
rotating collection id
To test:
1) Go to /cgi-bin/koha/rotating_collections/addItems.pl
2) Try to add an item, you get error show in attached pictures
3) Apply the patch
4) Go again to /cgi-bin/koha/rotating_collections/addItems.pl
5) Can't add any items
I don't know if this is a real problem
Followed test plan, works as expected. Signed-off-by: Marc Véron <veron@veron.ch> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit fff73a73837d577214fa3a9198fa97f8a50471f3) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit a6878413151477d87955c1af30994dfa5415d180) Signed-off-by: Liz Rea <wizzyrea@gmail.com>
Marc Véron [Tue, 27 Oct 2015 11:38:32 +0000 (12:38 +0100)]
Bug 15068: Get rid of warnings in members/summary-print.pl
This patch removes warnings when printing a summary from a member's
detail page, like:
- use of uninitialized value in sprintf
at /usr/share/kohaclone/members/summary-print.pl line 47
- Use of uninitialized value $roadtype in concatenation (.) or string
at /usr/share/kohaclone/members/summary-print.pl line 61
- Use of uninitialized value in addition (+)
at /usr/share/kohaclone/members/summary-print.pl line 87
- Argument "2015-11-03 23:59:00" isn't numeric in numeric comparison
(<=>) at /usr/share/kohaclone/members/summary-print.pl line 103
To test:
- Apply patch
- Go to a detail page with a member who has a lot of fines
- Print summary
- Verify that warnings like the ones above do no longer appear.
Signed-off-by: Frederic Demians <f.demians@tamil.fr>
Have been able to see those warnings in Apache log file, and notice
their disappearance after applying this patch.
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit c292dde75b5e206045cef47d0be51235159a4b6d) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit 95d9e029c8ef612b5802c6e8951344cb0f678aaf) Signed-off-by: Liz Rea <wizzyrea@gmail.com>
Bug 14773: Move help link back out of the dropdown menu
This moves the help link back out of the dropdown menu
like it used to be.
To test:
1. Notice that in intra the help link is inside the dropdown
menu.
2. Apply the patch
3. Notice that the help link is now clearly visible in the
top right corner of the page.
Sponsored-by: Vaara-kirjastot Signed-off-by: Nicole Engard <nengard@bywatersolutions.com> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 47e2b8f7d8360c059a66032f80dbb5f68b8fa925)
(cherry picked from commit 7d6a7e0b1b15cef23309a19799a16c6d930e1c08) Signed-off-by: Liz Rea <wizzyrea@gmail.com>
Nicole C. Engard [Fri, 30 Oct 2015 20:28:09 +0000 (15:28 -0500)]
Bug 15094: Update link to Windows Offline Circ
This patch updates the link on the main circulation
page to point to the newest release of the offline
circulation tool.
To test:
* Go to Circulation
* Click 'Get desktop application'
* Confirm the link goes to github
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Link Ok
No errors
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 17bcc6a242fce21e759653b2b6c6778cdda336e8) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit fdfd9464287473e7a790688cc865eb5aaee16ed3) Signed-off-by: Liz Rea <wizzyrea@gmail.com>
If a patron has restrictions and a CSV file of patrons to be overwritten
is uploaded but has no debarred / debarredcomment columns, the a new
restriction will be added that combines all the existing restrictions (
i.e. a new debarment based on the existing borrowers.debarred
and borrowers.debarredcomment fields ).
Test Plan:
1) Create a patron with one or more restrictions
2) Import a CSV file that updates that patron, but with no debarred columns
3) Note a new restrictions is created
4) Delete the new restriction
5) Apply this patch
6) Re-import the CSV file again
7) Note that no new restriction is created
8) Add debarred and debarredcomment columns to the CSV file with a test
date and description
9) Re-import the CSV file again
10) Note the new restriction is added to the patron
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Daniel Grobani <dgrobani@samuelmerritt.edu> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit fd123903651435c56ca14d88897e9ce4d7a38bb5) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit 37e7a6fe7801cacf6f89fd96b34d6b3939c9d409) Signed-off-by: Liz Rea <wizzyrea@gmail.com>
Jonathan Druart [Wed, 15 Apr 2015 09:30:17 +0000 (11:30 +0200)]
Bug 10181: Acq - Improve message for deleted records
There are some issues here:
1/ Message not translatable (set in the pl file)
2/ ' by 'displayed even if no author defined
3/ Message not the same every where
4/ Nothing displayed on the invoice page
Test plan:
1/ Create a basket
2/ Add 4 orders A, B, C, D
3/ On the basket, you see "$title by $author", or "$title" if no author
defined
4/ Delete order A, B
5/ Close the basket
6/ Receive B, C
7/ Delete record created for A, C
8/ Go on the basket page, you should see the title and "Deleted
bibliographic record, can't find title" for the deleted record
9/ Go on the invoice page, you should see the title and "Deleted
bibliographic record, can't find title" for the deleted record
Signed-off-by: Joonas Kylmälä <j.kylmala@gmail.com> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 431d217a5185af747a8e80080cb1f381585471fc) Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 6c4e68b2da07fb9e1ae6b3f1d6c77a0b0b141093) Signed-off-by: Liz Rea <wizzyrea@gmail.com>
Jonathan Druart [Wed, 15 Apr 2015 08:54:48 +0000 (10:54 +0200)]
Bug 10181: Make string translatable
Signed-off-by: Joonas Kylmälä <j.kylmala@gmail.com> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 49f2837b2e75511becd09059db99d209917647a7) Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit b94d2d97d2c0e852649e7be1de4acb2ca4f0e81d) Signed-off-by: Liz Rea <wizzyrea@gmail.com>
Nick Clemens [Thu, 10 Sep 2015 10:35:37 +0000 (06:35 -0400)]
Bug 14739 - Add several patrons to a new batch will create a new batch per patron added
This patch changes the functionality of adding patrons to patroncard batches. Instead of using only the patron search, there is now a textarea which can either be manually populated with borrowernumbers, or can be populated using the patron-search
To test:
1 - Create a new patron batch
2 - Click the add items button, if there is no data in the borrowrnumber form you should get a popup
3 - Add items to batch using the popup, borrowernumbers should populate to the form
4 - Click add items again and items should be added to a new batch
5 - Create a new batch
6 - Manually enter invalid borrowernumbers to the form
7 - Click add items, batch should return empty
8 - Manually enter valid borrowernumber
9 - Click add items, batch should be updated
10 - Edit an existing batch and confirm add items works as above
11 - Create a new label batch
12 - Click add items with no data, popup item search should appear
13 - Adding items by checking boxes or using 'Add' button - they should populate the text box on the edit batch page
14 - When adding using form the 'Enter by itemnumber' button should be marked automatically
15 - Submit items and confirm they are added to batch
16 - Create a new batch, enter by barcode manually and check 'Enter by itemnumber"
17 - Click add items, no items should be added
18 - Repopulate form with barcodes, check 'Enter by barcode'
19 - Click add items, items should be added correctly
20 - Test various combinations of radio buttons and numbers and using form or not
Signed-off-by: Barton Chittenden <barton@bywatersolutions.com> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Liz Rea <wizzyrea@gmail.com>
Magnus Enger [Wed, 21 Oct 2015 11:11:28 +0000 (13:11 +0200)]
Bug 15042: Barcode hbyymmincr does not work when receiving serials
To test:
- Set autoBarcode = <branchcode>yymm0001
- Make sure you have a serial that is set to "create an item record
when receiving this serial"
- Receive an issue
- Click in the barcode field - nothing happens
- Apply patch and reload page
- Receive an issue
- Click in the barcode field - a barcode conforming to the
hbyymmincr setting appears
Patch works as advertised. Signed-off-by: Marc Véron <veron@veron.ch> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 55127d50fb0a00f70d5de06dee76ddfad54bd094) Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 2067f598760848cbef6b56d26d97ec9d44d566fe) Signed-off-by: Liz Rea <wizzyrea@gmail.com>
Jonathan Druart [Wed, 14 Oct 2015 13:45:24 +0000 (13:45 +0000)]
Bug 15012: use sudo instead of su in koha-shell
Not sure this is the best way to fix it but it looks to work.
Test plan:
sudo koha-shell kohadev
should not return any error
Without this patch, you should get
bash: cannot set terminal process group (-1): Inappropriate ioctl for device
bash: no job control in this shell
Confirm that other options work as before
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
Works as expected. Tested on kohadevbox:ansible.
KOHA_CONF and PERL5LIB are correctly set on the child shell.
Bonus point: koha-shell doesn't die if the user issues Ctrl+C to abort an execution.
Signed-off-by: Robin Sheat <robin@catalyst.net.nz> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 0e9e51db94abdabe6e603d98a05bf315c8d3fa91) Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
(cherry picked from commit fb546fa7ac5d572d722aa4dcc79edb56976b517b) Signed-off-by: Liz Rea <wizzyrea@gmail.com>
Fridolin Somers [Wed, 6 May 2015 07:14:42 +0000 (09:14 +0200)]
Bug 14154: 608$9 defined twice in UNIMARC biblio-koha-indexdefs.xml
In DOM config file :
etc/zebradb/marc_defs/unimarc/biblios/biblio-koha-indexdefs.xml, the 608$9 is
defined a second time instead of 610$9. Just a type I think.
Test plan :
- Apply patch
- Install a UNIMARC + DOM instance
- Define in a framework 610 using a thesaurus
- Create a new biblio
- Create a new authority (same type as the thesaurus defined above)
- Index : rebuild_zebra.pl -a -b -x -z
- Link the field 610 to the new authority
- Index : rebuild_zebra.pl -a -b -x -z
- In authorities search, search for the new authority
=> You see Use in 1 Records(s)
Signed-off-by: Frederic Demians <f.demians@tamil.fr>
I confirm the typo.
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit aaf3ff3fec54011b30ba302e0c13e3ec5e41a142) Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
(cherry picked from commit 28940870e2393603ab7e68a26404c411a25f94d3) Signed-off-by: Liz Rea <wizzyrea@gmail.com>
Jonathan Druart [Mon, 19 Oct 2015 15:17:31 +0000 (16:17 +0100)]
Bug 15029: Make the IssueSlip tests pass even if launched after 23:00
Prior to this patch, the tests did not pass if they were launched after
23:00.
DateTime complains if you ask for creating a date with hour => 24 (which
is logical so far).
Test plan:
0/ Don't apply this patch
1/ sudo date -s "2015-10-19 23:50:00";prove
t/db_dependent/Members/IssueSlip.t
2/ Apply this patch and repeat 1.
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 00a4e802edf999ffbd16b15704eeb5fca4a73f84) Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
(cherry picked from commit 719f116ac9a59cd9b9f186686ed032b94bbe01ba) Signed-off-by: Liz Rea <wizzyrea@gmail.com>
Kyle M Hall [Thu, 1 Oct 2015 16:59:26 +0000 (12:59 -0400)]
Bug 14937: Expiration date for holds based onReservesMaxPickUpDelay should not require ExpireReservesMaxPickUpDelay
C4::Letters::_parseletter will replace reserves.expirationdate with the
date a hold will be marked as problematic ( holds over ) if both
ReservesMaxPickUpDelay and ExpireReservesMaxPickUpDelay are enabled.
There is no reason this feature needs to rely on
ExpireReservesMaxPickUpDelay as there are many libraries that would like
to send the last day to pick up a hold in notices, but would rather deal
with the expired waiting holds manually rather than have Koha cancel
them automatically.
Test Plan:
1) Apply this patch
2) Set ReservesMaxPickUpDelay to 7
3) Disable ExpireReservesMaxPickUpDelay
4) Add reserves.expirationdate to your HOLD notice
5) Fill a hold for a patron
6) View the message, not that reserves.expirationdate is replaced
with the date the hold will be marked as problematic
Signed-off-by: Karl Holton <kholten@switchinc.org> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit c6d0202569146f52898363eda621f771b61cc918) Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
(cherry picked from commit 77aedf1f7faf1bded9ed4de41d628e2a2fc8ba7d) Signed-off-by: Liz Rea <wizzyrea@gmail.com>
Jonathan Druart [Tue, 4 Aug 2015 15:33:00 +0000 (16:33 +0100)]
Bug 11298: Don't force the renew time to 23:59
If you try to renew an item using the "Renewal due date" at the bottom
of the checkouts table, the time will be hardcoded to 23:59 no matter
what the user has chosen.
Test plan:
Check an item out to a patron
renew the item and specify a due date using the datetime picker plugin
at the bottom of the table
Confirm the time you have chosen is correctly used.
Followed test plan. It works as advertised. Signed-off-by: Marc Véron <veron@veron.ch> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit a011cbd2e2658598e4c2eac7377b9b1edb9dd720) Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
(cherry picked from commit 7f39c6a00c2647107f2da5b2385567a953113f51) Signed-off-by: Liz Rea <wizzyrea@gmail.com>
Jonathan Druart [Fri, 9 Oct 2015 08:14:33 +0000 (09:14 +0100)]
Bug 14990: Format the date template-side for moremember
Test plan:
print slip and show the member detail page, the 3 dates date of birth,
date enrolled and date of expiry should be displayed correctly.
Followed test pan, works as expected. Signed-off-by: Marc Véron <veron@veron.ch> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 6506ddd1e859c3afbb9519d6a956495c06d628ce) Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz> Signed-off-by: Liz Rea <wizzyrea@gmail.com>
Conflicts:
members/moremember.pl
Rafal Kopaczka [Tue, 6 Oct 2015 12:57:52 +0000 (14:57 +0200)]
Bug 14966: Table header broken at detail.tt
For user without item edit permission, table at catalogue/detail.pl is
corrupted.
Test plan:
1) Log in as staff member, without edit item permission.
2) Go to biblio view, with items attached:
/cgi-bin/koha/catalogue/detail.pl?biblionumber=X. Confirm that table
does not display correctly.
3) Apply patch.
4) Repeat steps 1 and 2. Confirm patch works.
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 390233a10c789a241f948f0f41df92fda3e51052) Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
(cherry picked from commit bacb9773170cf3c37c3e2e0b21ee23c78b6ce502) Signed-off-by: Liz Rea <wizzyrea@gmail.com>
Julian Maurice [Fri, 2 Oct 2015 07:25:18 +0000 (09:25 +0200)]
Bug 14940: Fix sorting in opac-topissues.pl
There is hidden text in "Checkouts" cells that prevent DataTables to
sort numerically.
This patch adds the 'title-numeric' sort plugin and use it in
opac-topissues.pl
Column 'Checkouts' in Home > Most popular items sorts as expected Signed-off-by: Marc Véron <veron@veron.ch> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 2f0e409f471fe4527defee41798a80b1e354ce3e) Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
(cherry picked from commit e14557ecd97aa46adb4739b0a5cc3e70b5023616) Signed-off-by: Liz Rea <wizzyrea@gmail.com>
Jonathan Druart [Mon, 14 Sep 2015 08:50:39 +0000 (09:50 +0100)]
Bug 14812: Display the help in the correct language
If opaclanguages != language, the language of the help page is the
default one (en).
Test plan:
1/ Set language to en, fr-FR, ar-Arab and opaclanguages to en, fr-FR
2/ Translate the fr-FR and ar-Arab templates.
3/ Go on the mainpage, switch to ar-Arab, go to the help page.
The help page content should be in Arabian, not English.
Signed-off-by: Magnus Enger <magnus@libriotech.no>
Set language = en, sv-SE, nb-NO. opaclanguage = en, nb-NO
Went to the intranet main page, selected Swedish and clicked on help
Without the patch, help was displayed in English
With the patch, help was displayed in Swedish. Yay!
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit a4ee9151c195a89fe70de792a36f327baa6939f2) Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
(cherry picked from commit 006a44cc6cc4a25f95d1344318600f8a79f31b5f) Signed-off-by: Liz Rea <wizzyrea@gmail.com>
David Cook [Tue, 6 Oct 2015 00:42:04 +0000 (11:42 +1100)]
Bug 14861: Accession date comparison does not work in advanced search
_Test plan_
Prerequisites: Make sure that you have an item with a valid dateaccessioned,
and that the bib is indexed in zebra.
For the purposes of explanation, I'm going to use the date '2011-09-07'
1) Go to advanced search in the staff client and choose 'Acquisition date (yyyy-mm-dd)'
2) Enter 2011-09-07 (or the date of your choice).
3) Click the search button - you should get your item in the search results.
4) Return to the advanced search screen and select Acquisition date again.
5) Enter a start and end date in the text field separated by ' - '.
For example:
2011-09-01 - 2011-09-30
6) Click the search button -- this will return no results.
7) Apply the patch and copy etc/zebradb/ccl.properties to whatever directory is specified
by the koha-conf.xml referenced by $KOHA_CONF.
8) Try the search again -- this will return the expected results
Signed-off-by: Barton Chittenden <barton@bywatersolutions.com> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 5a9b8d9359424a3f0316f89348038fbb290e722b) Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
(cherry picked from commit 257950686466e169dacbd0e6e93db8b0e16005a2) Signed-off-by: Liz Rea <wizzyrea@gmail.com>
Jonathan Druart [Tue, 22 Sep 2015 10:55:55 +0000 (11:55 +0100)]
Bug 14141: Fix copy action
Test plan:
Try to copy a letter to a library which already have this letter (same
letter_code) defined.
Signed-off-by: Nick Clemens <nick@quecheelibrary.org> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Tomas Cohen Arazi <tomascohen@unc.edu.ar>
(cherry picked from commit 51aad946c6411a484ffde6934d541b9bb1dd2aa3) Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
(cherry picked from commit 2943112a2844f7106de0139bb449c3b3ef27fb02) Signed-off-by: Liz Rea <wizzyrea@gmail.com>
Jonathan Druart [Tue, 14 Jul 2015 11:00:33 +0000 (12:00 +0100)]
Bug 14141: Do not let edit the branch when updating/copying notice
If a user modify the library when he's updating a notice, the notice
will be duplicated, instead of modified.
To reproduce:
1/ Go on the notice & slips tools (tools/letter.pl)
2/ Create a notice A for library L1
3/ Edit this notice and update the library with L2
4/ On the list view, you will observe that 2 notices A now exist, one
for L1 and one for L2.
The code in tools/letters.pl should be rebuilt completely, it becomes a
house of cards. To prevent this bug, I suggest to not let the user
modify the library value on editing a notice.
It cans be done by copying the notice to another library and remove the
original one.
Counter patch welcomed.
Test plan:
1/ Go on the notice & slips tools (tools/letter.pl).
2/ Create a notice A for library L1.
3/ Edit this notice: you are not able to modify the library anymore.
4/ Copy the notice to library L2. You are not able to modify the library
neither.
Works ok.
Signed-off-by: Amit Gupta <amit.gupta@informaticsglobal.com> Signed-off-by: Nick Clemens <nick@quecheelibrary.org> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Tomas Cohen Arazi <tomascohen@unc.edu.ar>
(cherry picked from commit 605f42a721b3a534d01b8f7c73502cfa810147ad) Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
(cherry picked from commit 54cf2cc340e7f2abe96cdcfcb8aa4bb82031df79) Signed-off-by: Liz Rea <wizzyrea@gmail.com>
Jonathan Druart [Mon, 14 Sep 2015 15:01:48 +0000 (16:01 +0100)]
Bug 14811: Don't update permanent_location with CART or PROC
The permanent_location should not be set to CART or PROC when the item
is edited.
Otherwise we lost an important info.
Test plan:
0/ Set the ReturnToShelvingCart pref
1/ Create an item with location "on_my_shelf"
2/ Check the item in and out
3/ Look at the DB values, location should be "CART" and
permanent_location unchanged (on_my_shelf)
4/ Edit the item, add a note for instance
5/ Without this patch, the permanent_location is erased with 'CART' and
you have definitely lost the info.
With this patch, the permanent_location is unchanged.
Signed-off-by: Josef Moravec <josef.moravec@gmail.com> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Tomas Cohen Arazi <tomascohen@unc.edu.ar>
(cherry picked from commit 2a319e7ae2a7e0d10450a6ca791eabbee01c0787) Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Conflicts:
t/db_dependent/Items.t
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit b8f0a595344d28d85383007138715d7db131f136) Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz> Signed-off-by: Liz Rea <wizzyrea@gmail.com>
Conflicts:
Koha.pm (3.18 does not have)
installer/data/mysql/updatedatabase.pl (routine version updates)
Jonathan Druart [Tue, 15 Sep 2015 09:36:44 +0000 (10:36 +0100)]
Bug 14820: Add missing prefs SMSSendUsername and SMSSendPassword
These 2 system preferences are missing from the sysprefs.sql file.
Test plan:
Execute the updatedatabase script and confirm that the 2 prefs are now
in the systempreferences table.
Search for "sms" in the system preferences search box, you should see
the 3 prefs.
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Tomas Cohen Arazi <tomascohen@unc.edu.ar>
(cherry picked from commit 39dc8b5a9da902f9f90850421dc2815e448222e5) Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 27e58d8a204b5977d6ca64567a79f1ee90df9e6f) Signed-off-by: Liz Rea <wizzyrea@gmail.com>
Jonathan Druart [Mon, 28 Sep 2015 09:58:16 +0000 (10:58 +0100)]
Bug 14910: Redirect to the circulation module after a renew
iIf a patron is renewed from the circulation module, the librarian
should be redirected to the circulation module.
This works correctly if the renew is done from the patron module
(members).
This is caused by a typo in the template: desintation vs destination.
This patch also removes the cardnumber parameter to the setstatus.pl
script, it is not needed given that borrowernumber is always passed.
This has a good side-effect, it will fix bug 14691. The cardnumber does
not exist anymore, so no need to escape it :)
Test plan:
0/ Do not apply this patch
1/ Create a patron with a cardnumber with a quote (rm'me) and another
one without a quote (rmme)
2/ Go on the checkouts page (circ/circulation.pl)
3/ Renew the 2 patrons
=> With rm'me you are redirected to the circ module - ok
=> With rmme you are redirected to the member module - nok
4/ Go on the patron detail page (members/moremember.pl)
5/ Renew the 2 patrons
=> you are redirected to the member module - ok
6/ Delete the patrons
=> Nothing happend with rm'me, there is a JS error on the page - nok
=> rmme is deleted - ok
7/ Apply the patch and recreate rmme
8/ Repeat 2, 3, 4, 5
=> You are redirected to the correct module
9/ Delete the patrons
=> They are successfully deleted
Signed-off-by: Magnus Enger <magnus@libriotech.no>
Followed the test plan, works as advertised. (I did have some problems
initially, but that was caused by me not using the interface in
English...)
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Tomas Cohen Arazi <tomascohen@unc.edu.ar>
(cherry picked from commit 653d305452a27d19d929e2acff71643845686af3) Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit dcd54915d0ce56acd900de313715be416ddc9c7e) Signed-off-by: Liz Rea <wizzyrea@gmail.com>
Marc Véron [Thu, 1 Oct 2015 08:51:18 +0000 (10:51 +0200)]
Bug 14929: Fix missing display of help page in contract management
This patch renames / moves the file
koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/acqcontract.tt
to
koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/aqcontract.tt
To test:
- Go to Home > Acquisition > [Vendor] > Contracts
(/cgi-bin/koha/admin/aqcontract.pl?booksellerid=XXXX)
- Verify that Help displays as appropriate.
Signed-off-by: Magnus Enger <magnus@libriotech.no>
Works as advertised. All the tabs similar to "Contracts" have
working help pages.
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Tomas Cohen Arazi <tomascohen@unc.edu.ar>
(cherry picked from commit 4a43c3820555574ad7c83807b6b7a7db2032d340) Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 7f1efe089871ab23f8fc4a738fb79601786b907d) Signed-off-by: Liz Rea <wizzyrea@gmail.com>
Jonathan Druart [Tue, 15 Sep 2015 10:44:32 +0000 (11:44 +0100)]
Bug 12311: Do not return a lost item if modified in a batch
If a item is lost and issued, and you modify it in a batch, the item
will be marked as returned. It should only be returned if the item is
marked as lost.
Test plan:
1/ Check an item out and mark it as lost
2/ Edit it in a batch (tools/batchMod.pl) and edit a field (notes for
instance)
3/ The item should still be issued to the patron
4/ Edit it in a batch and edit the lost value, marked it as not lost
5/ The item should still be issued to the patron
6/ Edit it in a batch and edit the lost value, marked it as lost
7/ The item should have been returned.
Signed-off-by: Hector Castro <hector.hecaxmmx@gmail.com>
Works as advertised. Just one comment, lost status can be changed only if you change default framework to another framework then edit the item. If you change it in Item menu at left side of screen this will remove the item from patron’s checkouts and patron charged for lost item.
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
For testing purposes the lost item field can be set to visible
in the framework used. That will allow changing it without
returning it at the same time.
The other option is using the longoverdues.pl script. Signed-off-by: Tomas Cohen Arazi <tomascohen@unc.edu.ar>
(cherry picked from commit ca268ad877a6712aa07cb7c873c918d6fdfac52d) Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 6709813a022de5e2cc53730e0299259ed9dc53bd) Signed-off-by: Liz Rea <wizzyrea@gmail.com>
Test plan:
Set the cardnumber of one of the patron to an empty string
Do a patron search and use filters
The search will redirect to the patron detail page of the patron with
the empty string
Signed-off-by: Joonas Kylmälä <j.kylmala@gmail.com> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Liz Rea <wizzyrea@gmail.com>
Kyle M Hall [Wed, 26 Aug 2015 15:42:14 +0000 (11:42 -0400)]
Bug 14733: Unit Tests
Signed-off-by: Heather Braum <hbraum@nekls.org> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
Conflicts:
t/db_dependent/Holds.t Signed-off-by: Liz Rea <wizzyrea@gmail.com>
Jonathan Druart [Mon, 21 Sep 2015 15:46:00 +0000 (16:46 +0100)]
Bug 14733: Replace 'priority' with 'estimated priority'
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 8ef69e473b1f1a0daac559bf19818fd04b2c5313) Signed-off-by: Liz Rea <wizzyrea@gmail.com>
Kyle M Hall [Wed, 26 Aug 2015 15:43:08 +0000 (11:43 -0400)]
Bug 14733: Prevent a record from having holds with duplicate priorities
It is possible to create holds with duplicate priorities.
The reason for this is that typically the priority is calculated before
placing the hold. When the hold is placed the priority is calculated.
This can easily be shown by opening up two browser windows and starting
to place a hold for a record in each one. You'll see that both list the
same priority. If you than place the hold in each window, both holds
will have the same priority!
Test Plan:
1) Run unit tests pre-patch, note they fail
2) Run unit tests post-patch, note they succeed
Signed-off-by: Heather Braum <hbraum@nekls.org> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 37ad2d78679fc8487811ff9cd1679eecac30faa5) Signed-off-by: Liz Rea <wizzyrea@gmail.com>
Jonathan Druart [Fri, 6 Feb 2015 15:19:14 +0000 (16:19 +0100)]
Bug 13675: Do not set aqorders.budget_id to NULL
C4::Acquisition::ModReceiveOrder updates the aqorders with
budget_id=NULL if no budget_id given in parameter.
Actually the same budget_id should be used.
In tests (especially t/db_dependent/Acquisition/TransferOrder.t),
ModReceiveOrder is not called with a budget_id param and set to NULL the
budget_id value.
test plan:
prove t/db_dependent/Acquisition/TransferOrder.t
should return green
Note that this bug should not appear using the interface.
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
The fix makes sense, and running
$ prove t/db_dependent/Acq*
returns all green. koha-qa.pl also likes it.
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit 2df541712fd691ee817568ed9d14e94bba13424e) Signed-off-by: Liz Rea <wizzyrea@gmail.com>
Jonathan Druart [Tue, 14 Jul 2015 14:33:34 +0000 (15:33 +0100)]
Bug 14509: Reject invalid passwords
Bug 10177 rejects password with leading or trailing whitespaces, but
only on the member-password page.
It's not consistent to only do this check on 1 place.
This patch adds the check for the 2 other places: memberentry and at the
OPAC.
Test plan:
1/ Edit a patron and set a password with leading and/or trailing
whitespaces. You should not be allowed to do it (no server side check).
2/ Same at the OPAC ("Change you password" tab). Here there is a server
side check.
Followed test plan. Works as expected. Signed-off-by: Marc Véron <veron@veron.ch> Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Tomas Cohen Arazi <tomascohen@unc.edu.ar>
(cherry picked from commit 1b8f3194e9f616f46260c849eda5a9f6c717d5fa) Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit a19c1257eb9a91426b42b7bad94f211cd9f046a4) Signed-off-by: Liz Rea <wizzyrea@gmail.com>
Brandon [Thu, 15 Jan 2015 22:42:52 +0000 (22:42 +0000)]
Bug 10177 - Whitespace is accepted within the password but leading and trailing spaces are not.
Test plan:
1: Go to your patron
2: Go to change username and/or password.
3: Change password to something with spaces in the middle. Notice it is invalid.
4: Apply this patch.
5: Change password again using spaces in the middle. Notice it is accepted.
6: Change password with leading and/or trailing spaces, notice they are not accepted.
Applied bothe patches. Followed test plan. Patch behaves as expected. Signed-off-by: Marc Véron <veron@veron.ch> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Brandon [Wed, 14 Jan 2015 22:30:01 +0000 (22:30 +0000)]
Bug 10177 - whitespace is a valid password causing pernicious perturbations.
Test plan:
Go to your patron, go to change username and/or password. change
password to whitespace, notice it is accepted, apply this patch,
change password again, to whitespace, notice password is not valid.
Followed test plan. Patch behaves as expected. Signed-off-by: Marc Véron <veron@veron.ch> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Jonathan Druart [Mon, 14 Sep 2015 09:50:12 +0000 (10:50 +0100)]
Bug 14298: Add perms for other languages
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
(cherry picked from commit cf098649a80ee9ee5fe7f505828b0eec56bef93d) Signed-off-by: Liz Rea <wizzyrea@gmail.com>
Jonathan Druart [Wed, 2 Sep 2015 15:30:15 +0000 (16:30 +0100)]
Bug 14298: Add warning to the about page if the sco user does not have correct permissions
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Note: Made a little change, changed He should have, to They should have
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
(cherry picked from commit f2663af7d1ead6efd7ccc121492a9f264e08b9fc) Signed-off-by: Liz Rea <wizzyrea@gmail.com>
Jonathan Druart [Wed, 2 Sep 2015 15:10:45 +0000 (16:10 +0100)]
Bug 14298: Use the new permission in the sco scripts
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Note without this patch, you won't be able to access the SCO side.
So don't panic if you cant use SCO with just the first patch
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
(cherry picked from commit 047f0a486b8db459b0be20e052b9b3cdbf37a584) Signed-off-by: Liz Rea <wizzyrea@gmail.com>
Jonathan Druart [Wed, 2 Sep 2015 15:09:35 +0000 (16:09 +0100)]
Bug 14298: Add the new 'self_checkout' permissions
There is a security issue in the self checkout module.
The user used to check items out must have the circulate =>
circulate_remaining_permissions permissions.
So even if a user does not have a login/password or a barcode he cans
access to the circulation module of the intranet.
Imagine if the sco patron used is a superlibrarian...
This patch set will change the behavior and adds a new permission to
access to the sco module (circulate => self_checkout).
This permission should be the only one defined for this patron.
IMPORTANT NOTE: Hopefully, this only works if both interfaces use the
same domains (but different ports).
Test plan:
0/ Does not apply this patch set
1/ Create a patron with the circulate => circulate_remaining_permissions
and some others. Note his userid/pwd (later 'sco/sco').
Turn on WebBasedSelfCheck and AutoSelfCheckAllowed
Fill the AutoSelfCheckID and AutoSelfCheckPass wich 'sco' and 'sco'
2/ Log you out from the OPAC and the intranet
3/ Go on the sco page
4/ Note that your are automatically logged in
5/ Go on the circulation module on the intranet side
6/ Oops
7/ Apply this patch
8/ Execute the updatedatabase
9/ Note that the sco user only has the new permission circulate =>
self_checkout, others have been removed
10/ Try to reproduce the issue, it should not access anything on the
intranet side
11/ Confirm that there is no regression in the sco module
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Works well no regressions, changes the permissions appropriately.
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
(cherry picked from commit 08c7606c36f4383b402480ddab8a01dfa9acdccf) Signed-off-by: Liz Rea <wizzyrea@gmail.com>
1) Go to home page of staff client and click the Help
2) Notice: 'you should now 'got to' Koha'
'settings found in 'a'dministration.' (should be capitalized)
'Once that user is set you should use that user to log in rather than the root user set up as part of installation.' (could be worded better)
3) Apply patch, close Help, reload page, reopen Help
4) Notice: 'got to' --> 'go to'
'administration' --> 'Administration'
'Once that user is set you should use that user to log in rather than the root user set up as part of installation.'
Signed-off-by: Joonas Kylmälä <j.kylmala@gmail.com> Signed-off-by: Tomas Cohen Arazi <tomascohen@unc.edu.ar>
(cherry picked from commit d810fd1094541ee4c95289df3f18bf765047335b) Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
(cherry picked from commit 14e3841f5104480842eba9848d9bf662647b2413) Signed-off-by: Liz Rea <wizzyrea@gmail.com>
Bug 13781: Fix missing heading columns for relative's checkouts table in check out patron page
Theres was two missing heading columns Location and Fines in the Check out section of a Patron
Tested both patches together. Works as expected. Signed-off-by: Marc Véron <veron@veron.ch> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Tomas Cohen Arazi <tomascohen@unc.edu.ar>
(cherry picked from commit bcb6e9ea39dce065e8c7ff80b4d1b7b49e1735f4) Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
(cherry picked from commit b73c432887734ae2bd8de87b0c0d6fec1f6a1d4c) Signed-off-by: Liz Rea <wizzyrea@gmail.com>
Variable $itype is used an all C4/Ris.pm to switch
between marc falvors, but is local and not passed along
as argument.
As a quick solution, is defined as global
To test:
1) On UNIMARC setup, export a record as RIS,
check that author (and other fields) are displayed
incorrectly
2) Apply the patch
3) Export again, improved results
4) Run t/Ris.t
There are other problems in this script, needs maintenance
(e.g. no Modern::Perl friendly)
Signed-off-by: Victor do Rosário <jvr@fct.unl.pt> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Tomas Cohen Arazi <tomascohen@unc.edu.ar>
(cherry picked from commit e15621fee2693059cce67882691ad8eae9a5c9b7) Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
(cherry picked from commit 4c7bd247ef456190199f941f5a4479e948341d70) Signed-off-by: Liz Rea <wizzyrea@gmail.com>
Kyle M Hall [Tue, 25 Aug 2015 14:35:28 +0000 (10:35 -0400)]
Bug 14640: 'Cancel Hold' check box on check-out confirmation does not cancel the hold when item is checked out.
This bug is dealing with the situation where an item is checked out to a
patron that is not the next in line hold-wise for an item. In this case,
Koha will warn the librarian that there are holds on the item and
show the first person in line. Again, I want to stress that this
is the case where the item *is not waiting* for a patron. The
hold for the patron listed will just have a priority of 1.
The only situation where the "Cancel hold" checkbox will function
is when the priority 1 hold is an item level hold. This is due to
the fact that CancelReserve is being passed the trio of
biblionumber, borrowernumber, and itemnumber rather than the
singular reserve_id.
1) place biblio level hold on a book to borrower A.
2) check out an item of the book to borrower B.
3) When confirming checkout, check the 'Cancel hold' check-box, and
click the "Yes, check out" button.
4) Note the hold was not canceled
5) Apply this patch
6) Repeat steps 1 through 3
7) Note the hold was indeed canceled
Signed-off-by: Joonas Kylmälä <j.kylmala@gmail.com> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Tomas Cohen Arazi <tomascohen@unc.edu.ar>
(cherry picked from commit a37b3bb7f76b5ddea7400f5268c592c0cc578a8c) Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
(cherry picked from commit b565d3a62a0ae7980ac58f653182e0e6c0ccf914) Signed-off-by: Liz Rea <wizzyrea@gmail.com>
Jonathan Druart [Tue, 14 Jul 2015 14:02:42 +0000 (15:02 +0100)]
Bug 10005: Inventory - Add an option to not check in items
The inventory tools automatically check in items, this patch adds it as
an option.
Test plan:
1/ Check an item out, fill a file with its barcode, and use this file in
the inventory tools.
2/ Check the new checkbox and confirm that the item is not checked in
3/ Repeat again and don't check it, the behavior should be the same as before
this patch.
Signed-off-by: Jason Robb <jrobb@sekls.org> Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Added a missing </li>.
Patch works as expected. Signed-off-by: Tomas Cohen Arazi <tomascohen@unc.edu.ar>
(cherry picked from commit e5f604378a45d62e8b454cd390abb18b34ef53f8) Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
(cherry picked from commit 1b03fc78a1ac9f84464752c5f35e0ff54ffbbb14) Signed-off-by: Liz Rea <wizzyrea@gmail.com>
projects / koha.git / log