[koha-commits] main Koha release repository branch 3.22.x updated. v3.22.06-68-g1b9c688
Git repo owner
gitmaster at git.koha-community.org
Mon May 16 13:51:12 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, 3.22.x has been updated
via 1b9c688d935ca2825dac2812ef32decf6d30492a (commit)
via 59c27740bd0c87f59746cc235d0c18b7c47ee932 (commit)
via 5685fb44e662f33ecb1b552eb321ead31dde9e06 (commit)
via 76aba15a35aa49895ea389cbad607135f9632eca (commit)
from 1ccf956b536fcbc5c67530e9edbe9d0de4773af4 (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 1b9c688d935ca2825dac2812ef32decf6d30492a
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Mon Apr 18 10:37:18 2016 +0100
Bug 15009: QA follow-up
This patch adds a test to check the unicity of auth cats, simplify
the GetBudgetAuthCats subroutine and make it return an arrayref of scalar
instead of an arrayref of hashref with only 1 key.
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit 9c5b8191009eba54e851512c9cfa2e3d5ab949df)
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
commit 59c27740bd0c87f59746cc235d0c18b7c47ee932
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Mon Apr 18 10:36:51 2016 +0100
Bug 15009: Correctly populate planning filter
The filter for planning values was populated with empty strings.
Note that it's not caused by previous patches.
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit 5e8ded21af689f43f9791f19772a478fb3c67afe)
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
commit 5685fb44e662f33ecb1b552eb321ead31dde9e06
Author: charles <charles.farmer at inlibro.com>
Date: Fri Mar 25 17:09:24 2016 -0400
Bug 15009 - Adds unit tests for C4::Budget::GetBudgetAuthCats
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>
(cherry picked from commit 1a9ca842939ba48789dd11bfa5b9510e73bad645)
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
commit 76aba15a35aa49895ea389cbad607135f9632eca
Author: Blou <philippe.blouin at inlibro.com>
Date: Tue Oct 13 16:12:49 2015 -0400
Bug 15009 - Planning dropdown button in aqbudget can have empty line
When displaying a budget, the Planning button in the admin toolbar displays
Plan by months
Plan by libraries
Plan by item types
Plan by
The last one is empty, due to C4::Budgets::GetBudgetAuthCats returning an empty field if the budget has no sort defined.
This prevents returning an array with empty element(s)
TEST:
1) Admin -> Budgets
2) Select a budget
a) you must have '' (empty) in your aqbudgets.sort1_authcat field.
b) edit the budget (direct DB or interface) to get that.
3) Click on Planning dropdown, see the "Plan by <nothing> " entry.
4) apply the patch, revalidate.
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
No more empty option
No errors
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit b8076d8ec7236360274e1a4e861969c86bb679ea)
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
-----------------------------------------------------------------------
Summary of changes:
C4/Budgets.pm | 19 +++---
admin/aqplan.pl | 2 +-
.../prog/en/includes/budgets-admin-toolbar.inc | 4 +-
.../intranet-tmpl/prog/en/modules/admin/aqplan.tt | 1 +
t/db_dependent/Budgets.t | 69 +++++++++++++++++++-
5 files changed, 83 insertions(+), 12 deletions(-)
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list