[koha-commits] main Koha release repository branch master updated. v3.20.00-393-g62f3fd6
Git repo owner
gitmaster at git.koha-community.org
Tue Aug 11 20:14:53 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 62f3fd6a8f935e61af9199d175ece23baad40878 (commit)
via cb1ac9f36a207a51f8292d96fb4ed52dfe4442b9 (commit)
via 43fadbadea9a4504e519dfb0b915e57fd811e0ad (commit)
via dcb5bf00aac12642052b21fe9dbb4d50bb5458a4 (commit)
via ae82953138aad2b07c6191ab5014b1abdb04aeda (commit)
via 7135bae0bbf17405cc5b543830599e9b5742db73 (commit)
via 47be5cafefbd7841e6792d0d0dede654f3afff96 (commit)
via 82ce53c8b7d5f40f6ff1e7c661bc0c4ba15fe88b (commit)
via f081063d72e7e03de179b096f2bbe425ed264505 (commit)
via 78d83e06410739bf731cccee30c6cec446196609 (commit)
from 8fa214bfa5cc0d46a3e34f4c09bb7635132b0b04 (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 62f3fd6a8f935e61af9199d175ece23baad40878
Author: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
Date: Tue Aug 11 15:09:54 2015 -0300
Bug 13485: DBRev 3.21.00.018
Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
commit cb1ac9f36a207a51f8292d96fb4ed52dfe4442b9
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Aug 5 12:52:12 2015 +0100
Bug 13485: Use the Koha template plugin to access syspref values
And remove the useless use of the KohaDates plugin
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
commit 43fadbadea9a4504e519dfb0b915e57fd811e0ad
Author: Simith D'Oliveira <simith at inlibro.com>
Date: Fri Dec 19 14:44:48 2014 -0500
Bug 13485: Add a page to display links to restricted sites
To test:
I) Apply the patch
II) Run updatedatabase.pl
scenario I)
1) Add some content in RestrictedPageContent and RestrictedPageTitle sysprefs.
2) Add your machine ip (ex. 127.0.0)
3) Validate cgi-bin/koha/opac-proxypage.pl shows a page with RestrictedPageContent and RestrictedPageTitle contents.
scenario II)
1) Logout opac page
2) Add some content in RestrictedPageContent and RestrictedPageTitle sysprefs.
3) Add other ip that your machine ip.
4) Validate: cgi-bin/koha/opac-proxypage.pl shows a login page.
5) Validate: cgi-bin/koha/opac-proxypage.pl shows a page with RestrictedPageContent and RestrictedPageTitle contents after login.
Followed both scenarios, works as expected.
Signed-off-by: Marc Veron <veron at veron.ch>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Bug 13485 [QA Followup]
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Bug 13485 - Atomic Update + Rename Proxy page to Restricted page
Test plan:
I) Apply the patch
II) Run updatedatabase.pl
scenario I)
1) Add some content in RestrictedPageContent and RestrictedPageTitle sysprefs.
2) Add your machine ip (ex. 127.0.0)
3) Validate cgi-bin/koha/opac-restrictedpage.pl shows a page with RestrictedPageContent and RestrictedPageTitle contents.
scenario II)
1) Logout opac page
2) Add some content in RestrictedPageContent and RestrictedPageTitle sysprefs.
3) Add a diffrent ip.
4) Validate: cgi-bin/koha/opac-restrictedpage.pl shows a login page.
5) Validate: cgi-bin/koha/opac-restrictedpage.pl shows a page with RestrictedPageContent and RestrictedPageTitle contents after login.
new file: installer/data/mysql/atomicupdate/Bug13485_RestrictedSitesPage.sql
modified: installer/data/mysql/sysprefs.sql
modified: koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref
renamed: koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-proxypage.tt -> koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-restrictedpage.tt
renamed: opac/opac-proxypage.pl -> opac/opac-restrictedpage.pl
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
commit dcb5bf00aac12642052b21fe9dbb4d50bb5458a4
Author: Jonathan Druart <jonathan.druart at koha-community.org>
Date: Thu Jul 2 10:20:13 2015 +0100
Bug 13853: (follow-up) unit tests
Specify the reference, we should receive Koha::Object.
Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
commit ae82953138aad2b07c6191ab5014b1abdb04aeda
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Thu Jun 25 14:56:18 2015 -0400
Bug 13853: (QA followup) Add unit tests for branch getting methods
Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
commit 7135bae0bbf17405cc5b543830599e9b5742db73
Author: Jonathan Druart <jonathan.druart at koha-community.org>
Date: Fri Jun 19 18:16:27 2015 +0200
Bug 13853: Add tests for is_waiting
Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
commit 47be5cafefbd7841e6792d0d0dede654f3afff96
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Tue Mar 17 10:09:28 2015 -0400
Bug 13853: Show waiting hold expiration date for waiting holds in holds ajax datatable
We should show the expiration date for waiting holds in the holds
datatable that appears in circulation.pl and moremember.pl
Test Plan:
1) Ensure ReservesMaxPickUpDelay is set
2) Place a hold on a record
3) Place a second hold and set it to waiting by checking it in
4) Place a third hold with an expiration date
5) View the holds tab on circulation.pl and moremember.pl
6) Note the first hold has no expiration date
7) Note the second hold has an expiration date of today + ReservesMaxPickUpDelay days
8) Note the thrid hold has an expiration date of whatever you set it to
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Cathi Wiggins <CWIGGINS at ci.arcadia.ca.us>
Signed-off-by: Megan Wianecki <mwianecki at mplmain.mtpl.org>
Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
commit 82ce53c8b7d5f40f6ff1e7c661bc0c4ba15fe88b
Author: Jonathan Druart <jonathan.druart at koha-community.org>
Date: Fri Jun 19 18:05:37 2015 +0200
Bug 13030: Remove the unnecessary double call
Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
commit f081063d72e7e03de179b096f2bbe425ed264505
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Wed Oct 8 12:04:35 2014 -0400
Bug 13030: Show waiting hold expiration date for waiting holds on circulation.pl
We should show the date a waiting hold is set to expire for each hold in
the list of waiting holds in circulation.pl
Test Plan:
1) Apply this patch
2) Find a waiting hold for a patron, browser to circulation.pl
for that patron
3) Set system preference ReservesMaxPickUpDelay to 5
4) Refresh circulation.pl, note the waiting holds now display a
"waiting until" part with the waiting date plus 5 days
5) Set system preference ReservesMaxPickUpDelay to 0 ( or empty
string )
6) Refresh circulation.pl, note the waiting hols no longer have a
"waiting until" line.
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Followed test plan successfully. Automated tests successful.
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Cathi Wiggins <CWIGGINS at ci.arcadia.ca.us>
Signed-off-by: Megan Wianecki <mwianecki at mplmain.mtpl.org>
Bug 13030 [QA Followup] - Fix unit tests
Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
commit 78d83e06410739bf731cccee30c6cec446196609
Author: Fridolin Somers <fridolin.somers at biblibre.com>
Date: Tue Jun 16 09:40:41 2015 +0200
Bug 11325: Focus not on "Add Item" in Lists
When viewing a list, the focus/cursor is no longer on the "add items" field below the list.
This patch moves the "Add Item" form at left part of page so that it is always shown (usefull when there are a lot of items). And adds focus to barcode input so you can enter several items with a barcode scanner.
Test instructions:
1. Create a list
2. Make sure you have an object with an assigned barcode
3. Go to the list
=> The barcode entry interface should be at left and has the focus
4. Enter the barcode and press enter (or use a scanner)
=> The item is added to the list
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
I like the new position.
Works well, focus on input box
No errors
Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
-----------------------------------------------------------------------
Summary of changes:
Koha.pm | 2 +-
Koha/Hold.pm | 37 +++++++++++++
Koha/Item.pm | 27 ++++++++++
installer/data/mysql/sysprefs.sql | 3 ++
installer/data/mysql/updatedatabase.pl | 13 +++++
.../prog/en/modules/admin/preferences/opac.pref | 15 ++++++
.../prog/en/modules/circ/circulation.tt | 3 +-
.../prog/en/modules/virtualshelves/shelves.tt | 50 +++++++++--------
.../bootstrap/en/modules/opac-restrictedpage.tt | 49 +++++++++++++++++
opac/opac-restrictedpage.pl | 48 +++++++++++++++++
svc/holds | 23 ++++----
t/db_dependent/Hold.t | 57 ++++++++++++++++++++
t/db_dependent/Items.t | 30 ++++++++++-
13 files changed, 323 insertions(+), 34 deletions(-)
create mode 100644 koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-restrictedpage.tt
create mode 100755 opac/opac-restrictedpage.pl
create mode 100755 t/db_dependent/Hold.t
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list