[koha-commits] main Koha release repository branch master updated. v3.20.00-866-g304dd2b
Git repo owner
gitmaster at git.koha-community.org
Fri Oct 23 15:14:36 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 304dd2b0512eb82962e0425d8183b15785252913 (commit)
via c43e10f06ea35ae17a6efcb24efc4280804cb682 (commit)
via b02619928b2db9434ac0caa2c1dd49024ee1832d (commit)
via 21d17e490d2104ac477ad05ed89199c0b12ab727 (commit)
via b3f215bd2a8f354698370778b9e84f9c582524bb (commit)
via dc6bc14fc9be4793d8731614db355bf2ba6778f1 (commit)
via 003ff493b5d167e9e77d297de29f27d000564cd0 (commit)
via 4a714313fef3f1a5076cf94c4e0e4e484e4c2299 (commit)
from 5153d04e41f2502160d18ae6340c82d5b15e261e (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 304dd2b0512eb82962e0425d8183b15785252913
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Fri Oct 23 08:47:58 2015 +0200
Bug 14918: [QA Follow-up] Correct enddate and use constant
Corrected enddate (subtraction in the revised code must be an addition).
Replaced hardcoded 2 days by a constant.
Renamed the constant TWO_DAYS to PULL_INTERVAL.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Tested all three date formats.
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
commit c43e10f06ea35ae17a6efcb24efc4280804cb682
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Thu Oct 1 10:08:56 2015 +0100
Bug 14918: Remove C4::Dates from circ/pendingreserves.pl
This patch uses Koha::DateUtils instead of C4::Dates and Date::Calc. It
also sent DateTime objects to the template, which use the TT plugin to
display them.
If an invalid dates is entered, the default date is picked.
Test plan:
1/ Go to Home > Circulation > Holds to pull
2/ Verify that the the filter and the list behave as before
3/ Enter invalid dates and confirm that you do not get a software error
Counter patch works as expected and is a much cleaner solution.
Signed-off-by: Marc Veron <veron at veron.ch>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
commit b02619928b2db9434ac0caa2c1dd49024ee1832d
Author: Marc Véron <veron at veron.ch>
Date: Tue Oct 20 18:53:12 2015 +0200
Bug 14776: Remove 'selfcheck' patron related links from and add language selector to SCO header
The SCO screen displays patron related menu items in it's header (Link to the account and "Logout").
This makes no sense since the patron that is logged in is the 'selfcheck' user as defined in syspref AutoSelfCheckId.
Additionally, the language menue is missing when the syspref OpacLangSelectorMode is set to 'top' or to 'both'.
To test:
- Apply on top of Bug 15039
- Set AutoSelfCheck sysprefs as appropriate
- Set OpacLangSelectorMode to 'top' or 'both'
- Go to SCO page
- Verify that the language menue does not display in the header
- Enter a card number to check out (this logs in the SCO user)
- Verify that you get text similar to "Welcome, checkout" with a link to the sco user's account in the OPAC and a 'Logout' link
- Apply patch
- Verify that the language menu appears and the SCO user's information disappears.
- Verify, that the language menu displays / does not display with combinations of:
- opaclanguagedisplay (Allow)
- opaclanguages ( > 1 language selected)
- OpacLangSelectorMode (top or both)
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
commit 21d17e490d2104ac477ad05ed89199c0b12ab727
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Oct 21 14:08:05 2015 +0100
Bug 15037: Correctly check the patron categories on displaying the Batch checkout tab
When checking for the patron categories allowed to use the batch
checkout, the comparison should be strict (eq).
Test plan:
0/ Do not apply this patch
1/ Create 2 patron categories ST and S
2/ Enable BatchCheckouts and define BatchCheckoutsValidCategories = S
3/ Create 2 patrons, 1 in the ST category and the other one in S
4/ On the patron detail page, you should see the "batch checkout" tab
for both patron
5/ Apply this patch
6/ The tab should only be displayed for the patron S
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Tested using an 'S' patron and allowing 'ST' patrons only, worked as expected.
Also tried setting &batch=1 to force it to show the batch page, and it says
I'm not allowed to do batch checkouts for that patron. Great!
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
commit b3f215bd2a8f354698370778b9e84f9c582524bb
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Thu Oct 8 17:19:47 2015 +0100
Bug 14981: Remove ethnicity occurrences from sample patrons file
Bug 10020 has removed these columns, the should be removed from the
patron sample file.
Test plan:
Insert the files updated by this patch into a fresh DB, you shouldn't
get any error.
Signed-off-by: Frederic Demians <f.demians at tamil.fr>
Before applying the patch, I was able to notice the error when loading the
patron sample SQL file to a DB. With the patch, it's solved.
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
commit dc6bc14fc9be4793d8731614db355bf2ba6778f1
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Fri Oct 16 08:45:30 2015 +0000
Bug 15021: Fix scoping variable in tools/batchMod.pl
$tagslib is used in subroutines and should be declare as global.
Test plan:
On the Batch item modification page, all item fields should be listed, not only the title.
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Works as expected
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
commit 003ff493b5d167e9e77d297de29f27d000564cd0
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Wed Oct 21 13:02:31 2015 +0200
Bug 14674: [QA Follow-up] Typos and textual adjustment
This patch does:
[1] Resolve error [koha-create: line 294: local: `=upload21': not a valid
identifier] by replacing $instance by instance.
[2] Resolved typo for 'specify'.
[3] Resolve error: [sed: -e expression #26, char 20: unknown option to `s']
by replacing the slash in the sed line by a #. This makes sed not
stumble over the slashes in the upload path.
[4] Added the aspect of permanent storage in the wording (as opposed to
the storage of temporary uploads in /tmp or similar).
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Verified that koha-create now inserts the right path in koha-conf.xml.
Verified that koha-create-dirs created the new uploads directory.
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
commit 4a714313fef3f1a5076cf94c4e0e4e484e4c2299
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Tue Oct 20 11:34:49 2015 -0300
Bug 14674: koha-create should populate upload_path
This patch makes koha-create and koha-create-dirs aware of the new upload_path
configuration entry.
It defaults to /var/lib/koha/<instance>/uploads as proposed by Robin but lets the
user specify its own directory, using the --upload-path option switch that is
added by this patch.
koha-create-dirs is tweaked so it also creates this new directory.
The docs are updated accordingly.
To test:
- Apply the patch, have a packages setup (either by grabbing the relevant files [1]
or by creating your own package).
- Run koha-create --create-db instance
=> SUCCESS: /var/lib/koha/instance/uploads directory is created
=> SUCCESS: /etc/koha/sites/instance/koha-config.xml has upload_path set correctly
- Create a new instance using the --upload-path making it point to whatever you want
=> SUCCESS: koha-conf.xml points to your chosen path
- Sign off :-D
Regards
Sponsored-by: Universidad Nacional de Cordoba
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Does not work in its current state. Needs a follow-up.
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:
circ/pendingreserves.pl | 45 +++++----
debian/docs/koha-create.xml | 9 ++
debian/scripts/koha-create | 25 ++++-
debian/scripts/koha-create-dirs | 1 +
debian/templates/koha-conf-site.xml.in | 2 +-
.../data/mysql/de-DE/optional/sample_patrons.sql | 102 ++++++++++----------
.../data/mysql/en/optional/sample_patrons.sql | 102 ++++++++++----------
.../data/mysql/es-ES/optional/sample_patrons.sql | 102 ++++++++++----------
.../mysql/nb-NO/2-Valgfritt/sample_patrons.sql | 102 ++++++++++----------
.../data/mysql/pl-PL/optional/sample_patrons.sql | 102 ++++++++++----------
.../intranet-tmpl/prog/en/includes/circ-menu.inc | 2 +-
.../prog/en/modules/circ/pendingreserves.tt | 6 +-
.../bootstrap/en/includes/masthead-sco.inc | 10 +-
tools/batchMod.pl | 2 +-
tools/import_borrowers.pl | 2 +-
15 files changed, 325 insertions(+), 289 deletions(-)
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list