[koha-commits] main Koha release repository branch master updated. v16.11.00-966-gb492182
Git repo owner
gitmaster at git.koha-community.org
Fri Apr 28 15:13:07 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 b492182b69e353f4f08d227b1ec7525a23bd6fe0 (commit)
via 6dd7fb7b19ba9417ff8939ed01618ef3d328d825 (commit)
via f5b1154e704d97b63edf6fc9e699ca114c8603ba (commit)
via 0fa07cce329e52abea601c75b1d05f9ee915b530 (commit)
via e54152a90b0770c240232bc27363f77fed910a8d (commit)
via ba658d5919b898c71d21380c9b302818a636c090 (commit)
via c4dd097d20040cc2786ca062d306b8eee1f005e2 (commit)
via 88852ffbb0de4a3b06df50921d555cec9b525957 (commit)
via a7df1afe60e10f991a017559c9057c40ae20eadb (commit)
via 8c0ff71ff0f08f6700ca87a75bb8a7c9a046ab88 (commit)
via 93e04a9925aa90cfeb5c0ede5b2528dc28848844 (commit)
via a56690d3a441abb9e911598865cc68e07e598487 (commit)
via 0159908ca144bca599ed9a0ff51fd3f0ab2ad0ab (commit)
from 6f334aab06fd6e07f2ab8b399fbe50168d5818f4 (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 b492182b69e353f4f08d227b1ec7525a23bd6fe0
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Thu Apr 27 19:10:47 2017 +0000
Bug 14224 - DBRev 16.12.00.029
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
commit 6dd7fb7b19ba9417ff8939ed01618ef3d328d825
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Thu Apr 20 13:46:35 2017 -0300
Bug 14424: DBIC Schema changes
https://bugs.koha-community.org/show_bug.cgi?id=14224
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
commit f5b1154e704d97b63edf6fc9e699ca114c8603ba
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Thu Apr 20 13:42:02 2017 -0300
Bug 14224: Use encode_json instead of to_json
To handle unicode characters properly
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
commit 0fa07cce329e52abea601c75b1d05f9ee915b530
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Feb 1 15:53:06 2017 +0100
Bug 14224: Check if the columns do not exist before creating them
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Marc Véron <veron at veron.ch>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
commit e54152a90b0770c240232bc27363f77fed910a8d
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Feb 1 17:01:00 2017 +0100
Bug 14224: Improve escaped characters
To recreate the problem, submit a note like
doh"doh
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Marc Véron <veron at veron.ch>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
commit ba658d5919b898c71d21380c9b302818a636c090
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Feb 1 16:56:46 2017 +0100
Bug 14224: Update Copyright
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Marc Véron <veron at veron.ch>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
commit c4dd097d20040cc2786ca062d306b8eee1f005e2
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Thu Feb 2 11:37:54 2017 +0100
Bug 14224: Replace AllowIssueNotes with AllowCheckoutNotes
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Marc Véron <veron at veron.ch>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
commit 88852ffbb0de4a3b06df50921d555cec9b525957
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Feb 1 16:38:37 2017 +0100
Bug 14224: Make strings translatable
The strings should be translatable.
This patch also removes the error as it appears that we only have 1
error.
To improve we could surround the store with an eval.
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Marc Véron <veron at veron.ch>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
commit a7df1afe60e10f991a017559c9057c40ae20eadb
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Thu Feb 2 11:10:30 2017 +0100
Bug 14224: Fix prevent submit
That did not work, the form was submitted anyway
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Marc Véron <veron at veron.ch>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
commit 8c0ff71ff0f08f6700ca87a75bb8a7c9a046ab88
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Thu Feb 2 11:10:28 2017 +0100
Bug 14224: Remove SQL query in svc script
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Marc Véron <veron at veron.ch>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
commit 93e04a9925aa90cfeb5c0ede5b2528dc28848844
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Thu Feb 2 10:49:18 2017 +0100
Bug 14224: Reintroduce previous copyright
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Marc Véron <veron at veron.ch>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
commit a56690d3a441abb9e911598865cc68e07e598487
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Feb 1 15:56:34 2017 +0100
Bug 14224: Do not reintroduce GetItemIssue, it's dying
Bug 17680 is removing it.
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Marc Véron <veron at veron.ch>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
commit 0159908ca144bca599ed9a0ff51fd3f0ab2ad0ab
Author: Aleisha Amohia <aleisha at catalyst.net.nz>
Date: Sun Aug 23 18:22:50 2015 +0200
Bug 14224: Allow patron notes about item shown at check in
This patch adds a "Note" input field to checked out items in the "your summary"
section. The field allows patrons to write notes about the item checked out,
such as "this DVD is scratched", "the binding was torn", etc. The note will be
emailed to the library and displayed on item check in.
Patch adds two fields to the "issues" table - "note" and "notedate".
Patch adds syspref "AllowIssueNotes" - default off.
Test Plan:
1) Apply this patch
2) Update database
3) Rebuild schema
4) Turn on 'AllowIssueNote' syspref
5) Check out three different items to a borrower (may be easiest to check
out to yourself)
6) Log in as that borrower (or yourself) on the OPAC side and go to your
summary
7) Confirm text field shows under Note column for all checkouts. Set a
note for each issue, confirm all save.
8) Check the message_queue in mysql for the entries for ALL THREE issue
notes.
9) Disable javascript in your browser
10) Refresh your summary page. Confirm that you can no longer edit the
notes in the text field. Click the 'Create/edit note' button and confirm
you are redirected to a new page.
11) Confirm that the correct title and author show for the note button
you clicked.
12) Set the note and click Submit -> confirm you are redirected
back to summary page and note is saved
13) Confirm there is a new entry in message_queue
14) Enable javascript and go back to the your checkouts page in the
staff client for the borrower you issued the items to
15) Check in TWO items
16) Confirm that the issue notes show under the "Date due" column for
the two items you checked in, and are accurate to the item (i.e. the
right issue note under the right item)
17) Go to circ/returns.pl and check in the final item using the barcode.
Confirm the issue note shows and the date is formatted correctly.
Sponsored-by: Region Halland
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Marc Véron <veron at veron.ch>
-----------------------------------------------------------------------
Summary of changes:
Koha.pm | 2 +-
Koha/Schema/Result/Issue.pm | 23 ++++-
Koha/Schema/Result/OldIssue.pm | 23 ++++-
circ/returns.pl | 3 +
installer/data/mysql/kohastructure.sql | 4 +
installer/data/mysql/sysprefs.sql | 1 +
installer/data/mysql/updatedatabase.pl | 29 ++++++
.../en/modules/admin/preferences/circulation.pref | 6 ++
.../intranet-tmpl/prog/en/modules/circ/returns.tt | 10 ++
koha-tmpl/intranet-tmpl/prog/js/checkouts.js | 19 +++-
.../bootstrap/en/modules/opac-issue-note.tt | 54 ++++++++++
.../opac-tmpl/bootstrap/en/modules/opac-user.tt | 94 ++++++++++++++++++
opac/opac-issue-note.pl | 88 +++++++++++++++++
opac/opac-user.pl | 2 +
opac/svc/patron_notes | 104 ++++++++++++++++++++
svc/checkin | 5 +
16 files changed, 458 insertions(+), 9 deletions(-)
create mode 100644 koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-issue-note.tt
create mode 100755 opac/opac-issue-note.pl
create mode 100755 opac/svc/patron_notes
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list