[koha-commits] main Koha release repository branch master updated. v16.11.00-943-g368670c
Git repo owner
gitmaster at git.koha-community.org
Fri Apr 28 14:49:02 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 368670cda7c7456d6701c3602846a6b5d4c605ec (commit)
via 6b5c632d9e254aac419b0576508ea6296b7b03a2 (commit)
via 709358e0c98a583b48f0fee13adb45c00f51b5ff (commit)
via 589aa069915c001792a71d900e26a20526d6b9d0 (commit)
via 95429af6855e8ed37945b681dc466bf360deffb2 (commit)
from 45a35f1ecc7c41073c3cb3f3ea56f496dcd0171c (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 368670cda7c7456d6701c3602846a6b5d4c605ec
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Fri Apr 28 08:46:59 2017 -0400
Bug 12461 - DBRev 16.12.00.027
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
commit 6b5c632d9e254aac419b0576508ea6296b7b03a2
Author: Marc Véron <veron at veron.ch>
Date: Mon May 4 23:29:29 2015 +0200
Bug 14143 - Patron cards: Crash (confusion between table names creator_templates and club_template_enrollment_fields)
To reproduce:
Go to Home > Tools > Patron card creator
Click on 'Manage profiles'
Result:
Can't use string ("1") as an ARRAY ref while "strict refs" in use at /usr/share/kohaclone/C4/Creators/Lib.pm line 564.
Reason:
Select statment to get field 'template code' from table 'club_template_enrollment_fields' (!) instead of 'table creator_templates'.
To test:
Apply patch
Try to reproduce issue.
Amended because of typo (_ instead of -)
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
commit 709358e0c98a583b48f0fee13adb45c00f51b5ff
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Fri Apr 28 06:43:44 2017 -0400
Bug 12461 - (QA Followup)
Club enrollments should only list active enrollments
Confirms should warn of cascading delete
Branch limited clubs should only be available to members of that
branch
Fix breadcrumbs
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
commit 589aa069915c001792a71d900e26a20526d6b9d0
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Thu Apr 27 08:24:29 2017 -0400
Bug 12461 [QA Followup]
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
commit 95429af6855e8ed37945b681dc466bf360deffb2
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Fri May 23 11:54:26 2014 -0400
Bug 12461 - Add patron clubs feature
This features would add the ability to create clubs which patrons may be
enrolled in. It would be particularly useful for tracking summer reading
programs, book clubs and other such clubs.
Test Plan:
1) Apply this patch
2) Run updatedatabase.pl
3) Ensure your staff user has the new 'Patron clubs' permissions
4) Under the tools menu, click the "Patron clubs" link
5) Create a new club template
* Here you can add fields that can be filled out at the time
a new club is created based on the template, or a new enrollment
is created for a given club based on the template.
6) Create a new club based on that template
7) Attempt to enroll a patron in that club
8) Create a club with email required set
9) Attempt to enroll a patron without an email address in that club
10) Create a club that is enrollable from the OPAC
11) Attempt to enroll a patron in that club
12) Attempt to cancel a club enrollment from the OPAC
13) Attempt to cancel a club enrollment from the staff interface
Followed test plan, works as expected.
Signed-off-by: Marc Véron <veron at veron.ch>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
-----------------------------------------------------------------------
Summary of changes:
C4/Auth.pm | 5 +-
C4/Creators/Lib.pm | 2 +-
C4/Members.pm | 16 +-
Koha.pm | 2 +-
Koha/Club.pm | 104 ++++++++
Koha/Club/Enrollment.pm | 88 +++++++
Koha/Club/Enrollment/Field.pm | 56 ++++
Koha/Club/Enrollment/Fields.pm | 60 +++++
Koha/Club/Enrollments.pm | 60 +++++
Koha/Club/Field.pm | 66 +++++
Koha/Club/Fields.pm | 60 +++++
Koha/Club/Template.pm | 75 ++++++
Koha/Club/Template/EnrollmentField.pm | 54 ++++
Koha/Club/Template/EnrollmentFields.pm | 60 +++++
Koha/Club/Template/Field.pm | 54 ++++
Koha/Club/Template/Fields.pm | 60 +++++
Koha/Club/Templates.pm | 60 +++++
Koha/Clubs.pm | 98 +++++++
Koha/Patron.pm | 46 ++++
Koha/Schema/Result/AuthorisedValue.pm | 6 +-
Koha/Schema/Result/Borrower.pm | 19 +-
Koha/Schema/Result/Branch.pm | 49 +++-
Koha/Schema/Result/Club.pm | 197 ++++++++++++++
Koha/Schema/Result/ClubEnrollment.pm | 201 ++++++++++++++
Koha/Schema/Result/ClubEnrollmentField.pm | 112 ++++++++
Koha/Schema/Result/ClubField.pm | 112 ++++++++
Koha/Schema/Result/ClubTemplate.pm | 195 ++++++++++++++
Koha/Schema/Result/ClubTemplateEnrollmentField.pm | 119 +++++++++
Koha/Schema/Result/ClubTemplateField.pm | 119 +++++++++
Koha/Template/Plugin/AuthorisedValues.pm | 4 +-
Koha/Template/Plugin/Borrowers.pm | 1 -
clubs/club-enrollments.pl | 47 ++++
clubs/clubs-add-modify.pl | 113 ++++++++
clubs/clubs.pl | 60 +++++
clubs/patron-clubs-tab.pl | 55 ++++
clubs/patron-enroll.pl | 50 ++++
clubs/templates-add-modify.pl | 152 +++++++++++
installer/data/mysql/kohastructure.sql | 124 +++++++++
installer/data/mysql/updatedatabase.pl | 129 +++++++++
installer/data/mysql/userflags.sql | 3 +-
installer/data/mysql/userpermissions.sql | 5 +-
.../intranet-tmpl/prog/en/includes/permissions.inc | 4 +
.../intranet-tmpl/prog/en/includes/tools-menu.inc | 3 +
.../prog/en/modules/circ/circulation.tt | 25 +-
.../prog/en/modules/clubs/club-enrollments.tt | 74 ++++++
.../prog/en/modules/clubs/clubs-add-modify.tt | 115 ++++++++
.../intranet-tmpl/prog/en/modules/clubs/clubs.tt | 276 ++++++++++++++++++++
.../prog/en/modules/clubs/patron-clubs-tab.tt | 102 ++++++++
.../prog/en/modules/clubs/patron-enroll.tt | 66 +++++
.../prog/en/modules/clubs/templates-add-modify.tt | 216 +++++++++++++++
.../prog/en/modules/members/moremember.tt | 23 ++
.../prog/en/modules/tools/tools-home.tt | 5 +
.../bootstrap/en/modules/clubs/clubs-tab.tt | 102 ++++++++
.../opac-tmpl/bootstrap/en/modules/clubs/enroll.tt | 66 +++++
.../opac-tmpl/bootstrap/en/modules/opac-user.tt | 27 +-
members/moremember.pl | 2 +
opac/clubs/clubs-tab.pl | 52 ++++
opac/clubs/enroll.pl | 49 ++++
opac/svc/club/cancel_enrollment | 47 ++++
opac/svc/club/enroll | 77 ++++++
svc/club/cancel_enrollment | 46 ++++
svc/club/delete | 48 ++++
svc/club/enroll | 74 ++++++
svc/club/template/delete | 49 ++++
t/db_dependent/Clubs.t | 224 ++++++++++++++++
65 files changed, 4639 insertions(+), 31 deletions(-)
create mode 100644 Koha/Club.pm
create mode 100644 Koha/Club/Enrollment.pm
create mode 100644 Koha/Club/Enrollment/Field.pm
create mode 100644 Koha/Club/Enrollment/Fields.pm
create mode 100644 Koha/Club/Enrollments.pm
create mode 100644 Koha/Club/Field.pm
create mode 100644 Koha/Club/Fields.pm
create mode 100644 Koha/Club/Template.pm
create mode 100644 Koha/Club/Template/EnrollmentField.pm
create mode 100644 Koha/Club/Template/EnrollmentFields.pm
create mode 100644 Koha/Club/Template/Field.pm
create mode 100644 Koha/Club/Template/Fields.pm
create mode 100644 Koha/Club/Templates.pm
create mode 100644 Koha/Clubs.pm
create mode 100644 Koha/Schema/Result/Club.pm
create mode 100644 Koha/Schema/Result/ClubEnrollment.pm
create mode 100644 Koha/Schema/Result/ClubEnrollmentField.pm
create mode 100644 Koha/Schema/Result/ClubField.pm
create mode 100644 Koha/Schema/Result/ClubTemplate.pm
create mode 100644 Koha/Schema/Result/ClubTemplateEnrollmentField.pm
create mode 100644 Koha/Schema/Result/ClubTemplateField.pm
create mode 100755 clubs/club-enrollments.pl
create mode 100755 clubs/clubs-add-modify.pl
create mode 100755 clubs/clubs.pl
create mode 100755 clubs/patron-clubs-tab.pl
create mode 100755 clubs/patron-enroll.pl
create mode 100755 clubs/templates-add-modify.pl
create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/clubs/club-enrollments.tt
create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/clubs/clubs-add-modify.tt
create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/clubs/clubs.tt
create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/clubs/patron-clubs-tab.tt
create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/clubs/patron-enroll.tt
create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/clubs/templates-add-modify.tt
create mode 100644 koha-tmpl/opac-tmpl/bootstrap/en/modules/clubs/clubs-tab.tt
create mode 100644 koha-tmpl/opac-tmpl/bootstrap/en/modules/clubs/enroll.tt
create mode 100755 opac/clubs/clubs-tab.pl
create mode 100755 opac/clubs/enroll.pl
create mode 100755 opac/svc/club/cancel_enrollment
create mode 100755 opac/svc/club/enroll
create mode 100755 svc/club/cancel_enrollment
create mode 100755 svc/club/delete
create mode 100755 svc/club/enroll
create mode 100755 svc/club/template/delete
create mode 100755 t/db_dependent/Clubs.t
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list