[koha-commits] main Koha release repository branch master updated. v3.16.00-922-ga86e69c
Git repo owner
gitmaster at git.koha-community.org
Wed Nov 5 12:31:04 CET 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 a86e69c86bd99e463e6702ee487e18af7a9cb79a (commit)
via fe1461bcd8e60cd056f869b22bcfd7c2ba3c475f (commit)
via 612769c3e73ef834ab24480746ca8da352611245 (commit)
via 6cfe36ee650f35d0e6162bc56a06272425b4d176 (commit)
via dc85139da272689e3aaaa9b4b5a29a6634b6656e (commit)
via 643a9cd0caca6048741fd4d9d7a75343d05e085c (commit)
via 4e896da9cab2daba2cb925fc2a8bf61a70c6ea10 (commit)
via 2f2ff6729ddc7fe630382a376165955503033220 (commit)
via 3e3717a86112b17e2b2e5bb7a0215e46b388a632 (commit)
via 5a5682bd599ea93a7b380f0bc7ec32b893641568 (commit)
via 62aa8aeb92cb5269a03b5c69fe02042f6202c8e2 (commit)
via 7c2ff7940e0b579f6d882abd03c75c4fd191bcb1 (commit)
via 8a26171b903f52fb6c81fa891b8e2abc9d00856a (commit)
via e0d20059e697f886e0f99cb54a5ded35df68d241 (commit)
via 659f7cd097fd563cea8eeb49189c4d99dc8b89cf (commit)
via 3463dd244928e50e2a5e8b90f06dd072d7a93241 (commit)
via 6b2d2abb1945af5fb2f9d5d0d824e08ef3b7865e (commit)
via 3cbf7547023a36166a0dd51d2a778623fc4b6aa0 (commit)
from b3b6f5afd0290b45109ca5b036e9296ced6e5acb (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 a86e69c86bd99e463e6702ee487e18af7a9cb79a
Author: Tomas Cohen Arazi <tomascohen at gmail.com>
Date: Wed Nov 5 08:32:14 2014 -0300
Bug 11425: Update DBIx
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit fe1461bcd8e60cd056f869b22bcfd7c2ba3c475f
Author: Tomas Cohen Arazi <tomascohen at gmail.com>
Date: Tue Nov 4 19:22:07 2014 -0300
Bug 11425: (maniac followup) remove diag from tests
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 612769c3e73ef834ab24480746ca8da352611245
Author: Tomas Cohen Arazi <tomascohen at gmail.com>
Date: Tue Nov 4 19:20:34 2014 -0300
Bug 11425: (followup) fix number of tests
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 6cfe36ee650f35d0e6162bc56a06272425b4d176
Author: Tomas Cohen Arazi <tomascohen at gmail.com>
Date: Tue Nov 4 19:19:02 2014 -0300
Bug 11425: DBRev 3.17.00.046
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit dc85139da272689e3aaaa9b4b5a29a6634b6656e
Author: Owen Leonard <oleonard at myacpl.org>
Date: Wed Oct 29 09:48:39 2014 -0400
Bug 11425 [Template follow-up] Search form for items
This template followup makes several changes to markup and text:
- Replace "Bibliographic reference" with "Title"
- Replace "Callnumber" with "Call number"
- Replace "Home branch" with "Home library"
- Replace "Holding branch" with "Current location"
- Replace "Location" with "Shelving location"
- Replace "Issues" with "Checkouts"
- Replace "Indifferent" with "Ignore"
- Replace "&" with "&" where necessary
- Correct page title and breadcrumbs
- Remove label "for" attribute from labels which do not directly target
a form field
- Correct label "for" attribute on labels which should target a form
field
- Correct date format hint
This patch also makes one change to the way the page display works:
The search results section is now in a separate div which uses a
different grid rule, allowing it to take up the full width of the
screen. To keep the page headers from looking weird I've changed the
markup so that each section has its own header.
To test, perform a variety of searches and confirm that the output in
both Screen and CSV views looks correct.
Confirm that search results which are output to the screen are formatted
nicely and that the "edit search" links work correctly to show the
search form. Submitting a new search after editing a search should hide
the form and redisplay the search results table.
Followed test plan, works as expected.
Signed-off-by: Marc Véron <veron at veron.ch>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Works as described, improves display.
commit 643a9cd0caca6048741fd4d9d7a75343d05e085c
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Fri Oct 24 09:17:15 2014 -0400
Bug 11425 [QA Followup] - Fix number of unit tests
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
commit 4e896da9cab2daba2cb925fc2a8bf61a70c6ea10
Author: Julian Maurice <julian.maurice at biblibre.com>
Date: Wed Jul 23 10:49:01 2014 +0200
Bug 11425: Display location label instead of code
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Minor conflicts solved
Last three patches signed
No koha-qa errors.
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
commit 2f2ff6729ddc7fe630382a376165955503033220
Author: Julian Maurice <julian.maurice at biblibre.com>
Date: Tue May 6 16:34:38 2014 +0200
Bug 11425: QA fixes
- Reword 'joker' to 'wildcard'
- Explain what wildcards do
- Reword 'Modify' to 'Edit'
Also fix jQuery plugin columnFilter path
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
commit 3e3717a86112b17e2b2e5bb7a0215e46b388a632
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date: Wed Apr 16 12:25:23 2014 +0200
Bug 11425: Get column names using DBIX
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
commit 5a5682bd599ea93a7b380f0bc7ec32b893641568
Author: Julian Maurice <julian.maurice at biblibre.com>
Date: Tue Mar 25 11:26:26 2014 +0100
Bug 11425: Add filter on items.notforloan column
and display the 'Processing ...' box when datatables is loading new
data.
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Nice box
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
commit 62aa8aeb92cb5269a03b5c69fe02042f6202c8e2
Author: Julian Maurice <julian.maurice at biblibre.com>
Date: Fri Nov 29 11:34:46 2013 +0100
Bug 11425: Add unit tests
package Koha::Item::Search::Field
function C4::SQLHelper::GetColumns
function C4::Items::SearchItems
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Tests run without error
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
commit 7c2ff7940e0b579f6d882abd03c75c4fd191bcb1
Author: Julian Maurice <julian.maurice at biblibre.com>
Date: Thu Jul 4 16:52:58 2013 +0200
Bug 11425: Add item search form in staff interface
Item search is available at catalogue/itemsearch.pl (link is in
catalogue/search.pl)
It only uses SQL (not Zebra)
* Use DataTables and server-side processing to be able to filter on
individual columns after the first search is done.
* Allow to export results in CSV
* With Javascript disabled, search form still works (and CSV export too)
There is the possibility to define "Custom search fields" in a new admin
page admin/items_search_fields.pl (link is in admin/admin-home.pl)
A custom item search field is defined by:
* a name: its unique identifier
* a label: the text displayed to the user
* a MARC field/subfield: the field/subfield to query (it uses
ExtractValue)
* an authorised values list (optional): if defined the list is displayed
in the search form
New Perl dependency: Template::Plugin::JSON::Escape
Test plan:
1/ Apply the patch and run updatedatabase.pl
2/ Go to advanced search (staff interface), then click on "Go to item
search"
3/ Play with the search form! :)
In the 3rd fieldset you can add as many fields as you want and combine them with
boolean operators (AND, OR). You can use SQL jokers characters (%, _)
You can output to screen (in a DataTables table) or to a CSV file.
4/ In the DataTables table, play with filters and try sorting columns.
5/ Disable Javascript (with Firefox: extensions NoScript or YesScript,
or in about:config 'javascript.enabled' = false
6/ Reload the search page and do some searches on screen output. (there
is no sorting or filtering features, but there is still pagination)
7/ Try again CSV output.
8/ You can re-enable Javascript.
9/ Go to Administration > Items search fields
10/ Add a new field. Example for title (in UNIMARC):
Name: title
Label: Title
MARC field: 200
MARC subfield: a
Authorised values category: None
(add another field with an authorised values category to see the
difference).
11/ As you are there try to update and delete some fields.
12/ Go back to items search form. You can see in the 3rd fieldset that
your fields have appeared in the selects.
13/ Try searching on them.
14/ I think you're done :)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Work as described. Good new option.
No koha-qa errors
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
commit 8a26171b903f52fb6c81fa891b8e2abc9d00856a
Author: Tomas Cohen Arazi <tomascohen at gmail.com>
Date: Tue Nov 4 19:00:54 2014 -0300
Bug 11126: DBRev 3.17.00.045
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit e0d20059e697f886e0f99cb54a5ded35df68d241
Author: Tomas Cohen Arazi <tomascohen at gmail.com>
Date: Tue Nov 4 18:59:42 2014 -0300
Bug 11126: (RM followup) remove diags from tests
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 659f7cd097fd563cea8eeb49189c4d99dc8b89cf
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date: Fri Oct 10 20:53:50 2014 +0200
Bug 11126: qa follow-up
- use Modern::Perl;
- fix a typo
- remove an old comment
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 3463dd244928e50e2a5e8b90f06dd072d7a93241
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Mon Feb 24 11:32:39 2014 -0500
Bug 11126 [QA Followup] - Make reserves returned by _Findgroupreserve sorted by priority
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 6b2d2abb1945af5fb2f9d5d0d824e08ef3b7865e
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Wed Oct 23 11:58:34 2013 -0400
Bug 11126 - Make the holds system optionally give precedence to local holds
This feature will allow libraries to specify that, when an item is returned,
a local hold may be given priority for fulfillment even though it is
of lower priority in the list of unfilled holds.
This feature has three settings:
* LocalHoldsPriority, which enables the feature
* LocalHoldsPriorityPatronControl, which selects for either tha patron's
home library, or the patron's pickup library for the hold
* LocalHoldsPriorityItemControl, which selects for either the item's
holding library, or home library.
So, this feature can "give priority for filling holds to
patrons whose (home library|pickup library) matches the item's
(home library|holding library)"
Test Plan:
1) Apply this patch
2) Run t/db_dependent/Holds/LocalHoldsPriority.t
Signed-off-by: Joel Sasse <jsasse at plumcreeklibrary.net>
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 3cbf7547023a36166a0dd51d2a778623fc4b6aa0
Author: Frédéric Demians <f.demians at tamil.fr>
Date: Sun Nov 2 08:59:30 2014 +0100
Bug 13170 Remove of prog theme broke the OPAC's "view plain" option for MARC details
In the OPAC if you view the MARC details for a title (and have
OPACXSLTDetailsDisplay enabled) there is a "view plain" link which displays the
output of opac-showmarc.pl. This is broken in master: fixed by this patch.
Test plan:
(1) Set OPACXSLTDetailsDisplay to default
(2) Do a search on OPAC, then display a specific biblio record
(3) Click on MARC view tab. Then click on 'view plain' link. Nothing is
displayed.
(4) Apply the patch. And refresh the MARC detail page.
(5) Click on 'view plain' link. Check that a plain text MARC record is
displayed.
Signed-off-by: Chris <chris at bigballofwax.co.nz>
Note: This makes a small change to C4::Templates::themelanguage so that
it works with .xsl files too (They live in the xslt dir)
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Works as described, passes tests and QA script.
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
-----------------------------------------------------------------------
Summary of changes:
C4/Installer/PerlDependencies.pm | 5 +
C4/Items.pm | 207 +++++++++-
C4/Reserves.pm | 47 ++-
C4/Templates.pm | 5 +-
Koha/Item/Search/Field.pm | 111 +++++
Koha/Schema/Result/AuthorisedValue.pm | 19 +-
Koha/Schema/Result/ItemsSearchField.pm | 112 +++++
acqui/check_uniqueness.pl | 2 +-
admin/items_search_field.pl | 63 +++
admin/items_search_fields.pl | 81 ++++
catalogue/itemsearch.pl | 309 ++++++++++++++
installer/data/mysql/kohastructure.sql | 17 +
installer/data/mysql/sysprefs.sql | 3 +
installer/data/mysql/updatedatabase.pl | 31 ++
.../intranet-tmpl/prog/en/css/itemsearchform.css | 44 ++
.../en/includes/admin-items-search-field-form.inc | 58 +++
.../intranet-tmpl/prog/en/includes/admin-menu.inc | 1 +
.../en/includes/catalogue/itemsearch_item.csv.inc | 4 +
.../prog/en/includes/catalogue/itemsearch_item.inc | 23 ++
.../en/includes/catalogue/itemsearch_item.json.inc | 18 +
.../en/includes/catalogue/itemsearch_items.inc | 49 +++
.../prog/en/modules/admin/admin-home.tt | 2 +
.../prog/en/modules/admin/items_search_field.tt | 41 ++
.../prog/en/modules/admin/items_search_fields.tt | 95 +++++
.../en/modules/admin/preferences/circulation.pref | 15 +
.../prog/en/modules/catalogue/advsearch.tt | 1 +
.../prog/en/modules/catalogue/itemsearch.csv.tt | 4 +
.../prog/en/modules/catalogue/itemsearch.json.tt | 12 +
.../prog/en/modules/catalogue/itemsearch.tt | 436 ++++++++++++++++++++
kohaversion.pl | 2 +-
opac/opac-showmarc.pl | 28 +-
t/db_dependent/Holds/LocalHoldsPriority.t | 112 +++++
t/db_dependent/Items.t | 124 +++++-
t/db_dependent/Koha/Item/Search/Field.t | 39 ++
t/db_dependent/SQLHelper.t | 1 +
35 files changed, 2067 insertions(+), 54 deletions(-)
create mode 100644 Koha/Item/Search/Field.pm
create mode 100644 Koha/Schema/Result/ItemsSearchField.pm
create mode 100755 admin/items_search_field.pl
create mode 100755 admin/items_search_fields.pl
create mode 100755 catalogue/itemsearch.pl
create mode 100644 koha-tmpl/intranet-tmpl/prog/en/css/itemsearchform.css
create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/admin-items-search-field-form.inc
create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/catalogue/itemsearch_item.csv.inc
create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/catalogue/itemsearch_item.inc
create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/catalogue/itemsearch_item.json.inc
create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/catalogue/itemsearch_items.inc
create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/admin/items_search_field.tt
create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/admin/items_search_fields.tt
create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/itemsearch.csv.tt
create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/itemsearch.json.tt
create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/itemsearch.tt
create mode 100755 t/db_dependent/Holds/LocalHoldsPriority.t
create mode 100755 t/db_dependent/Koha/Item/Search/Field.t
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list