[koha-commits] main Koha release repository branch master updated. v3.20.00-383-g8fa214b
Git repo owner
gitmaster at git.koha-community.org
Tue Aug 11 17:56:21 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 8fa214bfa5cc0d46a3e34f4c09bb7635132b0b04 (commit)
via 03ae8f70c23c0ba5e07e6aa6fdb3c65dafec946e (commit)
via 7fe69d8e5d09cadbdd26ffd563852ecb497c544a (commit)
via cef2dd180f9770e3b2f8d28c8357fab8851bf1c2 (commit)
via 7f797b3244c4252fedcdd046d3c659843347a197 (commit)
via d7cdb6e15eb5488554e030a98f028d9e874f9b8b (commit)
via b113318bb203d71845f6127f63b88247639537d7 (commit)
via b36f4674a0ba2f4b6e76481dec2905494a3e2b78 (commit)
via a6408148bac38b8ed782e944c7ad68dc8882df2a (commit)
via 98ccd548ee4affcd1516584b34c7ae45a2761155 (commit)
via 64079ccaa3284f9bf12945aad082e22c1fe4d90d (commit)
via 79168c011bb32439f487832231e7dac8335b669c (commit)
via 094092b111b022bf6c6d27a50083e1aa826e4ca2 (commit)
via 9f0546f003b7729da63ec2b8e0df05ab7ec0bff0 (commit)
via 209faec18305eb570bda377c1db03425cd53f087 (commit)
via bfe568018637afad544f38b538ef9f6d9aad068f (commit)
via 2def11d678c3f15b63de3f4980cf9c59b40ff718 (commit)
via d873ed3b5d97f825c52dc53c2f72bd5a1ef03647 (commit)
via fb17640c032f0ba0d6594076a71b8b37fda8b373 (commit)
via 2fcc02321f0f56760cfdbd67a29917e4f0ba278b (commit)
from 605638243aa6d3db8784f54a4687a850646f6f54 (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 8fa214bfa5cc0d46a3e34f4c09bb7635132b0b04
Author: Tomás Cohen Arazi <tomascohen at theke.io>
Date: Fri Aug 7 16:04:46 2015 -0300
Bug 6874: DBRev 3.21.00.017
Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
commit 03ae8f70c23c0ba5e07e6aa6fdb3c65dafec946e
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Fri Aug 7 16:07:08 2015 -0300
Bug 6874: (RM followup) DBIx updates
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
commit 7fe69d8e5d09cadbdd26ffd563852ecb497c544a
Author: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
Date: Tue Aug 11 10:54:18 2015 -0300
Bug 6874: (QA followup) upload_path missing in koha-conf.xml.in
Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
commit cef2dd180f9770e3b2f8d28c8357fab8851bf1c2
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Fri Aug 7 16:22:22 2015 -0300
Bug 6874: (QA followup) Warnings in about page
This patch introduces checks on the about.pl page so the user is warned
for a deficient configuration.
Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
commit 7f797b3244c4252fedcdd046d3c659843347a197
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Thu May 28 11:54:56 2015 +0200
Bug 6874: [QA Follow-up] Last adjustments for future developments
This patch does:
[1] Some trivial template changes. Modified some comments (POD lines).
[2] Converted plugin to new style.
[3] Table updates: renames id to hashvalue, adds a autoincrement id,
adds filesize, timestamp, owner and category.
RM: This db rev is in a separate sql file in atomicupdate.
[4] Code references to computed hash renamed to hashvalue instead of id.
[5] Removed some code pertaining to exposing upload dir structure. The user
now may choose a category; the uploader takes care of storage.
The list of upload categories is now taken from authorised values; this
might become a separate table in the future. (If there are none,
the upload process creates one default fallback.)
We can add e.g. permissions later, subdir structure, etc. (So dir will
not necessarily be category anymore.)
Test plan:
[1] Run the db revision.
[2] Upload new file. Check the record in the table. Delete it again; check.
[3] Run t/db../UploadedFiles.t.
[4] Run t/db../FrameworkPlugins.t -incl cataloguing/value_builder/upload.pl
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
commit d7cdb6e15eb5488554e030a98f028d9e874f9b8b
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Wed May 27 13:52:25 2015 +0200
Bug 6874: [QA Follow-up] Adjustments for opac-retrieve
Adds httpheaders sub to UploadedFiles; this will be extended on a new
report. (Idea is to add configurable headers for file extensions.)
Trivial unit test added.
Small cosmetic changes to opac-retrieve-file.
Test plan:
Run test UploadedFiles.t
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
commit b113318bb203d71845f6127f63b88247639537d7
Author: Mark Tompsett <mtompset at hotmail.com>
Date: Sat Apr 11 23:57:43 2015 -0400
Bug 6874: Catch warnings for clean tests.
I hate noisy tests, so I cleaned them up.
MEGA TEST PLAN
--------------
git checkout -b bug_6874 origin/master
git bz apply 6874
-- yes, it should all apply smoothly.
I intentionally restored an old backup from a couple months ago to force the upgrade.
staff client:
-- upgrade
-- login
Koha administration
MARC Bibliographic framework
MARC structure (for BKS)
Search for 856
Subfields
Edit (for u)
Other options
Plugin: upload.pl
Save changes
Search the catalog tab
{choose a word, any word. I used fancy, because I knew we had a cookbook}
click first link
Edit
Edit record
8 (that's the tab name)
click the name for 856
scroll down to u and click the plugin icon
-- Correctly got a configuration error message.
At a command prompt:
vi ~/koha-dev/etc/koha-conf.xml
/enable_plug
-- add in:
<upload_path>{appropriate path. I used /home/mtompset/uploads}</upload_path>
:wq
mkdir {appropriate path used}
-- I even added some subdirectories
sudo chown -R -v www-data.www-data {appropriate path used}
Back in staff client:
click the plugin icon again
-- this time an upload screen pops up
click the 'Upload file' button
-- message about no file or destination
browse for a file, select one
click the 'Upload file' button
-- message about no destination
click the 'Cancel' button
click the plugin icon
click a destination radio button
click the 'Upload file' button
-- message about no file
browse for a file, select one
click the 'Upload file' button
-- message about success
click the 'close' button.
-- the text box has been filled in with a nice URL
click the plugin icon
click cancel
click the plugin icon
click delete
-- the test box should be blanked, and a success message given
click Close
-- reupload a file properly
click the plugin icon
click delete
click upload file
browse for a file, select a destination, click upload file
click close on success message
click 'Clone this subfield'
click the second plugin icon
click delete
click close
click the first plugin icon
-- Nice error message about a URL which points to nothing.
click cancel
In the second 856$u type in a URL (eg. www.google.com)
click the second plugin icon
-- this jumps immediately to the upload screen, but does not give an error message, because the URL does not have opac-retrieve-file in it.
click save (we need to save the bibliographic record)
In OPAC:
search for the same word (I used fancy)
find the entry you just updated with links
click the two links. The dangling entry should give you a 500 error, and the other link should work just fine.
get back to the detail page
In staff client:
edit
edit record
8
change the 856$u to a valid file in the first link.
save
In OPAC:
refresh the detail page, and click the first link again
this time it should get downloaded nicely.
From a command line:
prove -v t/db_dependent/UploadedFiles.t
perldoc C4::Biblio
perldoc C4::UploadedFiles
One more round of tests tomorrow, and this should be ready. :)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Tested on top of 5010
Followed mostly mega test plan, seems to work :)
Can upload, delete, modify, etc
Test runs Ok
No koha-qa errors
I view this as valuable addition, dangling since 2011!
As with 5010, I consider this can be pushed (for 3.22)
and we can fix anything wrong later.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
commit b36f4674a0ba2f4b6e76481dec2905494a3e2b78
Author: Mark Tompsett <mtompset at hotmail.com>
Date: Wed Apr 16 20:49:02 2014 -0400
Bug 6874: id based on contents, filename, and directory.
This patch corrects the inability to upload the same file to a
different directory, or even a renamed file to the same
directory. By including the filename and directory as part of
the $id SHA generation, only identical files in the same
directory with the same file name will generate the same $id.
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
commit a6408148bac38b8ed782e944c7ad68dc8882df2a
Author: Mark Tompsett <mtompset at hotmail.com>
Date: Wed Apr 16 00:23:40 2014 -0400
Bug 6874: Clean up file URL generation
This adds a dependency on bug 5010, in that the protocol is
assumed in the OpacBaseURL system preference. It also adds
improved error handling.
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
commit 98ccd548ee4affcd1516584b34c7ae45a2761155
Author: Mark Tompsett <mtompset at hotmail.com>
Date: Mon Apr 14 23:54:07 2014 -0400
Bug 6874: License Text Update
This updates the license text for
- C4/UploadedFiles.pm
- cataloguing/value_builder/upload.pl
- opac/opac-retrieve-file.pl
to GPL v3 as per the
http://wiki.koha-community.org/wiki/Coding_Guidelines#Licence
text.
TEST PLAN
---------
1) Don't apply this patch as part of 6874.
2) Run the koha qa test tool.
-- It will FAIL for those three file.
3) Apply this patch
4) Run the koha qa test tool.
-- License problem is corrected, no FAILs.
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
commit 64079ccaa3284f9bf12945aad082e22c1fe4d90d
Author: Mark Tompsett <mtompset at hotmail.com>
Date: Thu Sep 26 11:45:19 2013 -0400
Bug 6874: kohastructure.sql, jquery.js, refocus, and more
Two problems were discovered while doing a fresh install
of Koha. These problems in the kohastructure.sql file are
addressed with this patch.
Clicking the plug-in icon should cause the popup window
to refocus. This adds the refocus code to the upload.pl file.
The path to the jquery.js script was wrong in the
upload_delete_file.tt file. Changed [% themelang %] to
[% interface %].
If a user clones 856$u after uploading a file, deletes the file,
and then clicks the plugin icon on the first 856$u, this will go
immediately to the upload screen with an informative error
message.
After some validation was added, it was extended to include
other cases. This serves to patch 6874 to a state where sign
off should be possible.
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
commit 79168c011bb32439f487832231e7dac8335b669c
Author: Julian Maurice <julian.maurice at biblibre.com>
Date: Mon Sep 30 09:34:01 2013 +0200
Bug 6874: Force user to select a directory
This patch adds a javascript and a server-side checks
Test plan:
1/ Choose a file, leave the radios not selected and submit
2/ You have a javascript alert which prevents form to be submitted
3/ Disable javascript and repeat step 1
4/ Form is submitted but form is redisplayed with an error message
telling you to choose a directory.
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
commit 094092b111b022bf6c6d27a50083e1aa826e4ca2
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Wed Sep 25 09:07:44 2013 +0200
Bug 6874: (QA followup) Attach files to bibliographic records
* Renames uploadPath to upload_path to follow the standard naming
conventions in koha-conf which use underscores rather than camel case
* Remove reference to intranet-tmpl and replace with [% interface %]
required to pass qa
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
commit 9f0546f003b7729da63ec2b8e0df05ab7ec0bff0
Author: Julian Maurice <julian.maurice at biblibre.com>
Date: Wed Jun 12 13:12:51 2013 +0000
Bug 6874: Move uploadPath syspref to koha-conf.xml
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
commit 209faec18305eb570bda377c1db03425cd53f087
Author: Julian Maurice <julian.maurice at biblibre.com>
Date: Thu Apr 11 12:36:27 2013 +0000
Bug 6874: Add unit tests for C4::UploadedFiles
Add unit tests for C4::UploadedFiles and move a variable
declaration at subroutine level instead of file level.
Add dependency to Test::CGI::Multipart
Still works, and the newly-provided unit tests have good test
coverage:
C4/UploadedFiles.pm 90.7 65.0 66.7 100.0 100.0 0.2 86.4
Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
commit bfe568018637afad544f38b538ef9f6d9aad068f
Author: Paul Poulain <paul.poulain at biblibre.com>
Date: Tue Mar 19 10:48:08 2013 +0100
Bug 6874: QA follow-up
Squash of the following commits:
return with explicit undef removed
Follow-up for PBP fixes
follow-up fix POD syntax
follow-up jquery has moved
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Amended: removed POD changes in Biblio.pm while rebasing.
Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
commit 2def11d678c3f15b63de3f4980cf9c59b40ff718
Author: Julian Maurice <julian.maurice at biblibre.com>
Date: Wed Jul 18 16:47:54 2012 +0200
Bug 6874: Attach files to bibliographic records
New cataloging plugin upload.pl and new system preference 'uploadPath'.
upload.pl provide a way to upload files on the server and store a link
(url) to it in MARC
uploadPath is the absolute path on the server where the files will be
stored. It's possible to have a hierarchy of directories under this path
and the plugin will allow to choose in which directory to store the
file.
Stored value in MARC subfield looks like this:
<OPACBaseURL>/cgi-bin/koha/opac-retrieve-file.pl?id=<SHA-1 of the file>
So both 'uploadPath' and 'OPACBaseURL' sysprefs have to be set for this
plugin to work correctly
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Slightly amended/simplified the patch during QA: The changes to
GetMarcUrls are not really needed, and would have needed some
attention. Another link text can be supplied by the plugin too.
This also reduces the need for changes in basket.pl,
MARCdetail.pl, detail.pl, opac-basket.pl and opac-detail.pl.
Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
Edit: more meaninfull commit subject
commit d873ed3b5d97f825c52dc53c2f72bd5a1ef03647
Author: Ulrich Kleiber <ulrich.kleiber at bsz-bw.de>
Date: Wed Jul 15 08:35:13 2015 +0200
Bug 14534: Stop overdue_notices.pl from issuing the warning: Use of uninitialized value $borrowernumber
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
To test:
1/ Run the overdue_notices.pl script (don't do this on production
obviously :))
2/ Notice the warns
3/ Apply patch
4/ Run again
5/ Notice no warns, but notices are still generated ok
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
commit fb17640c032f0ba0d6594076a71b8b37fda8b373
Author: Indranil Das Gupta <indradg at gmail.com>
Date: Sun Jun 14 14:52:04 2015 +0530
Bug 13663: (followup) fixes tab char QA test fails
Fixes the tab char qa test suite fails in the following files:
1/ tools/upload-file-progress.pl
2/ tools/upload-file.pl
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Amended patch: tidy whitespaces
Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
commit 2fcc02321f0f56760cfdbd67a29917e4f0ba278b
Author: Alex Arnaud <alex.arnaud at biblibre.com>
Date: Thu Jun 11 10:55:35 2015 +0200
Bug 13663: Fix permissions in upload-file.pl and upload-file-progress.pl
Test plan:
Verify that the circulate_remaining_permissions perm is enough to upload
.koc file.
Signed-off-by: Indranil Das Gupta (L2C2 Technologies) <indradg at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
-----------------------------------------------------------------------
Summary of changes:
C4/Installer/PerlDependencies.pm | 5 +
C4/UploadedFiles.pm | 323 ++++++++++++++++++++
Koha.pm | 2 +-
.../Result/{ActionLog.pm => UploadedFile.pm} | 77 ++---
about.pl | 14 +
cataloguing/value_builder/upload.pl | 164 ++++++++++
debian/templates/koha-conf-site.xml.in | 1 +
etc/koha-conf.xml | 1 +
installer/data/mysql/kohastructure.sql | 17 ++
installer/data/mysql/updatedatabase.pl | 22 ++
koha-tmpl/intranet-tmpl/prog/en/modules/about.tt | 15 +
.../en/modules/cataloguing/value_builder/upload.tt | 103 +++++++
.../value_builder/upload_delete_file.tt | 63 ++++
misc/cronjobs/overdue_notices.pl | 2 +-
.../opac-retrieve-file.pl | 24 +-
t/db_dependent/UploadedFiles.t | 61 ++++
tools/upload-file-progress.pl | 21 +-
tools/upload-file.pl | 20 +-
18 files changed, 884 insertions(+), 51 deletions(-)
create mode 100644 C4/UploadedFiles.pm
copy Koha/Schema/Result/{ActionLog.pm => UploadedFile.pm} (52%)
create mode 100755 cataloguing/value_builder/upload.pl
create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/upload.tt
create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/upload_delete_file.tt
copy cataloguing/plugin_launcher.pl => opac/opac-retrieve-file.pl (63%)
create mode 100644 t/db_dependent/UploadedFiles.t
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list