[koha-commits] main Koha release repository branch master updated. v16.11.00-443-g4c8ac01
Git repo owner
gitmaster at git.koha-community.org
Fri Feb 17 12:50:46 CET 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 4c8ac01a1d3f3334b03dfab1fd3d8fab27af3957 (commit)
via c6e0d42521fa6b62fd0f39d79e7acbbf3639d40a (commit)
from 849877d8d3bcd3791c624a84ec5e4cb0550fa0fe (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 4c8ac01a1d3f3334b03dfab1fd3d8fab27af3957
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Mon Jan 16 14:10:22 2017 +0100
Bug 17962: Add Koha::Tmp::Order[s]
These packages should not be used outside the TT syntax scope.
A rewrite of Koha::Acquisition::Order[s] should be considered instead.
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
commit c6e0d42521fa6b62fd0f39d79e7acbbf3639d40a
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Mon Jan 16 13:25:31 2017 +0100
Bug 17962: TT syntax for notices - Prove that ACQ_NOTIF_ON_RECEIV is compatible
To make ACQ_NOTIF_ON_RECEIV TT compatible, we need to expose data from
the aqorders table. We already have a package for it in the Koha
namespace but it is based on Koha::Object[s].
The other path creates dummy Koha::Tmp::Order[s] packages to make it
usable. Of course we should use a valid Koha::Acquisition::Order[s]
based on Koha::Object, but it's outside the scope of this bug report.
This notice template is quite simple, and it's a good one to start.
From C4::Acq::NotifyOrderUsers, GetPreparedLetter is called with 4
elements: the library, the patron to notify, the biblio and the order
information.
Note that prior to this patch aqorders was filled from GetOrder, which
retrieved a lot of information from the acquisition table (aqbasket,
aqbookseller). The idea with the TT syntax is to access the data from
where it really exists. So if a user wants to display the basket name,
[% order.basket.basketname %] should be used instead.
Note that this will not work at the moment, the basket method is not
defined in the order package.
However the basic template should work as before.
The test added to TemplateToolkit proves that.
Test plan:
Use the default ACQ_NOTIF_ON_RECEIV to notify a patron that an order has
been received.
That generated template should be exactly the same as prior to this
patch.
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
-----------------------------------------------------------------------
Summary of changes:
C4/Letters.pm | 6 ++
Koha/{BiblioFramework.pm => Tmp/Order.pm} | 6 +-
Koha/{Cities.pm => Tmp/Orders.pm} | 10 ++--
t/db_dependent/Letters/TemplateToolkit.t | 88 ++++++++++++++++++++++++++++-
4 files changed, 101 insertions(+), 9 deletions(-)
copy Koha/{BiblioFramework.pm => Tmp/Order.pm} (87%)
copy Koha/{Cities.pm => Tmp/Orders.pm} (83%)
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list