[koha-commits] main Koha release repository branch master updated. v16.11.00-893-gccd42ee
Git repo owner
gitmaster at git.koha-community.org
Fri Apr 21 20:00:56 CEST 2017
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 ccd42eee5b109cb7c935b0779a8321a5a8a872e0 (commit)
via 8e99f884cc2eaecc810599fda9ef705f98efc10f (commit)
via aee0682d60ddf1f21c5802001d8af91b43102e51 (commit)
via 05e25dbc188d9d6340d03750a47cb1cce130715f (commit)
via 8e7f1dddebb90d30be328d15ed8150517c2df664 (commit)
via bab3a204be028cae30d26ad7b05dde4de1e58b76 (commit)
via 8042267a7872bebecbb99c4638467c4d1225a06c (commit)
via 4655cee3664da58a1812c8338130a35ba9d7da60 (commit)
via 53f5d55ab4938cf827108bef98609ca165ef6cb7 (commit)
via 686b7d6a827741da85224b6895d9b1c94cbbdf3c (commit)
via fe9a8bf9735c7ea54d39aa1c19f667bf999a902d (commit)
from 5f3e93c6f5cd7818f53296cf9c4a37c860119970 (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 ccd42eee5b109cb7c935b0779a8321a5a8a872e0
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Fri Apr 21 13:59:52 2017 -0400
Bug 17669 - DBRev 16.12.00.025
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
commit 8e99f884cc2eaecc810599fda9ef705f98efc10f
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Thu Apr 20 01:10:14 2017 -0300
Bug 17669: Remove warning 'variable $kohaobj masks earlier declaration in same scope'
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
commit aee0682d60ddf1f21c5802001d8af91b43102e51
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Mon Apr 3 19:14:52 2017 +0200
Bug 17669: [QA Follow-up] More consistency in return values of delete
See Bugzilla comment36 (QA request).
Koha::UploadedFile->delete
Returns 1, 0E0 or -1 (unknown).
Koha::UploadedFiles->delete and delete_temporary
Returns number of deleted records, 0E0 or -1.
POD lines are corrected accordingly. Unit tests adjusted too.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Added a note that Koha::Object->delete itself is not completely consistent
with Koha::Objects->delete (DBIx). The singular may return 1 when it
gets 0E0 from DBIx, while the plural one may return 0E0. But should be
handled somewhere else.
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
commit 05e25dbc188d9d6340d03750a47cb1cce130715f
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Fri Mar 31 08:31:10 2017 +0200
Bug 17669: [QA Follow-up] Allow zero in temp-uploads-days
As requested by QA on comment33.
If the pref is 0 or the overriding command line parameter is 0, all
temporary files will be deleted. But if the pref is NULL or empty string,
we will not delete files.
Also adjusted the description of the preference in this regard.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
commit 8e7f1dddebb90d30be328d15ed8150517c2df664
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Thu Mar 30 08:51:17 2017 +0200
Bug 17669: [QA Follow-up] Rename --temp-uploads-override parameter
As requested by QA on comment25.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
commit bab3a204be028cae30d26ad7b05dde4de1e58b76
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Thu Mar 30 08:42:38 2017 +0200
Bug 17669: [QA Follow-up] Rename preference by removing underscores
Requested by QA on comment25.
Result of:
git grep -l Upload_PurgeTemporaryFiles_Days | xargs sed -i -e "s/Upload_PurgeTemporaryFiles_Days/UploadPurgeTemporaryFilesDays/g"
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
commit 8042267a7872bebecbb99c4638467c4d1225a06c
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Wed Dec 14 13:46:06 2016 +0100
Bug 17669: Add new switch to crontab example and debian daily cron file
The new switch for deleting temporary uploads in cleanup_database can
be added to cron.
Note: Since the option --temp-uploads does only purge temporary uploads
when triggered by the preference Upload_PurgeTemporaryFiles_Days, it can
be safely added here.
Test plan:
There is actually nothing to test here if you followed the preceding test
plans. Just verify that the switch is inserted ocrrectly.
Signed-off-by: Mirko Tietgen <mirko at abunchofthings.net>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
commit 4655cee3664da58a1812c8338130a35ba9d7da60
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Tue Dec 13 16:44:26 2016 +0100
Bug 17669: Incorporate the changes in cleanup_database
Two command line options are added:
[1] -temp-uploads to indicate that you want to purge these uploads,
[2] -temp-uploads-override DAYS to (optionally) tell that you want to
override the corresponding pref value.
Test plan:
[1] Check the modified usage statement.
[2] If needed, backup your temporary uploads :)
In case you do not have one, add a temporary one with Tools/Upload.
Note: Do not choose an upload category.
[3] Set pref to 0, and run cleanup_database with only --temp-uploads.
No files should be deleted.
[4] Check number of "old" temp uploads. Set pref to nonzero value.
Verify that the oldest are gone (depending on the value chosen).
[5] Set pref to 0 again.
If all uploads are gone now, add a new one with Tools/Upload.
Run cleanup_database with --temp-uploads --temp-uploads-override -1
All temporary files are gone.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Mirko Tietgen <mirko at abunchofthings.net>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
commit 53f5d55ab4938cf827108bef98609ca165ef6cb7
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Tue Dec 13 14:04:29 2016 +0100
Bug 17669: Add delete_temporary method with unit tests
Test plan:
Run t/db_dependent/Upload.t
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Mirko Tietgen <mirko at abunchofthings.net>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
commit 686b7d6a827741da85224b6895d9b1c94cbbdf3c
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Mon Mar 20 08:43:32 2017 +0100
Bug 17669: Small change to sub delete
Instead of looping through _resultset here and wrapping the results,
we should use a Koha::Objects instance. Since the method may be called
as a class method, we create an instance if needed.
Test plan:
Run t/db_dependent/Upload.t
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Mirko Tietgen <mirko at abunchofthings.net>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
commit fe9a8bf9735c7ea54d39aa1c19f667bf999a902d
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Tue Dec 13 14:03:27 2016 +0100
Bug 17669: Introduce new preference for purging temp uploads
The new preference is: Upload_PurgeTemporaryFiles_Days.
It controls if the cron job will delete temporary uploaded files and if so,
how many days should have passed before doing so.
Since the default value is empty, it will not start deleting these uploads
until you change the pref. No behavior change. But the dbrev will print a
message if you already have temporary uploads.
Test plan:
[1] Check Administration, Preferences, Tools for the new pref.
[2] Run the db rev.
If you have temporary uploads, check the reported count.
[3] Bonus: Run sysprefs.sql in a safe environment.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Mirko Tietgen <mirko at abunchofthings.net>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
-----------------------------------------------------------------------
Summary of changes:
Koha.pm | 2 +-
Koha/UploadedFile.pm | 13 +++-
Koha/UploadedFiles.pm | 45 +++++++++++--
debian/koha-common.cron.daily | 2 +-
installer/data/mysql/sysprefs.sql | 1 +
installer/data/mysql/updatedatabase.pl | 16 +++++
.../prog/en/modules/admin/preferences/tools.pref | 6 ++
misc/cronjobs/cleanup_database.pl | 21 +++++-
misc/cronjobs/crontab.example | 2 +-
t/db_dependent/Upload.t | 67 ++++++++++++++++++--
10 files changed, 158 insertions(+), 17 deletions(-)
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list