[koha-commits] main Koha release repository branch 3.14.x updated. v3.14.01-58-g0384057
Git repo owner
gitmaster at git.koha-community.org
Mon Dec 30 10:32:20 CET 2013
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.14.x has been updated
via 038405724a153ead16699f2078073027d364798a (commit)
via 82270196059e55215c2e2fe47f329670de613e41 (commit)
via 9d3795cce51e5b50f1239a57b0cf0fda4b59a6a3 (commit)
via d4b7d7b93402811cca364d33c339d36b9db1d28a (commit)
via 5325b33740086be0320b98f3df76bfc130bbc993 (commit)
via 22b0cc7b1874c18d99daf88f4b0ddb931f0fef0b (commit)
from 49d314fb92893956c57773d2a6677bf345bb1c32 (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 038405724a153ead16699f2078073027d364798a
Author: Galen Charlton <gmc at esilibrary.com>
Date: Fri Dec 20 04:22:20 2013 +0000
Bug 10626: (follow-up) replace use of KohaAuthorisedValues in the Bootstrap theme
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit e334aed702634b8c73aa28c467b585202c7ab117)
Signed-off-by: Fridolin SOMERS <fridolin.somers at biblibre.com>
Conflicts:
koha-tmpl/opac-tmpl/bootstrap/en/includes/item-status.inc
commit 82270196059e55215c2e2fe47f329670de613e41
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date: Sat Sep 7 19:43:57 2013 +0200
Bug 10626: (follow-up) remove final invocation of KohaAuthorisedValues
Removes USE KohaAuthorisedValues plugin from
item-status-schema-org.inc as it does not seem to be used
in the file.
Couldn't detect regressions removing it on OPAC detail page.
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit 0c19c582187f59eda19b2b97865d0d5a3b13a8dd)
Signed-off-by: Fridolin SOMERS <fridolin.somers at biblibre.com>
commit 9d3795cce51e5b50f1239a57b0cf0fda4b59a6a3
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Tue Aug 27 13:12:11 2013 -0400
Bug 10626: (follow-up) replace an instance of KohaAuthorisedValues
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Trying to write my own test plan here:
1) AllowNotForLoanOverride = Allow
Mark single item not for loan and try to check it out.
Check item not for loan status shows up correctly in message:
Item is normally not for loan (Staff Collection). Check out anyway?
2) Toggle AllowNotForLoanOverride = Not Allow
Try to check out your not for loan item again.
Message has changed, but not for loan status should still show:
Item not for loan (Staff Collection).
3) Check out item that is marked damaged.
Check damaged status shows correctly in list of checkouts.
4) Mark item as lost and check it out.
Check lost status shows up correctly in message:
This item has been lost with a status of "Lange überfällig (Verloren)".
5) Create your own custom SUGGEST_STATUS and check that it shows
up correctly on the suggestion page.
6) Test item status show up correctly on OPAC detail page (lost, not
for loan, damaged, etc). Requires follow-up patch to be applied.
7) Mark a suggestion with your custom status and make sure it shows
up in the patron account in OPAC correctly.
Passes tests and QA script - needs a follow up for item-status-schema-org.inc.
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit 0958ec11ce00a6274e8257ddb5cd2f2539b9069a)
Signed-off-by: Fridolin SOMERS <fridolin.somers at biblibre.com>
commit d4b7d7b93402811cca364d33c339d36b9db1d28a
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Thu Dec 19 12:13:23 2013 -0500
Bug 10626: Remove doubled up TT plugins - Merge KohaAuthorisedValues and AuthorisedValues
This patch removes the KohaAuthorisedValues TT plugin; uses of it are
replaced by the AuthorisedValues plugin, which does the same thing.
Test Plan:
1) Apply this patch
2) View the pages that this patch has modified, make sure the branch
name is still visible
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Comments on second patch.
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit b5b3d4c403f3df91578a3d49ed15811cd1386e52)
Signed-off-by: Fridolin SOMERS <fridolin.somers at biblibre.com>
commit 5325b33740086be0320b98f3df76bfc130bbc993
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Tue Aug 27 13:14:12 2013 -0400
Bug 10626: (follow-up) replace another use of KohaBranchName
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
To test:
Make sure
- independentbranches is turned on
- Your user doesn't have superlibrarian permission
Then
- Try to check out an item with home and holding branch !=
logged in branch
Patch works alright.
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit 4a7bb58b1daf5edc47581f17b3dfef1e7beac601)
Signed-off-by: Fridolin SOMERS <fridolin.somers at biblibre.com>
commit 22b0cc7b1874c18d99daf88f4b0ddb931f0fef0b
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Tue Jul 23 09:52:08 2013 -0400
Bug 10626 - Remove doubled up TT plugins - Merge KohaBranchName and Branches
Looking at the TT plugin directory I notice we have some plugins that
seem to do the same thing:
KohaBranchName.pm
Branches.pm
This patch drops KohaBranchName in favor of Branches
Test Plan:
1) Apply this patch
2) View a basket group, note the branch name is displayed
3) View a subscription's details, note the branch name is displayed
4) View suggestions, note the branch names are displayed
5) Return an item that needs transfered, note the branch name is displayed
6) Run 'prove t/db_dependent/Koha_template_plugin_Branches.t'
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Passes all tests and QA script.
Also tested with a branch name with umlauts.
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit 6000bfdf87db3f7f43feb21efd3cac8b7de9c048)
Signed-off-by: Fridolin SOMERS <fridolin.somers at biblibre.com>
-----------------------------------------------------------------------
Summary of changes:
Koha/Template/Plugin/AuthorisedValues.pm | 12 +++++
Koha/Template/Plugin/Branches.pm | 2 +-
Koha/Template/Plugin/KohaAuthorisedValues.pm | 50 --------------------
Koha/Template/Plugin/KohaBranchName.pm | 33 -------------
.../prog/en/modules/acqui/basketgroup.tt | 10 ++--
.../prog/en/modules/circ/circulation.tt | 22 ++++-----
.../intranet-tmpl/prog/en/modules/circ/returns.tt | 4 +-
.../prog/en/modules/circ/view_holdsqueue.tt | 4 +-
.../prog/en/modules/serials/subscription-detail.tt | 4 +-
.../prog/en/modules/suggestion/suggestion.tt | 24 +++++-----
.../en/includes/item-status-schema-org.inc | 2 -
.../bootstrap/en/includes/item-status.inc | 6 +--
.../bootstrap/en/modules/opac-suggestions.tt | 2 +-
.../prog/en/includes/item-status-schema-org.inc | 2 -
.../opac-tmpl/prog/en/includes/item-status.inc | 6 +--
.../opac-tmpl/prog/en/modules/opac-suggestions.tt | 4 +-
...ranchName.t => Koha_template_plugin_Branches.t} | 12 ++---
17 files changed, 62 insertions(+), 137 deletions(-)
delete mode 100644 Koha/Template/Plugin/KohaAuthorisedValues.pm
delete mode 100644 Koha/Template/Plugin/KohaBranchName.pm
rename t/db_dependent/{Koha_template_plugin_KohaBranchName.t => Koha_template_plugin_Branches.t} (78%)
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list