[koha-commits] main Koha release repository branch master updated. v3.20.00-637-ge818299
Git repo owner
gitmaster at git.koha-community.org
Fri Sep 25 20:38:55 CEST 2015
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".
The branch, master has been updated
via e8182991804b591dc1730e46da343495af377d2f (commit)
via d46c13248741dc76e2e371d297a311f6143f459e (commit)
via 0a95ba06f31cd9b648e01047126e2d2a93704209 (commit)
via 11c3b688fccbd17cdf7a68d0761f9f1d059b6fdf (commit)
via 29216e030f1c2b56d9548dc145e502c9e7d68f36 (commit)
via 42c19ee1cc817d28a21591b2ed5fba5f1172f133 (commit)
via 9f753799d8f644f0d3706574583a817ffda58bf9 (commit)
via 1f5be3ffabdf259f4c415634359aa682d6455c45 (commit)
via 9e8d89dd70d1a5dde4dc700eea16b5b1d6edf3fe (commit)
via f8a58d310ee96a4bf272c9ae16dc347bf1d0e4ea (commit)
via 83ea49a0095853ab414981ff11b93b6f97886fc9 (commit)
via ba62a7ef24c9886d15bdc7d526ee92518bffc6f4 (commit)
via d94251e017703719c904c66e198bba360f6f9525 (commit)
via 54cf0a8aaff2a3484b38ae605124f701072ef802 (commit)
via d75da287eacc3bdc2148386beb7a22b738e558f9 (commit)
via 9acd29fc25baf17aa018e0827f7379483632beaa (commit)
from d222e6ec21c5d2aea03d839cd82050ca6437f0d4 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit e8182991804b591dc1730e46da343495af377d2f
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Wed Sep 23 10:44:20 2015 -0400
Bug 14883: Librarians are not warned if patron is restricted when placing holds
Librarians should be warned that a patron is restricted when placing
holds, as they are warned that a patron's acount has expired.
Test Plan:
1) Apply this patch
2) Add a restriction for a patron
3) Attempt to place a hold for that patron
4) Note the notice at the top notifying you that the patron is restricted
Works as expected.
Signed-off-by: Marc Véron <veron at veron.ch>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
commit d46c13248741dc76e2e371d297a311f6143f459e
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Wed Sep 23 10:38:32 2015 -0400
Bug 14882: Librarians are not warned if patron owe more than maxoutstanding when placing holds
If a patron owes more than the system preference maxoutstanding in fees
and fines, the patron will be unable to place holds via the opac.
However, a librarian placing a hold for a patron is not even warned!
Test Plan:
1) Apply this patch
2) Set maxoutstanding to 1.00
3) Find a patron owing more than 1.00
4) Attempt to place a hold
5) Note the warning that the patron owes money
Works as expected.
Signed-off-by: Marc Véron <veron at veron.ch>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
commit 0a95ba06f31cd9b648e01047126e2d2a93704209
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Mon Aug 24 13:19:28 2015 +0100
Bug 14710: Make the export checkout list export only the checked out item infos
This has been introduced by bug 11703.
Bug 13190 should have been fixed it.
If the pref ExportWithCsvProfile is defined with a MARC CSV profile and
it contains item infos to display, only info from the checked out item
should be displayed.
Test plan:
0/ Don't apply this patch
1/ Create a biblio with 1+ items
2/ Check one of the item out to a patron
3/ Define a CSV profile which contains item fields ("245$a|952$p" for instance)
4/ Export the item (from circ/circulation/pl) using the CSV option
Note that the csv contains the barcode from all items
5/ Apply this patch and repeat 4.
6/ Note that the csv contains only the barcode from the checked out
item.
Signed-off-by: Hector Castro <hector.hecaxmmx at gmail.com>
Works as advertised
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
commit 11c3b688fccbd17cdf7a68d0761f9f1d059b6fdf
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Fri Sep 25 15:33:42 2015 -0300
Bug 14321: (QA followup) remove Test::CGI::Multipart dependency
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
commit 29216e030f1c2b56d9548dc145e502c9e7d68f36
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Fri Sep 25 15:22:07 2015 -0300
Bug 14321: (RM followup) DBIx update
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
commit 42c19ee1cc817d28a21591b2ed5fba5f1172f133
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Fri Sep 25 15:17:34 2015 -0300
Bug 14321: DBRev 3.21.00.028
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
commit 9f753799d8f644f0d3706574583a817ffda58bf9
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Fri Sep 18 16:01:20 2015 +0200
Bug 14321: [QA Follow-up] Additional QA requests
This patch makes following requested changes:
[1] Renamed categorycode to uploadcategorycode (with atomicupdate file)
[2] Confirmation before deleting an uploaded file
[3] Label for Public checkbox can be clicked
[4] Back button on result list (not in plugin mode)
[5] Correct additional variable interpolation from sql queries
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Tested the db revision, unit test.
Uploaded temporary and permanent file, incl. plugin mode.
Deleted an upload.
Ran stage-marc-import.pl.
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
commit 1f5be3ffabdf259f4c415634359aa682d6455c45
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Wed Sep 16 13:53:38 2015 +0200
Bug 14321: [QA Follow-up] Changes for Upload.pm and upload-file.pl
Based on QA comments, this patch does the following:
[1] Destroy an empty DESTROY.
[2] Promote some comment lines to POD.
[3] Use File::Spec->catfile in sub _full_fname.
[4] Remove variable interpolation from a sql query.
[5] Add a comment in upload-file.pl.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Run the unit test again, and uploaded a file.
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
commit 9e8d89dd70d1a5dde4dc700eea16b5b1d6edf3fe
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Sep 16 11:12:04 2015 +0100
Bug 14321: QA Fix
Remove QA errors (keys on reference is experimental).
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
commit f8a58d310ee96a4bf272c9ae16dc347bf1d0e4ea
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Mon Aug 17 13:54:44 2015 +0200
Bug 14321: Final cleanup, removing obsolete files
The new Upload.pm, unit test and file-upload.js obsolete a number of
files, including an older jQuery plugin.
The test files progressbar.pl and progressbarsubmit.pl are outdated and
do not serve any purpose in this form. (Actually, we could argue if they
should be here or just be part of a debugging phase.)
Test plan:
[1] Git grep on file-progress, file-upload.inc, UploadedFile,
ajaxfileupload, ajaxFileUpload
UploadedFile: Only a reference to DBIx file is found
ajaxfileupload: Only release notes
[2] Upload a file with tools/upload and stage-marc-import.
Signed-off-by: Mirko Tietgen <mirko at abunchofthings.net>
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
commit 83ea49a0095853ab414981ff11b93b6f97886fc9
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Sat Aug 8 17:28:25 2015 +0200
Bug 14321: Integrate Upload.pm into Koha
This patch makes the following changes to achieve that:
[1] Use Upload.pm in stage-marc-import.pl, upload-cover-image.pl,
offline_circ/process_koc.pl and enqueue_koc.pl.
[2] A new file-upload.js replaces file-upload.inc in the associated template.
We now use ajax to get progress figures instead of launching perl script
upload-file-progress.
The js changes now also allow for aborting a file upload.
[3] Adds a tools/upload script and template. It allows to upload multiple
files at once.
[4] Makes upload-file return error messages in JSON. For a multiple upload,
we could have some files with errors and others without errors.
The upload is now marked as Failed only if there was no upload at all.
[5] The upload plugin is converted to use tools/upload with plugin param.
Deleting an upload is now presented via the search results form.
NOTE: In editing the process_koc.tt I noticed that the form enqueuefile was
hidden and no longer used (with associated code in process_koc.pl). When a
file has been uploaded, I display the form again (with the Apply directly
button). The code still works.
NOTE: We fix an error in upload-file from one of the patches of bug 6874.
The userid of the Koha admin user is passed to haspermission, but we
should pick the userid from the session.
NOTE: Bug 14686 will add a specific permission for tools/upload.pl, and
will add the tools/upload script to the Tools menu.
For now, you need edit_catalogue to start upload.pl and you will
additionally need a permission like upload_local_cover_images
to successfully upload a new file.
Test plan:
[1] Upload a marc file in stage-marc-import. (This is temp storage.)
[2] Check new entry in table uploaded_files. Look for the file in your
temporary directory (/tmp ?), subfolder koha_upload.
Bonus: Remove permissions on this subfolder. Retry, check error and
restore permissions again.
[3] Upload another (larger) file and abort the upload. Check table and
directory again. You should have a partial file, but no record.
[4] Verify that Stage for import still works as expected.
[5] Test Upload local cover image. (Enable OPACLocalCoverImages.) You can
test an individual image or a zip file including images and a file
called datalink.txt (with lines biblionumber,filename).
[6] Test uploading a offline circulation file:
Enable AllowOfflineCirculation, and create a koc file (plain text):
Line1: Version=1.0\tA=1\tB=2
Line2: 2015-08-06 08:00:00 345\treturn\t[barcode]
Note: Replace tabs and barcode. The number of tabs is essential!
Checkout the item with your barcode.
Go to Offline circulation file upload. Upload and click Apply directly.
Checkout again. Upload again, click Add to offline circulation queue.
[7] Upload three files via tools/upload.pl with a category and marked as
public. Check the results in the table.
Verify that you can download the file in OPAC without being logged in.
[8] Pick one new file and one of the files of step 7. Upload them in the
same category. One upload should succeed. Check for reported error.
[9] Connect upload.pl to field 856$u.
Goto Cataloguing editor.
In an empty 856$u, click the tag editor. Upload a file and click Choose.
Save the record. Open the record in the OPAC and click the link.
Copy this link to your clipboard for next step.
[A] Go back to editor. Click the tag editor on the same 856 field.
Choose for Delete.
Open the link in your clipboard again. Error message?
[B] Check the process of upload, search, download and delete of an upload
with some diacritical characters in the filename. (Bonus points for
adding special chars in the category code.)
Note: You can add categories via authorized values, UPLOAD key.
Signed-off-by: Mirko Tietgen <mirko at abunchofthings.net>
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
Bug 14321: [QA Follow-up] Perltidy upload.pl
Run perltidy -pro=xt/perltidyrc on tools/upload.pl.
No other changes.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
commit ba62a7ef24c9886d15bdc7d526ee92518bffc6f4
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Thu Jul 30 19:19:44 2015 +0200
Bug 14321: Introduce Koha::Upload
This patch introduces Koha::Upload. It will replace the modules
C4::UploadedFile.pm and the new C4::UploadedFiles.pm (from BZ 6874).
It also includes a new unit test.
NOTE: This unit test will replace the test for UploadedFiles.pm. It will no
longer use dependency Test::CGI::Multipart. We are now mocking CGI and its
hook to achieve the same result.
Test plan:
[1] Run t/db_dependent/Upload.t.
Note that if you see a WARNING, you will still need to add an entry
upload_path to your koha-conf.xml. Or you need to give write
permission to your Koha instance user for that folder.
Signed-off-by: Mirko Tietgen <mirko at abunchofthings.net>
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
commit d94251e017703719c904c66e198bba360f6f9525
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Thu Aug 6 15:34:57 2015 +0200
Bug 14321: Add two columns to uploaded_files
This patch adds uploaded_files.public and permanent.
Public will be used later to mark uploaded files as available via OPAC.
Permanent will be used to make the distinction between temporary and
permanent storage.
The db rev sets both flags for all current records (uploaded via the
plugin from BZ 6874).
Test plan:
[1] If you tested this before, drop the column public first.
[1] Run the dbrev.
Signed-off-by: Mirko Tietgen <mirko at abunchofthings.net>
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
commit 54cf0a8aaff2a3484b38ae605124f701072ef802
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Thu Sep 3 11:03:02 2015 -0400
Bug 14297: (QA followup) Remove unnecessary line
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
commit d75da287eacc3bdc2148386beb7a22b738e558f9
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Fri May 29 06:46:24 2015 -0400
Bug 14297: Holds Queue building ignoring holds where pickup & home branch don't match and item is not from least cost branch
If a record has a hold on it where the pickup and home branch do not
match, the holds queue builder will only look at items from the least
cost branch ( as defined by the transport cost matrix or the sys pref
StaticHoldsQueueWeight.
Test Plan:
1) Create a record with two items, one for library A and one for library B
2) Set your circulation rules such that the book from library A is
holdable by all and the book from library B is holdable only by library
B patrons
3) Create a hold for a Library C patron for pickup at library C
4) Set the syspref StaticHoldsQueueWeight to by Library B, Library A,
Library C in that order
5) Rebuild the holds queue
6) Note the hold wasn't picked up even though the item from library A
could have filled the hold
7) Apply this patch
8) Rebuild the holds queue
9) View the holds queue again
10) Note the hold now displays
Signed-off-by: Nora Blake <nblake at masslibsystem.org>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
commit 9acd29fc25baf17aa018e0827f7379483632beaa
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Thu Aug 27 09:16:43 2015 -0400
Bug 14297: Unit Tests
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
-----------------------------------------------------------------------
Summary of changes:
C4/HoldsQueue.pm | 20 +
C4/Installer/PerlDependencies.pm | 5 -
C4/UploadedFile.pm | 309 --------------
C4/UploadedFiles.pm | 323 ---------------
Koha.pm | 2 +-
Koha/Schema/Result/UploadedFile.pm | 22 +-
Koha/Upload.pm | 427 ++++++++++++++++++++
cataloguing/value_builder/upload.pl | 153 +------
installer/data/mysql/kohastructure.sql | 4 +-
installer/data/mysql/updatedatabase.pl | 18 +
.../lib/jquery/plugins/ajaxfileupload.js | 200 ---------
.../intranet-tmpl/prog/en/includes/file-upload.inc | 70 ----
koha-tmpl/intranet-tmpl/prog/en/js/checkouts.js | 5 +-
koha-tmpl/intranet-tmpl/prog/en/js/file-upload.js | 32 ++
.../en/modules/cataloguing/value_builder/upload.tt | 103 -----
.../value_builder/upload_delete_file.tt | 63 ---
.../prog/en/modules/offline_circ/process_koc.tt | 39 +-
.../prog/en/modules/reserve/request.tt | 9 +
.../prog/en/modules/test/progressbar.tt | 43 --
.../prog/en/modules/tools/stage-marc-import.tt | 64 ++-
.../prog/en/modules/tools/upload-images.tt | 45 ++-
.../intranet-tmpl/prog/en/modules/tools/upload.tt | 361 +++++++++++++++++
.../bootstrap/en/modules/opac-retrieve-file.tt | 6 +
offline_circ/enqueue_koc.pl | 6 +-
offline_circ/process_koc.pl | 8 +-
opac/opac-retrieve-file.pl | 36 +-
reserve/request.pl | 5 +-
t/db_dependent/HoldsQueue.t | 61 ++-
t/db_dependent/Upload.t | 183 +++++++++
t/db_dependent/UploadedFile.t | 16 -
t/db_dependent/UploadedFiles.t | 61 ---
test/progressbar.pl | 55 ---
test/progressbarsubmit.pl | 104 -----
tools/stage-marc-import.pl | 9 +-
tools/upload-cover-image.pl | 8 +-
tools/upload-file-progress.pl | 62 ---
tools/upload-file.pl | 83 ++--
tools/upload.pl | 101 +++++
38 files changed, 1478 insertions(+), 1643 deletions(-)
delete mode 100644 C4/UploadedFile.pm
delete mode 100644 C4/UploadedFiles.pm
create mode 100644 Koha/Upload.pm
delete mode 100644 koha-tmpl/intranet-tmpl/lib/jquery/plugins/ajaxfileupload.js
delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/file-upload.inc
create mode 100644 koha-tmpl/intranet-tmpl/prog/en/js/file-upload.js
delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/upload.tt
delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/upload_delete_file.tt
delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/test/progressbar.tt
create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload.tt
create mode 100644 koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-retrieve-file.tt
create mode 100644 t/db_dependent/Upload.t
delete mode 100755 t/db_dependent/UploadedFile.t
delete mode 100644 t/db_dependent/UploadedFiles.t
delete mode 100755 test/progressbar.pl
delete mode 100755 test/progressbarsubmit.pl
delete mode 100755 tools/upload-file-progress.pl
create mode 100755 tools/upload.pl
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list