[koha-commits] main Koha release repository branch master updated. v3.20.00-849-g17b3e3c
Git repo owner
gitmaster at git.koha-community.org
Thu Oct 22 17:00:21 CEST 2015
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 17b3e3c9ebb4ce437a56cee817ee1781ebfce697 (commit)
via 986cbaf830923ce75d396e1a2d87ae8f029f4be9 (commit)
via bc629dcd2aba8fdad5d8d6d883bf6713a455ff91 (commit)
via 3d7600f97659ba3fda31dfff2656433e6b20c0ef (commit)
via 09fe7ed351415f98edbe693d19ff1f35a5f29361 (commit)
via a32f9b922d99694ffe92c45834f999b559b6968c (commit)
via 396275be35c5c2a733260ccf2f8264f7977c9668 (commit)
via 96b05f3535425de2973ad7b4c03deeb8a74ef7ef (commit)
via 30edfbfa58c08898242324a2dcfea91a2ab20826 (commit)
from 55127d50fb0a00f70d5de06dee76ddfad54bd094 (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 17b3e3c9ebb4ce437a56cee817ee1781ebfce697
Author: Marc Véron <veron at veron.ch>
Date: Tue Oct 20 17:03:16 2015 +0200
Bug 15039: Move top language menu to include and streamline logic
The language menu in koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc is used at other places as well (see Bug 14776).
This patch moves it to a file masthead-langmenu.inc to make it re-usable.
Additionally it streamlines the logic (not all combinations of Opac sysprefs that should display the menu did so).
To test:
- Apply patch
- Verify, that the language menu displays / does not display with combinations of:
- opaclanguagedisplay (Allow)
- opaclanguages ( > 1 language selected)
- OpacLangSelectorMode (top or both)
- Verify that sysprefs opacuserlogin and EnableOpacSearchHistory do not interfere
with the lenguage menu (before, at least one of them had to be on to display the menu)
- Verify that language switching works as before.
Signed-off-by: Chris Kirby <christopherlawrencekirby at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
commit 986cbaf830923ce75d396e1a2d87ae8f029f4be9
Author: Julian Maurice <julian.maurice at biblibre.com>
Date: Thu Oct 1 15:13:20 2015 +0200
Bug 11139: Add support for multiple values in AdvancedSearchTypes
AdvancedSearchTypes syspref can be multivalued, opac-topissues.pl
have to support that.
AdvancedSearchTypes can have one or more of the following values:
'itemtypes', 'ccode', 'loc'. But this patch adds support only for
itemtypes and ccode. AdvancedSearchTypes can still contain 'loc' but it
will change nothing to the behaviour of opac-topissues.pl.
This patch also removes duplicate code in template (the "Refine your
search" form was written in two different places)
This introduces a small behaviour change: when there is no results,
instead of having the form in the center of the page, it remains in the
left sidebar and we have a "No results" message in the main area.
Depends on bug 14788
Tested on top of 14788. Works as expected.
Signed-off-by: Marc Véron <veron at veron.ch>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
commit bc629dcd2aba8fdad5d8d6d883bf6713a455ff91
Author: Julian Maurice <julian.maurice at biblibre.com>
Date: Mon Oct 5 11:02:35 2015 +0200
Bug 14788: Add unit tests for GetTopIssues
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
commit 3d7600f97659ba3fda31dfff2656433e6b20c0ef
Author: Julian Maurice <julian.maurice at biblibre.com>
Date: Fri Sep 4 16:19:28 2015 +0200
Bug 14788: Move opac-topissues.pl code into C4::Circulation
Tested with syspref 'AdvancedSearchTypes' set to itemtypes an ccode (one at a time).
No problems found.
Signed-off-by: Marc Véron <veron at veron.ch>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
commit 09fe7ed351415f98edbe693d19ff1f35a5f29361
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Thu Oct 22 11:11:49 2015 -0300
Bug 10937: (RM followup) DBIx update
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
commit a32f9b922d99694ffe92c45834f999b559b6968c
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Thu Oct 22 11:05:45 2015 -0300
Bug 10937: DBRev 3.21.00.040
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
commit 396275be35c5c2a733260ccf2f8264f7977c9668
Author: Blou <philippe.blouin at inlibro.com>
Date: Fri Aug 21 09:01:47 2015 -0400
Bug 10937: Fix Seach Type in Advanced Search
In order to see the checkboxes of the Collection and Shelving location of the advanced search, the if changed so that only the Itemtypes will go through the previous if
commit 96b05f3535425de2973ad7b4c03deeb8a74ef7ef
Author: Blou <philippe.blouin at inlibro.com>
Date: Thu Jul 9 09:22:20 2015 -0400
Bug 10937: cleanup and rename DOCTYPECAT to ITEMTYPECAT
- "Item" and not "Document" is the word used throughout Koha.
- Moved the updates to an atomic update
- changed searchcategory from varchar(20) to (80)
- cleanup
commit 30edfbfa58c08898242324a2dcfea91a2ab20826
Author: ahmed <ahmed at inlibro.com>
Date: Wed Jan 21 14:33:47 2015 -0500
Bug 10937: Option to hide and group itemtypes from advanced search
This allows to group certain item types in a category, to be displayed (and searched) as such in OPAC's advanced search. For example, you can group Reserve 2h and Reserve 12h into a Reserve category. The 2 and 12h types won't appear anymore.
This also allows to simply prevent an item type from displaying as a search option.
TEST PLAN
------------------
0) Back up database, so you can reset and retest easily. ;)
1) Apply the patch
2) Run Koha QA tool.
3) prove -v t/db_dependent/Koha.t
-- all tests should pass.
4) run ./installer/data/mysql/updatedatabase.pl to add the
two columns to itemtypes
-- Does a meaningful message get printed?
Are the columns added?
"DESCRIBE itemtypes;" should list hideinopac and searchcategory.
5) You need to add a category to group your item types:
a) In Intranet/Koha Admin/Authorized values,
select DOCTYPECAT in the 'Show category:' dropdown
i) If you do not have a DOCTYPECAT category, create one.
b) Click button "New authorized value for DOCTYPECAT"
c) Enter
Authorized value: HARDWARE
Description : Hardware
Description (OPAC): Hardware
6) Group your items under that new category
a) In Intranet/Koha Admin/Item types, choose (at least)
two item types and for each:
- Click action/Edit on the right column
- Third row (below Description) is the Search category list box, select Hardware
- click Save changes at the bottom
7) Select at least one item to be hidden in the OPAC search
a) In Intranet/Koha Admin/Item types (again), choose a different item type:
- Click action/Edit
- Click the checkbox "Hide in OPAC" below the list of icons.
8) Go test your modifications
a) Go to OPAC/Adv search.
b) Validate that all items modified above (hidden or grouped) do not appear in Item type list
c) Validate that new item type Hardware does appear instead.
d) Select item Hardware, start Search.
) Validate returned items are the of the two types that were grouped into the Hardware category in step 4.
Sponsored-by: Vanier college
Signed-off-by: Nick <nick at quecheelibrary.org>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
-----------------------------------------------------------------------
Summary of changes:
C4/Circulation.pm | 61 +++++++++
C4/Koha.pm | 58 ++++++++-
Koha.pm | 2 +-
Koha/Schema/Result/Itemtype.pm | 20 ++-
Koha/Template/Plugin/ItemTypes.pm | 6 +
admin/authorised_values.pl | 2 +-
admin/itemtypes.pl | 14 ++-
installer/data/mysql/kohastructure.sql | 2 +
installer/data/mysql/updatedatabase.pl | 14 +++
.../prog/en/modules/admin/itemtypes.tt | 32 +++++
.../bootstrap/en/includes/masthead-langmenu.inc | 35 ++++++
.../opac-tmpl/bootstrap/en/includes/masthead.inc | 41 +-----
.../bootstrap/en/includes/opac-topissues.inc | 49 +++++---
.../bootstrap/en/modules/opac-advsearch.tt | 20 ++-
.../bootstrap/en/modules/opac-topissues.tt | 130 +++++---------------
opac/opac-search.pl | 25 +++-
opac/opac-topissues.pl | 122 ++++--------------
t/db_dependent/Circulation/GetTopIssues.t | 111 +++++++++++++++++
t/db_dependent/Koha.t | 45 ++++++-
19 files changed, 527 insertions(+), 262 deletions(-)
create mode 100644 koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead-langmenu.inc
create mode 100644 t/db_dependent/Circulation/GetTopIssues.t
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list