[koha-commits] main Koha release repository branch master updated. v3.14.00-876-ge453ba2
Git repo owner
gitmaster at git.koha-community.org
Mon Apr 21 06:15:42 CEST 2014
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 e453ba2fa5a8daa65f1ad9b0ec30f577bd17a419 (commit)
via dedf006d02faf7d5299bcec721b4d46f726721b2 (commit)
via 45ce981a2895e58e7ef00f4fb9af4dd16e7a0a21 (commit)
via ad6fe53f0c7fdf1e27f35603da26f51e8c49250b (commit)
via 4d80cc0ec729d40bf8f89242eb2449df763e4d93 (commit)
from daebb78b4e5fdd595e0d16d505c9fa31a8639da8 (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 e453ba2fa5a8daa65f1ad9b0ec30f577bd17a419
Author: Galen Charlton <gmc at esilibrary.com>
Date: Mon Apr 21 04:39:04 2014 +0000
Bug 11027: (follow-up) update unit test to reflect new columns returned by GetLateOrders
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
commit dedf006d02faf7d5299bcec721b4d46f726721b2
Author: Galen Charlton <gmc at esilibrary.com>
Date: Mon Apr 21 04:36:00 2014 +0000
Bug 11027: (follow-up) change label "Branch" to "Library"
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
commit 45ce981a2895e58e7ef00f4fb9af4dd16e7a0a21
Author: Mathieu Saby <mathsabypro at gmail.com>
Date: Sun Feb 2 23:07:16 2014 +0100
Bug 11027: (follow-up) hide link if no basketgroup and use real branch name
This patch is a answer to remarks made by QA:
- if there is no basketgroup for an order, the basketgroup
column in lastorders.pl is now blank (instead of parentheses)
- the name of the branch is used instead of its code in the
branch column
To test: check late orders, included and not included into basketgroup
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
commit ad6fe53f0c7fdf1e27f35603da26f51e8c49250b
Author: Mathieu Saby <mathieu.saby at univ-rennes2.fr>
Date: Sun Dec 22 22:48:34 2013 +0100
Bug 11027: (follow-up) Create link to baskets/basketgroups only if user have required permissions
With this followup, a user without order_manage permission won't be able
to cick on a basket and a user without group_manage permission won't be
able to click on a basketgroup
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
commit 4d80cc0ec729d40bf8f89242eb2449df763e4d93
Author: Mathieu Saby <mathieu.saby at univ-rennes2.fr>
Date: Wed Dec 18 22:09:50 2013 +0100
Bug 11027: Add a column for basketgroups in late orders table and improve other columns
This patch makes 4 changes in late orders page :
- adding a new column for basketgroup, displaying
the name and number of the basketgroup
- displaying the name of the basket as well as its
number, with a hyperlink to this basket
- displaying fund in a separate column to make
sorting easier, and renaming it from "budget" to
"fund" (the confusion can be found elsewhere in Koha...)
- displaying branch in a separate column to make
sorting easier (this column could be improved later,
by getting branch from basketgroup if there is one)
For that, in Aquisition.pm, I made some changes to GetLateOrders:
- 3 new columns in SELECT
- 1 new join
To test :
1. Display the list of late orders of your instance.
2. Check you have 3 new columns for basketgroups, fund and branch
3. In basketgroup column you should have "name of basket group (number)"
4. In basket column you should have "name of basket (number)"
5. Check the links for basketgroups. They should send you to the
page displaying information for each basketgroup
(without possibiliy of editing them if they are closed)
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Patches pass QA script and all tests.
Works as described. Also checked sorting and orders which
are not in a basketgroup display correctly.
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
-----------------------------------------------------------------------
Summary of changes:
C4/Acquisition.pm | 4 +++
.../prog/en/modules/acqui/lateorders.tt | 30 +++++++++++++++-----
t/db_dependent/Acquisition.t | 3 ++
3 files changed, 30 insertions(+), 7 deletions(-)
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list