[koha-commits] main Koha release repository branch master updated. v16.05.00-179-g6022463
Git repo owner
gitmaster at git.koha-community.org
Fri Jun 24 15:26:28 CEST 2016
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 602246306a1b33f73e22556f3744d7f72cac377a (commit)
via 71ea7e2ba5b8a44f1a8fb292b66f9ed3a6a0eb45 (commit)
via 573f1ac474d6c3d4eaba0422f30981aca02a3e8b (commit)
from 3e566de51fe6f2e966158f97682f9a5aaecab974 (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 602246306a1b33f73e22556f3744d7f72cac377a
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Fri Jun 24 13:26:51 2016 +0000
Bug 3669 [QA Followup] - Give the text area some breathing room
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
commit 71ea7e2ba5b8a44f1a8fb292b66f9ed3a6a0eb45
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Sun Jun 12 11:08:44 2016 +0100
Bug 3669: Remove parameters passed to action of form
Sounds weird to pass parameters to the action of a POST form.
This patch adds a workaround.
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
commit 573f1ac474d6c3d4eaba0422f30981aca02a3e8b
Author: Aleisha <aleishaamohia at hotmail.com>
Date: Thu Mar 24 00:28:42 2016 +0000
Bug 3669: Moving 'Add a new message' into a pop up box and adding to patron toolbar
This patch moves all the code into an include which can be accessed from the 'Add a new message' link or the patron toolbar.
EDIT: Ensuring modal opens on all pages
EDIT2: Once the form has been submitted the page will redirect to where you submitted the form from.
EDIT3: Fixing indentation of member-add-message.inc
Ensuring messages save on every page
Fill branch
Ensure predefined notes appear
Form redirects to where it was submitted from, or just the circulation page.
EDIT4: Removing the new include file and moving it all into the modal in the toolbar
EDIT5: Removing swp file and unnecessary code duplication by utilising plugins
EDIT6: Batch checkout fixes
EDIT7: Ensure you do not get JS error from Comment 24 (Batch checkout syspref must be turned on)
To test:
1) Go to a patron circ page (circ/circulation.pl?borrowernumber=X)
2) Click 'Add a new message' under Messages
3) Confirm this brings up the modal to add a message. Confirm clicking Save saves your message. If it is an OPAC message (for the user), confirm it shows as expected on the OPAC.
4) Click Cancel. Confirm this closes the modal.
5) Click 'Add message' button in toolbar. Complete steps 3 and 4.
6) Confirm the modal opens from all other pages with the members toolbar. Confirm predefined notes shows.
circ/circulation.pl
members/moremember.pl
members/routing-lists.pl
members/statistics.pl
members/boraccount.pl
members/pay.pl
members/maninvoice.pl
members/mancredit.pl
members/readingrec.pl
members/notices.pl
members/member-flags.pl
members/member-password.pl
members/paycollect.pl
members/files.pl
turn on BatchCheckouts syspref and put in appropriate patron category
circ/circulation.pl?borrowernumber=X&batch=1
7) Confirm that the page redirects to where you submitted the form from once you have submitted it.
8) Go to Check Out tab and confirm your message saved (or OPAC, wherever you saved it)
Sponsored-by: Catalyst IT
Followed test plan, works as expected. (Re-tested for comment #24)
Signed-off-by: Marc Véron <veron at veron.ch>
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:
circ/add_message.pl | 14 +++++-
circ/circulation.pl | 6 +--
koha-tmpl/intranet-tmpl/prog/css/staff-global.css | 4 ++
.../prog/en/includes/members-toolbar.inc | 46 ++++++++++++++++++++
.../prog/en/modules/circ/circulation.tt | 39 +----------------
.../en/modules/circ/circulation_batch_checkouts.tt | 2 +-
.../prog/en/modules/members/moremember.tt | 1 -
.../intranet-tmpl/prog/js/pages/circulation.js | 2 -
members/readingrec.pl | 1 -
members/routing-lists.pl | 1 -
10 files changed, 65 insertions(+), 51 deletions(-)
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list