Magnus Enger [Tue, 5 Mar 2013 15:51:51 +0000 (16:51 +0100)]
Bug 9256 - Fix search for the packages
See the bug for a description of the problem.
This patch tries to restore searching for marcflavour != MARC21 as well as
allowing instances with different marcflavors to co-exist on the same server.
To test:
- Do a package install with e.g. the official squeeze-dev packages and create at
least two instances, with different marcflavours, e.g.:
sudo koha-create --create-db --marcflavor marc21 test1
sudo koha-create --create-db --marcflavor normarc test2
- Run through the web installers for both instances and add a couple of
records to each. Wait for the records to be indexed or run indexing manually
with
sudo koha-rebuild-zebra -f test1
sudo koha-rebuild-zebra -f test2
- Try searching for the records you added. It should work in test1 but not in
test2.
- Apply the patch and build packages with the build-git-snapshot script
- Install the new koha-common package
- Create two instances (because of Bug 9754 it is probably best to give the
instances different names than the ones you created above, or to do this on
a fresh VM or similar) and add records, as described above. Searching should
now work equally well for both instances.
Please note: Because of Bug 9752 you will have to set marcflavour = NORMARC
by hand before you do the searching, if you choose NORMARC as the marc flavour
on one of the instances you create.
Please note too: I am not confident that this is the perfect solution, so
merciless and thorough testing is necessary! ;-)
Signed-off-by: Mirko Tietgen <mirko@abunchofthings.net>
Works for me for GRS-1 (package installation out of the box). Could not figure out how to set up DOM indexing and eventually stopped caring about it.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Build packages with the patch and checked that creating
instances and search within them works for both MARC21 and NORMARC.
All tests and QA script pass.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Jared Camins-Esakov [Tue, 19 Mar 2013 23:30:54 +0000 (19:30 -0400)]
Merge branch 'bug_9843' into 3.12-master
Jared Camins-Esakov [Tue, 19 Mar 2013 12:14:20 +0000 (08:14 -0400)]
Bug 9843: Include OpenILS directory in Perl lib directory
When installing from the tarball, the OpenILS/QueryParser.pm file seems
to be missed because it is not included in Makefile.PL... sometimes.
To test:
1) Run Makefile.PL and make.
2) Look in blib/PERL_MODULE_DIR/ and check if the OpenILS directory is
there.
3) Apply patch.
4) Rerun Makefile.PL and make.
5) Confirm that OpenILS directory is now in blib/PERL_MODULE_DIR/
regardless of whether or not it was there during step (2).
6) Sign off.
Note: Confirmed that OpenILS directory is correctly installed in the lib dir,
in 'standard' install mode, and also 'single'.
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Simple fix for a big problem.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Jared Camins-Esakov [Tue, 19 Mar 2013 12:46:38 +0000 (08:46 -0400)]
Merge branch 'bug_8979' into 3.12-master
Liz Rea [Mon, 25 Feb 2013 01:46:55 +0000 (14:46 +1300)]
Bug 8979 - simple addition of news to CCSR theme
Nothing fancy, just displays the news in the mobile view.
To test:
enable CCSR theme
ensure you have a news item that will be displayed on the home page
browse to your test site with a mobile phone - news item should be displayed (without the patch it will not be displayed)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Comment: Works as described. No errors.
Note: Perhaps 'Persona' login could be hidden in movile view.
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Jared Camins-Esakov [Tue, 19 Mar 2013 12:19:42 +0000 (08:19 -0400)]
Merge branch 'bug_9832' into 3.12-master
Jared Camins-Esakov [Sun, 17 Mar 2013 19:44:56 +0000 (15:44 -0400)]
Bug 9832: avert software error with QP enabled and misconfigured
QueryParser requires a configuration file. If koha-conf.xml does not
point to that configuration file, you will get a software error when
you try to search with QueryParser enabled. Until this patch.
To test:
1) Comment out the <queryparser_config> line in your koha-conf.xml
2) Turn on UseQueryParser
3) Do a search, watch it explode
4) Apply patch
5) Do search again, watch it work
6) Sign off on patch
Signed-off-by: Mirko Tietgen <mirko@abunchofthings.net>
Works as expected, nothing explodes anymore
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Jared Camins-Esakov [Mon, 18 Mar 2013 14:05:09 +0000 (10:05 -0400)]
Revert "Merge branch 'bug_9025' into 3.12-master"
This reverts commit
081e1ba4c31151db8a3c52a8daa96931a5ac544f, reversing
changes made to
7e25faace8d70c2e81272cb3eacd41fa7215719d.
Jared Camins-Esakov [Sun, 17 Mar 2013 13:30:26 +0000 (09:30 -0400)]
Increment version for 3.12-alpha release
Jared Camins-Esakov [Sun, 17 Mar 2013 13:29:02 +0000 (09:29 -0400)]
Add release notes for 3.12-alpha
Jared Camins-Esakov [Sun, 17 Mar 2013 13:22:13 +0000 (09:22 -0400)]
Correct order of updatedatabase entries
Jared Camins-Esakov [Sun, 17 Mar 2013 01:48:24 +0000 (21:48 -0400)]
Merge branch 'bug_4906' into 3.12-master
Jared Camins-Esakov [Sun, 17 Mar 2013 01:47:31 +0000 (21:47 -0400)]
Bug 4906: Increment version number
Database update for bug 4906 has been given version 3.11.00.030
Kyle M Hall [Thu, 9 Aug 2012 14:53:46 +0000 (10:53 -0400)]
Bug 4906: Allow fine calculation to exclude grace period
This patch adds the system preference FinesIncludeGracePeriod which
allows the library the choice to include the grace period when calculating
a fine ( Koha's current behavior ) or to ignore the grace period for
the purposes of fines calculation. It is set by default to preserve the
current behavior.
Signed-off-by: Srikanth Dhondi <srikanth@catalyst.net.nz>
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Rebased March 8, 2013. Included renaming pref.
Works as advertised. Renamed the bug title and opened a new report for the
original bug.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Jared Camins-Esakov [Sun, 17 Mar 2013 01:38:47 +0000 (21:38 -0400)]
Merge branch 'bug_9239' into 3.12-master
Jared Camins-Esakov [Sun, 17 Mar 2013 01:38:36 +0000 (21:38 -0400)]
Bug 9239: Increment version number
Database update for bug 9239 has been given version 3.11.00.029
Jared Camins-Esakov [Sun, 17 Mar 2013 01:34:01 +0000 (21:34 -0400)]
Bug 9239: Disable QP by default
Jared Camins-Esakov [Thu, 14 Mar 2013 18:02:26 +0000 (14:02 -0400)]
Bug 9239 QA follow-up: fix overeager quote escaping
The quote escaping added two follow-ups ago was a little too eager,
and escaped perfectly valid quotes in some instances. This patch moves
the escaping deeper into the loop so that no needed quotes will be
escaped.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Test plan included here, as this is the last patch in the series:
All tests pass.
OPAC
Simple search
- Keyword searches using boolean operators || and && - OK
- Pubdate searches using pubdate() - OK
- Using different search options: keyword, title, etc. - OK
Facets
- limit to available from a query parser simple search - OK
- Other facets - OK
Advanced search
- Date range search - OK
- Itemtype limits - OK
- Language limit - OK
- Combining various serach options with and without 'more' options
and using boolean operators - OK
Authorities
- Searching for partial and complete names like "M", "Benedictus" works. - OK
- Biblio count isc correct - OK
- Links to linked biblios work. - OK.
INTRANET
Staged MARC import
- Import records using various matching points - OK
Serials
- Search for a serial in subscription form - OK
Acquisitions
- Search for existing record from basket - OK
Authorities
- Running the linker script with QP on works. - OK
- Searching for authorities works. - OK
- Biblio count isc correct - OK
- Links to linked biblios work. - OK.
NOTE: As agreed with Jared in chat, query parser should be
off by default for the next release.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Jared Camins-Esakov [Thu, 14 Mar 2013 16:14:16 +0000 (12:14 -0400)]
Bug 9239 QA follow-up: amend error handling
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Jared Camins-Esakov [Thu, 14 Mar 2013 14:50:41 +0000 (10:50 -0400)]
Bug 9239 QA follow-up: escape quotes in searches
This patch escapes quotes in searches for those rare instances where
there is a literal quote inside a search term.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Jared Camins-Esakov [Thu, 14 Mar 2013 12:43:13 +0000 (08:43 -0400)]
Bug 9239 QA follow-up: better error handling
* Fix a long-standing bug in the linker that could crash the linker when
run against odd data.
* Sanitize input to SimpleSearch.
* Correctly handle CCL indexes with QP.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Jared Camins-Esakov [Thu, 14 Mar 2013 14:11:16 +0000 (10:11 -0400)]
Bug 9239 QA follow-up: remove stray debug code
Remove a line of debug code from EG, provide better error handling
when presented with weird data in the authority linker, and correct
queryparser configuration to reflect the correct configuration for
Zebra.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Jared Camins-Esakov [Mon, 11 Mar 2013 22:35:39 +0000 (18:35 -0400)]
Bug 9239 QA follow-up: don't fall back to kw if field is specified
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Jared Camins-Esakov [Sun, 10 Mar 2013 13:17:21 +0000 (09:17 -0400)]
Bug 9239 QA follow-up: the last QA follow-up was missing a require
This patch also corrects the definition of the an= index, which was
missing exactness.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Jared Camins-Esakov [Sat, 9 Mar 2013 14:59:51 +0000 (09:59 -0500)]
Bug 9239 QA follow-up: escape CGI input
Koha was not previously escaping CGI input, which caused problems for
highlighting and is a security issue.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Thx for fixing this.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Jared Camins-Esakov [Thu, 7 Mar 2013 11:50:10 +0000 (06:50 -0500)]
Bug 9239 QA-follow-up: quiet warnings and fix problem with limits
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Jared Camins-Esakov [Mon, 4 Mar 2013 17:55:12 +0000 (12:55 -0500)]
Bug 9239 QA follow-up: fix highlighting and merge error
QP searches with && broke search highlighting on the OPAC details page.
This patch corrects encoding of the query_desc parameter that is passed
to the details page.
My last attempt at rebasing also transposed the variable for index
names with the variable for operators, meaning that the dropdown in
the basic search did not work.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Fixes some problems raised during QA successfully.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Jared Camins-Esakov [Wed, 6 Feb 2013 19:03:03 +0000 (14:03 -0500)]
Bug 9239 follow-up: update koha-conf.xml
The previous patches were missing the koha-conf.xml updates. This patch
updates koha-conf.xml and makes the changes neccessary to include the
QueryParser configuration file in the packages.
To test:
1) Run Makefile and check generated koha-conf.xml to confirm that the
line <queryparser_config>...</queryparser_config> is there with an
absolute path.
2) That was it.
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Tested update successfully - new line now shows up and
query parser is used.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Jared Camins-Esakov [Fri, 25 Jan 2013 12:45:22 +0000 (07:45 -0500)]
Bug 9239 follow-up: POD and perlcritic fixes
There were several perlcritic violations for returning explicit undef,
and splitting up the various driver classes resulted in POD compliance
errors, where the POD was starting with head2 rather than head1. This
patch fixes those errors (but has no functional impact).
Signed-off-by: Elliott Davis <elliott@bywatersolions.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Jared Camins-Esakov [Tue, 11 Dec 2012 17:52:40 +0000 (12:52 -0500)]
Bug 9239: Allow the use of QueryParser for all queries
With the inclusion of this patch, all searches will (try) to use
QueryParser for handling queries for both the bibliographic and authority
databases if UseQueryParser is enabled. If QueryParser is unavailable,
UseQueryParser is disabled, or the search uses CCL indexes, the old
search code will be used.
To test:
1) Apply patch.
2) Run the unit test with `prove t/QueryParser.t`
3) Enable the UseQueryParser syspref.
4) Try searches that should return results in the following places:
* OPAC (simple search)
* OPAC (advanced search)
* OPAC (authorities)
* Staff client (header search)
* Staff client (advanced search)
* Staff client (cataloging search)
* Staff client (authorities)
* Staff client (importing a batch using a match point)
* Staff client (searching for an item for adding to a label)
* Staff client (acquisitions)
* Staff client (searching for a record to create a serial)
* ANYWHERE ELSE I HAVE FORGOTTEN
5) Disable the UseQueryParser syspref. Repeat at least some of the
searches you did above.
6) If all searches worked, sign off.
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Elliott Davis <elliott@bywatersolions.com>
Searching still works as expected for variuos places.
QueryParser syspref seemed to be enabled by default
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Jared Camins-Esakov [Tue, 11 Dec 2012 17:16:20 +0000 (12:16 -0500)]
Bug 9239: Add syspref to enable QueryParser
In light of the experimental nature of the QueryParser code at this
juncture, it behooves Koha to have the option of disabling QP, at least
for the purpose of comparing results between QP-enabled and QP-disabled
searches. This patch adds a UseQueryParser syspref to do just that. In
cases where the user enables QP without having QP installed, however,
there will be no dramatic failure, and Koha will simply fall back to
using the non-QP search code.
In order to reduce the overhead added by the introduction of QueryParser,
this patch adds a C4::Context->queryparser accessor to a static
QueryParser object which is initialized the first time it is required
and then reset thereafter.
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Elliott Davis <elliott@bywatersolions.com>
Fixed merge conflict in sysprefs.sql and updatedatabase.sql
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Fixed merge conflict in sysprefs.sql und updatedatabase.pl
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Jared Camins-Esakov [Tue, 2 Oct 2012 21:06:47 +0000 (17:06 -0400)]
Bug 9239: Introduce QueryParser driver for PQF
Since the most expressive query language supported by Zebra is PQF, this
patch adds a PQF driver for QueryParser which will translate QueryParser
queries into standard PQF (guided by mappings which have been written to
match Koha's existing Zebra configuration) which can then be sent to
Zebra. This driver, Koha::QueryParser::Driver::PQF(::*) extends the
OpenILS::QueryParser(::*) class(es), so as to preserve maximum
interoperability between the various users of the QueryParser driver.
Initially, search syntax is as follows:
* AND operator: &&
* OR operator: ||
* GROUPING operators: ( )
Fields can mostly be searched using the ccl prefixes they have now. The
exception is the various date limits which are searched with a syntax
like this: pubdate(2008)
For sorting, you can simply add #title-sort-az (etc.) to your query.
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Elliott Davis <elliott@bywatersolions.com>
Test Passed successfully after installing missing dep for Test::Deep
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Jared Camins-Esakov [Tue, 11 Dec 2012 20:54:48 +0000 (15:54 -0500)]
Bug 9239: Add QueryParser module to Koha
Although the OpenILS::QueryParser class is going to be moved into a
separate CPAN distribution, this hasn't been done yet, and for ease of
testing it makes sense to include the class in Koha for the moment.
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Elliott Davis <elliott@bywatersolions.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Jared Camins-Esakov [Sat, 16 Mar 2013 15:50:09 +0000 (11:50 -0400)]
Merge branch 'bug_9367' into 3.12-master
Marcel de Rooy [Mon, 11 Mar 2013 11:13:29 +0000 (12:13 +0100)]
Bug 9367: Followup finalizing QA
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Keeping fetchrow close to its execute worked even better in GetReserveStatus.
Instead of returning undef, I return empty string.
I checked all calls; this value is mostly not checked for undef.
So we eliminate a lot of warnings in log.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Jonathan Druart [Mon, 11 Mar 2013 10:33:05 +0000 (11:33 +0100)]
Bug 9367: Followup: Code optimization: CheckReserves is too often called
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Jonathan Druart [Tue, 8 Jan 2013 14:33:58 +0000 (15:33 +0100)]
Bug 9367: Code optimization: CheckReserves is too often called
This patch rewrites the GetReserveStatus routine in order to take in
parameter the itemnumber and/or the biblionumber.
In some places, the C4::Reserves::CheckReserves routine is called when
we just want to get the status of the reserve. In these cases, the
C4::Reserves::GetReserveStatus is now called.
This routine executes 1 sql query (or 2 max).
Test plan:
Check that there is no regression on the different pages where reserves
are used. The different status will be the same than before applying
this patch.
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Jared Camins-Esakov [Fri, 15 Mar 2013 23:24:34 +0000 (19:24 -0400)]
Merge branch 'bug_9436' into 3.12-master
Owen Leonard [Sun, 20 Jan 2013 00:53:50 +0000 (19:53 -0500)]
Bug 9436 [Revised] Use DataTables on cities administration page
Replace the tablesorter plugin with the DataTables plugin on the
cities administration page.
To test, open the cities administration page (Administration
-> Cities and towns). Confirm that table sorting works correctly.
Revision corrects template path to datatables assets.
Further revision corrects conflict with Bug 9630
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Comment: Sorting works. No errors.
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Amended patch: Add the aLengthMenu key for DataTables + delete an unused
div block (used for pager)
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Jared Camins-Esakov [Fri, 15 Mar 2013 23:23:31 +0000 (19:23 -0400)]
Merge branch 'bug_9466' into 3.12-master
Owen Leonard [Wed, 23 Jan 2013 19:09:13 +0000 (14:09 -0500)]
Bug 9466 [Revised] Use DataTables on saved reports page
Replace the tablesorter plugin with the DataTables plugin on the
saved reports page.
To test, open the saved reports page (Reports > Use saved).
Confirm that table sorting works correctly.
Revision makes default result count (20) match options for number of
pagination entries (10,20,50,100,all).
Further revision corrects template path to datatables assets.
Further revision fixes JavaScript error as reported by QA
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Jared Camins-Esakov [Fri, 15 Mar 2013 23:21:55 +0000 (19:21 -0400)]
Merge branch 'bug_9690' into 3.12-master
Owen Leonard [Fri, 22 Feb 2013 17:36:50 +0000 (12:36 -0500)]
Bug 9690 - Replace YUI buttons on the catalog search results page with Bootstrap
"Save," "Place hold," and "Z39.50 search" buttons on the catalog search
results page are generated by YUI.
This patch removes YUI styling from the "Save" button and uses Bootstrap
to apply styling to the "Place hold" and "Z39.50 search" button.
The "search to hold" split button menu is converted to Bootstrap as well.
The "Save" button's appearance is inconsistent with the Bootstrap ones,
but right now we don't have a good method for overriding the default
submit button CSS with Bootstrap button styling. I hope this can be
dealt with in a more global way in a subsequent patch.
To test, search the catalog in the staff client. Confirm that the
"Save," "Place hold," and "Z39.50 search" buttons look correct and work
correctly. Also select a patron and "search to hold," confirming the
functionality of all the opitions added to the "Place hold" button menu.
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Comment: All buttons works ok, nice looking. No errors.
On button 'Place hold', all opitions works :)
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works nicely, no problems found. Noticed that buttons here
are smaller than in other places, but this has been so before.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Jared Camins-Esakov [Fri, 15 Mar 2013 23:20:04 +0000 (19:20 -0400)]
Merge branch 'bug_9765' into 3.12-master
Owen Leonard [Thu, 7 Mar 2013 19:37:29 +0000 (14:37 -0500)]
Bug 9765 - Remove unused include file: budgetperiods-admin.inc
budgetperiods-admin.inc doesn't appear to be used anywhere in Koha. This
patch removes it.
To test, confirm that a search for references to budgetperiods-admin.inc
returns no results.
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Jared Camins-Esakov [Fri, 15 Mar 2013 23:11:54 +0000 (19:11 -0400)]
Merge branch 'bug_9756' into 3.12-master
Jared Camins-Esakov [Fri, 15 Mar 2013 23:11:44 +0000 (19:11 -0400)]
Bug 9756: Increment version number
Database update for bug 9756 has been given version 3.11.00.028
Kyle M Hall [Wed, 6 Mar 2013 16:31:56 +0000 (11:31 -0500)]
Bug 9756 - Patron self registration missing preference PatronSelfRegistrationAdditionalInstructions
The patron self registration system references a system preference
PatronSelfRegistrationAdditionalInstructions as a free text field
to add additional instructions for newly self registered patrons,
but the system preference in neither created in the database,
nor exposed via the staff interface.
Test Plan:
1) Apply patch
2) Run updatedatabase.pl
3) Add some text to the new system preference
PatronSelfRegistrationAdditionalInstructions
4) Enable opac self registrations and complete a self registration
5) Note the additional instructions you entered appear on the
"registration complete" page
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Jared Camins-Esakov [Fri, 15 Mar 2013 23:03:55 +0000 (19:03 -0400)]
Merge branch 'bug_7596' into 3.12-master
Owen Leonard [Tue, 12 Mar 2013 00:53:55 +0000 (20:53 -0400)]
Bug 7596 - System prefs editor JS contains untranslatable English string
There is one stray instance of an untranslatable string in
preferences.js. This patch replaces it with a variable which is now
defined in the preferences template.
To test, open the system preferences editor and change any setting. You
should see the usual "Saved preference <preference name>" message.
To test that error strings are now translatable, run "perl translate
update <lang>" from misc/translator, then check if the affected strings shows
up in the po file.
Signed-off-by: Liz Rea <liz@catalyst.net.nz>
Tested both, all ok.
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Jared Camins-Esakov [Fri, 15 Mar 2013 22:54:07 +0000 (18:54 -0400)]
Merge branch 'bug_4266' into 3.12-master
Mathieu Saby [Fri, 22 Feb 2013 11:33:48 +0000 (12:33 +0100)]
Bug 4266: Hide Encumbrance and Expenditure in aqbudgets.tt
Encumbrance and Expenditure fields are not taken into account by Koha,
but the data are saved in database.
This patch hide these fields in aqbudgets.tt
To test : check if the 2 fields are hidden when creating a new fund.
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
This could certainly be done in a few different ways both with CSS and
JS, but this is a simple change and can be easily overridden:
$("#budget_encumb,#budget_expend").closest("li").show();
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Jared Camins-Esakov [Fri, 15 Mar 2013 22:50:58 +0000 (18:50 -0400)]
Merge branch 'bug_9711' into 3.12-master
Jonathan Druart [Tue, 26 Feb 2013 09:51:20 +0000 (10:51 +0100)]
Bug 9711: Add css style for OPACPopupAuthorsSearch
Bug 5888 introduces a new syspref OPACPopupAuthorsSearch. If enabled, a
popup is displayed on the OPAC detail page.
This development does not add the css for the ccsr theme.
Test plan:
Enable the OPACPopupAuthorsSearch.
Check that the appearance is the same of prog and ccsr themes.
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Tested on several authorities (authors, subjects, etc)
works as expected
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Test plan:
1) Switch to CCSR theme
2) Turn off XSLT views (leaving prefs empty)
3) Turn on OPACPopupAuthorsSearch
> Confirm layout is ok/broken in OPAC
4) Switch back to prog theme
> Confirm layout is ok/broken in OPAC
5) Switch off OPACPopupAuthorsSearch
> Confirm layout is ok/broken in OPAC
6) Switch back to CCSR
> Confirm layout is ok/broken in OPAC
Done.
Note: Feature only works with normal view (no XSLT)
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Jared Camins-Esakov [Wed, 13 Mar 2013 13:07:22 +0000 (09:07 -0400)]
Merge branch 'bug_9458' into 3.12-master
Kyle M Hall [Thu, 7 Mar 2013 18:30:27 +0000 (13:30 -0500)]
Bug 9458 - Add sorting to lists - QA Followup 4
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Kyle M Hall [Tue, 5 Mar 2013 17:46:45 +0000 (12:46 -0500)]
Bug 9458 - Add sorting to lists - QA Followup 3
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Kyle M Hall [Tue, 26 Feb 2013 15:34:20 +0000 (10:34 -0500)]
Bug 9458 - Add sorting to lists - QA Followup 2
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Kyle M Hall [Tue, 19 Feb 2013 13:42:11 +0000 (08:42 -0500)]
Bug 9458 - Add sorting to lists - QA Followup
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Kyle M Hall [Wed, 23 Jan 2013 14:05:20 +0000 (09:05 -0500)]
Bug 9458 - Add sorting to lists
Test Plan:
1) Apply patch
2) View list in staff interface, try sorting by title, then author
3) Repeat 2 with same list in OPAC
Signed-off-by: Delaye Stephane <stephane.delaye@biblibre.com>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Jared Camins-Esakov [Wed, 13 Mar 2013 13:01:51 +0000 (09:01 -0400)]
Merge branch 'bug_9647' into 3.12-master
Jared Camins-Esakov [Wed, 13 Mar 2013 12:56:41 +0000 (08:56 -0400)]
Merge branch 'bug_9760' into 3.12-master
Marcel de Rooy [Thu, 7 Mar 2013 12:13:27 +0000 (13:13 +0100)]
Bug 9760: Simplify local use preferences
Removes a lot of code that was needed to handle prefs the old way.
Test plan:
Goto Local use preferences. Do you see some local preferences?
Add a new pref, edit and delete it.
Modify the url to systempreferences.pl?tab=OPAC or tab=log. You should only see
a short message.
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Amended patch: Remove the $sth->finish statements
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Jared Camins-Esakov [Wed, 13 Mar 2013 12:50:11 +0000 (08:50 -0400)]
Merge branch 'bug_9035' into 3.12-master
Robin Sheat [Fri, 8 Mar 2013 01:29:39 +0000 (14:29 +1300)]
Bug 9035 - delete bulkauthimport.pl
<dcook> Then bulkauthimport.pl?
<jcamins> bulkauthimport should not be used ever.
<eythian> it probably should be deleted
<jcamins> It should be.
Signed-off-by: David Cook <dcook@prosentient.com.au>
I've poked around in bulkmarcimport.pl and it certainly seems to have the functionality that Mason (and Jared and Robin) mention.
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Jared Camins-Esakov [Wed, 13 Mar 2013 12:46:40 +0000 (08:46 -0400)]
Merge branch 'bug_9784' into 3.12-master
Liz Rea [Tue, 12 Mar 2013 03:49:31 +0000 (16:49 +1300)]
bug 9784: add koha-shell to the koha-common man page
To test:
Build a package from a git checkout with this patch included
once installed, run man koha-common - koha-shell should appear near the bottom.
Signed-off-by: Robin Sheat <robin@catalyst.net.nz>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Jared Camins-Esakov [Wed, 13 Mar 2013 12:43:45 +0000 (08:43 -0400)]
Merge branch 'bug_9695' into 3.12-master
Owen Leonard [Tue, 5 Mar 2013 21:10:19 +0000 (16:10 -0500)]
Bug 9695 - Use alphabet system preference on page used to browse patrons for patron card batches
When adding patrons to a batch for creating patron cards, the template
shows alphabet links for browsing all patrons. This patch converts the
hard-coded alphabet links to use the new alphabet system preference.
To test, go to the patron card creator and create a new batch. Click
"Add items" to pop up the window for browsing for patrons to add to the
batch. You should see a working array of alphabet letters which link to
patron search results.
Signed-off-by: David Cook <dcook@prosentient.com.au>
The patch adds consistency to the interface and works as described.
Signed-off-by: Jonathan Druarth <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Jared Camins-Esakov [Wed, 13 Mar 2013 12:15:24 +0000 (08:15 -0400)]
Merge branch 'bug_6898' into 3.12-master
Jared Camins-Esakov [Wed, 13 Mar 2013 12:15:09 +0000 (08:15 -0400)]
Bug 6898: Increment version number
Database update for bug 6898 has been given version 3.11.00.027
Fridolyn SOMERS [Thu, 7 Mar 2013 17:17:33 +0000 (12:17 -0500)]
Bug 6898 - circulation librarians can't run overdues without reports permissions followup
Better update database.
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Kyle M Hall [Fri, 10 Feb 2012 15:43:29 +0000 (10:43 -0500)]
Bug 6898 - circulation librarians can't run overdues without reports permissions
This patch adds a new user permission overdues_report for the circulation module, and requires this permission to run the overdue items
report, rather than requiring full reports permissions.
Test plan :
With a user with permissions circulate_remaining_permissions :
- Add overdues_report permission to user
- Go to circulation home
=> you see "Overdues" link
- Clik on it
=> you are allowed to access and use this page
- Remove overdues_report permission to user
- Go to circulation home
=> you do not see "Overdues" link
- Edit URL : <server>/cgi-bin/koha/circ/overdue.pl
=> you are not allowed to access this page
- Go to main page
=> you don't have access to reports module
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Fridolyn SOMERS <fridolyn.somers@biblibre.com>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Jared Camins-Esakov [Wed, 13 Mar 2013 12:02:37 +0000 (08:02 -0400)]
Merge branch 'bug_8853' into 3.12-master
Mathieu Saby [Sat, 9 Mar 2013 15:15:19 +0000 (16:15 +0100)]
Bug 8853: Suppress links in basketgroups list
In the table listing all closed basketgroups, clicking the name of a
basketgroup reopen it. To edit an open basketgroup or reopen a closed
basketgroup, there are specific buttons in "Action" column. So the link
around basketgroup name is an UX problem. This patch suppress the link
around basketgroup name, in both "closed" and "open" tab.
To test :
1. create some closed and open basketgroups
2. check links are not showing anymore
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Jared Camins-Esakov [Mon, 11 Mar 2013 21:59:29 +0000 (17:59 -0400)]
Merge branch 'bug_9293' into 3.12-master
Kyle M Hall [Thu, 7 Feb 2013 14:18:34 +0000 (09:18 -0500)]
Bug 9293 - action_logs not tracking payments
Add all fine actions to action_logs via FinesLog syspref
Test Plan:
1) Enable FinesLog
2) Apply patch
3) Try all the various fine related actions possible
4) Verify that each action creates an action_logs entry
Signed-off-by: MJ Ray <mjr@phonecoop.coop>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Jared Camins-Esakov [Mon, 11 Mar 2013 12:57:19 +0000 (08:57 -0400)]
Merge branch 'bug_9207' into 3.12-master
Jared Camins-Esakov [Mon, 11 Mar 2013 12:56:08 +0000 (08:56 -0400)]
Bug 9207: Increment version number
Database update for bug 9207 has been given version 3.11.00.026
Kyle M Hall [Tue, 4 Dec 2012 13:52:21 +0000 (08:52 -0500)]
Bug 9207 - Improve z39.50 speed slowdowns for sites with many records
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Jared Camins-Esakov [Mon, 11 Mar 2013 12:52:17 +0000 (08:52 -0400)]
Revert "Merge branch 'bug_9446' into 3.12-master"
This reverts commit
5b8f7e43fdcd383f914af17f9b994773d9547a93, reversing
changes made to
af7f49d198657ccbc11ae6bbc0b7c1adb421d91a.
Jared Camins-Esakov [Mon, 11 Mar 2013 12:46:59 +0000 (08:46 -0400)]
Merge branch 'bug_9431' into 3.12-master
Owen Leonard [Fri, 18 Jan 2013 20:55:47 +0000 (15:55 -0500)]
Bug 9431 [Revised] Use DataTables on Patron Category Administration page
Replace the tablesorter plugin with the DataTables plugin on the
patron category administration page. Structural changes were made to the
table markup for validity and to deal with a DataTables bug which
prevents it from properly parsing a <th> with a colspan.
To test, open the Patron Category Administration page (Administration ->
Patron types and categories). Confirm that table sorting works
correctly.
Revision adds a "natural sort" plugin to the main datatables
configuration JavaScript file to enable sorting of columns like those in
this table which include mixed numeric and text data. Allows correct
numeric sorting of data like "0 years, 1 years, 2 years, 18 years," etc.
Further revision corrects template path to datatables assets.
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Comment: Sorting works. No errors.
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Jared Camins-Esakov [Mon, 11 Mar 2013 12:14:24 +0000 (08:14 -0400)]
Merge branch 'bug_8054' into 3.12-master
Liz Rea [Thu, 27 Dec 2012 03:10:26 +0000 (16:10 +1300)]
Bug 8054 - double clicking can cause duplicate payments/fines
Uses preventDoubleForSubmit() to prevent double form submissions in the fines module.
To test:
Create a manual invoice/fine
Create some manual fines, click save like mad - you should get only one fine (without, you will get several if you click madly enough)
Click Pay fines
Pay some fines, clicking save like mad on each. You should only get one payment. (without, you will get several payments)
Create a manual credit
Create a credit, click save like mad. You should only get one credit. (without you will get several if you click madly enough)
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Jared Camins-Esakov [Mon, 11 Mar 2013 12:08:55 +0000 (08:08 -0400)]
Merge branch 'bug_9377' into 3.12-master
Fridolyn SOMERS [Thu, 7 Mar 2013 16:37:16 +0000 (17:37 +0100)]
Bug 9377 - itemtype in duplicate biblio search
In C4::Search::FindDuplicate, when biblio has no ISBN, the duplicate search adds :
$query .= " and itemtype=$result->{itemtype}".
This is wrong when itemtype is defined in items.
This patch simply removes the itemtype from dublicate search.
Test plan :
- Go to a biblio details page
- Click on "Edit as new (duplicate)"
- If ISBN is defined, remove it
- Click on save
=> a duplicate is detected
- Change biblio item type and save
=> a duplicate is detected
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Jared Camins-Esakov [Mon, 11 Mar 2013 11:40:50 +0000 (07:40 -0400)]
Merge branch 'bug_9555' into 3.12-master
Chris Cormack [Fri, 8 Mar 2013 05:41:54 +0000 (18:41 +1300)]
Bug 9555: Another template contains single quotes in a js string
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Jared Camins-Esakov [Mon, 11 Mar 2013 11:33:33 +0000 (07:33 -0400)]
Merge branch 'bug_9734' into 3.12-master
MJ Ray [Thu, 28 Feb 2013 15:47:27 +0000 (15:47 +0000)]
Bug 9734 - String::Random is marked as optional, but C4::Members requires it
jcamins confirmed on IRC it is not optional.
To test:
1) perl koha_perl_deps.pl -a |grep String::Random
2) notice the "No" in the last column - it should be Yes
3) apply patch and repeat same steps, looking for Yes.
4) prove t/Installer_PerlModules.t # which checks String::Random is required
Sponsored-by: software.coop
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Jared Camins-Esakov [Fri, 8 Mar 2013 12:00:37 +0000 (07:00 -0500)]
Merge branch 'bug_9767' into 3.12-master
Marcel de Rooy [Fri, 8 Mar 2013 07:53:52 +0000 (08:53 +0100)]
Bug 9767: Fix for updatedatabase.pl (mixed version numbers)
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Jared Camins-Esakov [Thu, 7 Mar 2013 16:16:51 +0000 (11:16 -0500)]
Merge branch 'bug_8917' into 3.12-master
Jared Camins-Esakov [Thu, 7 Mar 2013 16:16:43 +0000 (11:16 -0500)]
Bug 8917: Increment version number
Database update for bug 8917 has been given version 3.11.00.025
Jonathan Druart [Mon, 4 Mar 2013 15:43:38 +0000 (16:43 +0100)]
Bug 8917: replaces tab with spaces
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Bernardo Gonzalez Kriegel [Fri, 1 Mar 2013 22:54:37 +0000 (19:54 -0300)]
Bug 8917 : [ Sign followup ] Track clicks to links external to Koha
Remove empty pod section in Koha/Linktracker.pm to
make koha-qa happy.
Add missing "\n" in installer/data/mysql/updatedatabase.pl
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Chris Cormack [Fri, 1 Mar 2013 21:09:22 +0000 (10:09 +1300)]
Bug 8917 : Follow up fixing bad behaviour that existed prior to this feature
But the bug only becomes visible with link tracking on
Prior to this patch it would put an empty link in the html
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
General comment: Work as described. No errors.
Tested all preference values with and without logged in user.
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Chris Cormack [Fri, 1 Mar 2013 20:50:07 +0000 (09:50 +1300)]
Bug 8917 : Shifting db dependent code to a module
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Chris Cormack [Tue, 26 Feb 2013 20:32:24 +0000 (09:32 +1300)]
Bug 8917 : Fixing a bug bgkriegel spotted and removing tabs
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>