Jared Camins-Esakov [Sun, 10 Feb 2013 18:16:03 +0000 (13:16 -0500)]
Merge branch 'bug_9222' into 3.12-master
Fridolyn SOMERS [Thu, 6 Dec 2012 09:05:00 +0000 (10:05 +0100)]
Bug 9222: manual history reversed in subscription-detail.pl
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 [Sun, 10 Feb 2013 15:18:32 +0000 (10:18 -0500)]
Merge branch 'bug_9380' into 3.12-master
Kyle M Hall [Thu, 17 Jan 2013 13:43:37 +0000 (08:43 -0500)]
Bug 9380 - branch not recording right on writeoff
Test Plan:
1) Write off fines as various branches
2) Observe the stats lines include the wrong branchcode
3) Apply patch
4) Repeate step 1
5) Observe the stats lines include the correct branchcode
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Also tested by changing branch and writing off again - all
tests pass.
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Checked individual and complete write off for different branches.
Write offs were always recorded correctly for the logged in branch.
All tests and QA script pas.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Jared Camins-Esakov [Sat, 9 Feb 2013 02:39:08 +0000 (21:39 -0500)]
Merge branch 'bug_9392' into 3.12-master
Fridolyn SOMERS [Tue, 15 Jan 2013 08:24:25 +0000 (09:24 +0100)]
Bug 9392: confirmation does not appear for negative notforloan items issues
When checking-out an item marked "not for loan" with a positive value,
you get a message to forbid or confirm issue (depending on
AllowNotForLoanOverride syspref). For an item with a negative value
(usually during acquisition process), the issue is made without forbid
or confirm message.
This patch simply changes the test notforloan > 0 into notforloan != 0.
Test plan :
- Checkout an item with items.notforloan = 0
=> The item is issued without message
- Checkout an item with items.notforloan > 0
=> A message forbids or asks confirmation to override
- Checkout an item with items.notforloan < 0 (e.g., on order)
=> A message forbids or asks confirmation to override
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Checked with AllowNotForLoanOverride on and off.
All tests and QA script pass.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Jared Camins-Esakov [Fri, 8 Feb 2013 14:48:37 +0000 (09:48 -0500)]
Merge branch 'bug_9283' into 3.12-master
Owen Leonard [Thu, 13 Dec 2012 19:59:58 +0000 (14:59 -0500)]
Bug 9283 - Change structure of export checkouts form
This patch changes the structure of the export checkouts form
so that it is a little more linear. This change moves generation of the
export options from JavaScript to the markup, eliminating an instance
of dependence on YUI menus.
To test, enable checkout exports by specifying a value for
ExportWithCsvProfile or ExportRemoveFields. Load a patron with
checkouts in circulation. Try the various checkout export options. Each
should function correctly.
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.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, 8 Feb 2013 14:35:01 +0000 (09:35 -0500)]
Merge branch 'bug_9417' into 3.12-master
Kyle M Hall [Wed, 16 Jan 2013 11:53:59 +0000 (06:53 -0500)]
Bug 9417 - Allow number of results per page to be selectable for guided reports
This patch adds the ability to select the number of row to show per page while
retaining the default rows per page as 20.
Test Plan:
1) Apply patch
2) Run a guided report that will have many resultant rows
3) Try the various rows per page options
4) Verify the rows per page selected is retained when paging through results
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, 8 Feb 2013 14:23:53 +0000 (09:23 -0500)]
Merge branch 'bug_9332' into 3.12-master
Adrien Saurat [Mon, 31 Dec 2012 14:03:44 +0000 (15:03 +0100)]
Bug 9332: Display call number in "Holds waiting" notice
When checking out from a patron page, a notice "Holds waiting" appears
if a biblio (on hold) is waiting for this borrower.
This patch adds the call number information to this warning.
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Nice little improvement, thanks.
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Jared Camins-Esakov [Fri, 8 Feb 2013 14:07:45 +0000 (09:07 -0500)]
Merge branch 'bug_9329' into 3.12-master
Adrien Saurat [Fri, 28 Dec 2012 15:37:59 +0000 (16:37 +0100)]
Bug 9329: Wrong message for already expired cards
Previously users would see the same message whether their card was about
to expire or was already expired. This patch adds a new message to
handle cards which are about to expire, following the
NotifyBorrowerDeparture system preference.
TEST PLAN :
The best way to test would to have at the same time :
- a SQL client to change the expiry date of a borrower
- an OPAC session opened for the same patron.
Case 1: expiry date is set in the future
-> no warning
Case 2: expiry date is set in the near future (within the
"NotifyBorrowerDeparture" system preference range)
-> a warning says the card will expire on **date**
Case 3: expiry date is set in the past
-> before patch, same warning as Case 2
-> after patch, new warning indicating that the card has expired
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Added description to the patch and copied test plan from the bug report.
Patch passes test plan.
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Jared Camins-Esakov [Fri, 8 Feb 2013 14:02:57 +0000 (09:02 -0500)]
Merge branch 'bug_9320' into 3.12-master
Sophie Meynieux [Wed, 26 Dec 2012 16:36:45 +0000 (17:36 +0100)]
Bug 9320 Pending reserves report should not show waiting items
Test plan : * chose an item reserved by multiple patrons.
* return the item and confirm reservation =>
item is waiting to be picked up
* run circ/pendingreserves.pl
=> without patch, this item is shown in the list
=> with the patch, only really available items are show.
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Works according to test plan. The title with one waiting item appeared
in pending holds report before the patch, doesn't appear after the
patch.
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Jared Camins-Esakov [Fri, 8 Feb 2013 13:42:35 +0000 (08:42 -0500)]
Merge branch 'bug_9451' into 3.12-master
Jared Camins-Esakov [Tue, 22 Jan 2013 23:40:25 +0000 (18:40 -0500)]
Bug 9451: Quiet warnings and Plackify borrower_stats.pl
There are several warnings and one non-Plack-compatible variable in
reports/borrower_stats.pl.
To test:
1) Apply patch
2) Use the borrower report wizard to create a report that includes an
extended patron attribute.
3) Check the logs, and make sure that you don't see any of the
following messages:
Variable "$period" is not available at
/home/jcamins/kohaclone/reports/borrowers_stats.pl line 265.
Use of uninitialized value in hash element at
/home/jcamins/kohaclone/reports/borrowers_stats.pl line 375.
Use of uninitialized value in hash element at
/home/jcamins/kohaclone/reports/borrowers_stats.pl line 376.
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Jared Camins-Esakov [Fri, 8 Feb 2013 00:44:56 +0000 (19:44 -0500)]
Merge branch 'bug_9499' into 3.12-master
Liz Rea [Sun, 27 Jan 2013 20:42:32 +0000 (09:42 +1300)]
Bug 9499 - --itemscontent= option is undocumented in advanced-notice.pl cronjob + default date should be date_due, not issuedate
To Test:
Set up a borrower to receive due and/or predue notices.
Define your predue and/or due notice to use <<items.content>>
Give your borrower an issue that will trigger a notice to be sent
(Example: Henry Acevedo has checked out a book that will be coming due tomorrow,
he wants to receive predue notices 1 day in advance)
On the command line, run (your paths may vary, these are mine):
sudo env KOHA_CONF=/etc/koha/sites/devlibrary/koha-conf.xml PERL5LIB=/usr/share/koha/lib perl advance_notices.pl -c -n
Note that the date listed is the due date, not the issue date.
Then run:
sudo env KOHA_CONF=/etc/koha/sites/devlibrary/koha-conf.xml PERL5LIB=/usr/share/koha/lib perl advance_notices.pl -c -n --itemscontent=issuedate,title,author,barcode
Note that the date listed is the issue date, not the date due.
Also run
sudo env KOHA_CONF=/etc/koha/sites/devlibrary/koha-conf.xml PERL5LIB=/usr/share/koha/lib perl advance_notices.pl --help
Should show the help.
sudo env KOHA_CONF=/etc/koha/sites/devlibrary/koha-conf.xml PERL5LIB=/usr/share/koha/lib perl advance_notices.pl --man
Should show the man page version of the help.
sudo env KOHA_CONF=/etc/koha/sites/devlibrary/koha-conf.xml PERL5LIB=/usr/share/koha/lib perl advance_notices.pl
Should show the help. This script requires confirmation before running (-c or nothing is done).
Note that the documentation refers to the --itemscontent= option and now allows --man as well as --help. Also it is a proper POD.
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Works as advertised according to the fine test plan.
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Jared Camins-Esakov [Fri, 8 Feb 2013 00:36:24 +0000 (19:36 -0500)]
Merge branch 'bug_9034' into 3.12-master
Julian Maurice [Wed, 9 Jan 2013 13:56:43 +0000 (14:56 +0100)]
Bug 9034: Filters are disabled by default
A small link above the table allow to enable this feature.
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Amended patch: Replace single quote strings with double quote strings
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Owen Leonard [Fri, 9 Nov 2012 19:48:14 +0000 (14:48 -0500)]
Bug 9034 [Follow-up] Add sorting and filtering on items table (catalogue/detail.pl)
This follow-up to the original patch offers an alternative method
to handle the width of the table and form fields:
- Reduce the font size of the filter input fields
- Make the filter inputs' width 100% instead of fixed
- Add "'bAutoWidth': false" to the datatables initialization
to prevent the table width from being set to the browser window
width on load. This allows the browser to be re-sized and have
the table re-flow with it.
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Julian Maurice [Fri, 9 Nov 2012 08:02:25 +0000 (09:02 +0100)]
Bug 9034: Add CSS rule to reduce width of items table
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>
Julian Maurice [Thu, 8 Nov 2012 15:58:47 +0000 (16:58 +0100)]
Bug 9034: Add sorting and filtering on items table (catalogue/detail.pl)
This patch introduces a new javascript plugin for dataTables
(columnFilter).
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 Feb 2013 00:31:06 +0000 (19:31 -0500)]
Merge branch 'bug_9143' into 3.12-master
Robin Sheat [Mon, 26 Nov 2012 04:27:33 +0000 (17:27 +1300)]
Bug 9143 - changelog and build script updates
This accounts for the 3.10 release, and the 3.11 development branch
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Jared Camins-Esakov [Fri, 8 Feb 2013 00:25:59 +0000 (19:25 -0500)]
Merge branch 'bug_9493' into 3.12-master
Fridolyn SOMERS [Fri, 25 Jan 2013 15:03:05 +0000 (16:03 +0100)]
Bug 9493: confirmations for user holds in opac are not translatable
In opac-user.tt, javascript for user holds confirmations (cancel, suspend, resume) are not translatable.
This is because text is in onclick attribute, withtout javascript method for translatable strings : _().
This patch moves those strings as variables into script tag and sets them translatable.
Test plan :
- set a hold for a user
- Go to OPAC user page "my summary"
- click on "Cancel"
=> you get a confirmation message
- click on "Suspend all holds"
=> you get a confirmation message
- click on "Resume all suspended holds"
=> you get a confirmation message
Test this is 'en' and another language.
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 [Thu, 7 Feb 2013 13:37:25 +0000 (08:37 -0500)]
Merge branch 'bug_9556' into 3.12-master
Galen Charlton [Wed, 6 Feb 2013 16:02:18 +0000 (08:02 -0800)]
Bug 9556: fix setting messaging prefs when changing patron category
As a result of accumulated changes to field names returned
by the members/default_messageprefs.pl service, the JavaScript
to change the patron messaging preferences to the category default
when changing a patron's category in the patron editor stopped
working.
To test:
[1] Turn on the EnhancedMessagingPreferences feature.
[2] Set message preference defaults for at least two
patron categories.
[3] Before applying the patch, create a new patron record
using one of the categories you set prefs for, then
change the category, then change it back again. You
will see that numeric settings like the number of days
for advanced notices will change, but checkboxes won't change.
[4] Apply the patch, then create a new patron record and
try changing the patron category. You will see that all of
the preferences will get updated to the category default
each time you change the category.
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
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 [Thu, 7 Feb 2013 12:48:24 +0000 (07:48 -0500)]
Merge branch 'bug_9473' into 3.12-master
Owen Leonard [Wed, 23 Jan 2013 21:04:39 +0000 (16:04 -0500)]
Bug 9473: Use DataTables on tags list page
Replace the tablesorter plugin with the DataTables plugin on the tags
list page.
To test, got to tags moderation and click on a term which tags
multiple titles. On the tags list page, confirm that table sorting works
correctly.
Revision makes default result count (20) match options for number of
pagination entries (10,20,50,100,all).
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Jared Camins-Esakov [Thu, 7 Feb 2013 12:39:52 +0000 (07:39 -0500)]
Merge branch 'bug_9476' into 3.12-master
Owen Leonard [Thu, 24 Jan 2013 01:40:36 +0000 (20:40 -0500)]
Bug 9476: Use Datatables on Koha news page
Replace the tablesorter plugin with the DataTables plugin on the
Koha news page.
To test, open the Koha news page (Tools -> News). Confirm that table sorting
works correctly.
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Jared Camins-Esakov [Thu, 7 Feb 2013 12:37:01 +0000 (07:37 -0500)]
Merge branch 'bug_9477' into 3.12-master
Owen Leonard [Thu, 24 Jan 2013 01:50:31 +0000 (20:50 -0500)]
Bug 9477 - Use DataTables on notices page
Replace the tablesorter plugin with the DataTables plugin on the
notices page.
To test, open the notices page (Tools -> Notices and Slips). Confirm
that table sorting works correctly.
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Amended patch: add the no-wrap style in order to keep the same display
as before.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Jared Camins-Esakov [Thu, 7 Feb 2013 12:33:30 +0000 (07:33 -0500)]
Merge branch 'bug_5790' into 3.12-master
Kyle M Hall [Tue, 5 Feb 2013 13:51:21 +0000 (08:51 -0500)]
Bug 5790 - Prevent deletion of records with holds - QA Followup
Signed-off-by: Liz Rea <liz@catalyst.net.nz>
fixes qa concerns, feature still works
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Kyle M Hall [Wed, 30 Jan 2013 16:36:38 +0000 (11:36 -0500)]
Bug 5790 - Prevent deletion of records with holds
Test Plan:
1) Apply patch
2) Create a record
3) Create an item for the record
3) Place a hold on the bib
4) Attempt to 'Delete all items', you should recieve
an error message stating to delete all holds before
deleting all items.
Also, it is possible to get into a situation where a record has
holds but no items. In this situation, it is not possible to
view/delete the holds without adding an item back to the record.
In this case, attempting to delete the bib causes a warning, but
does not prevent deletion.
Signed-off-by: Liz Rea <liz@catalyst.net.nz>
Passes tests - do note that it was a design decision to leave the delete links clickable even though they are grey.
The reasoning is that librarians will want to be able to know *why* they cannot delete a given item or bib - I like this.
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Jared Camins-Esakov [Thu, 7 Feb 2013 12:21:04 +0000 (07:21 -0500)]
Merge branch 'bug_9529' into 3.12-master
Owen Leonard [Wed, 6 Feb 2013 14:59:16 +0000 (09:59 -0500)]
Bug 9529 - Adding a patron shows javascript on screen under login section
A typo in my patch for Bug 9265 (HTML5 switch) left an extra quotation
mark in a <script> tag on the patron entry form, causing JavaScript
code to be output as text instead of interpreted. This patch corrects
it.
To test, apply the patch, enable EnhancedMessagingPreferences, and load
the patron entry form. You should see no JavaScript on screen around
the 'Patron messaging preferences' fieldset.
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Jared Camins-Esakov [Thu, 7 Feb 2013 05:38:05 +0000 (00:38 -0500)]
Merge branch 'bug_9521' into 3.12-master
Owen Leonard [Thu, 31 Jan 2013 19:55:25 +0000 (14:55 -0500)]
Bug 9521: Move common jQuery assets to koha-tmpl/intranet-tmpl/lib
Assets which are not theme-specific can now be placed in
koha-tmpl/intranet-tmpl/lib. This patch moves jQuery assets referenced
by doc-head-close.inc to this location and corrects the path in the
include.
To test, load any page in the staff client which uses jQuery and confirm
that there are no JavaScript errors. Test keyboard shortcuts (Alt-r,
Alt-u, Alt-q), Search to hold functionality, and search term
highlighting to confirm that jQuery plugins are working correctly.
Revision corrects some additional instances in help-top.inc and removes
a redundant call to the highlight script in preferences.tt
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 [Thu, 7 Feb 2013 05:21:41 +0000 (00:21 -0500)]
Merge branch 'bug_9552' into 3.12-master
David Cook [Wed, 6 Feb 2013 02:49:28 +0000 (13:49 +1100)]
Bug 9552 - BIB1 Relation "Greater Than" Attribute Not Mapped Properly in CCL.Properties
Currently, you can use "lt,le,eq,ge" in your CCL query to handle
"lesser than, lesser or equal to, equal to, greater than or equal
to" relationships.
The only one missing is "gt" (Bib1 2=5).
The mappings are also off "ne, phonetic, stem", but those are Bib1
attributes that Zebra doesn't support, so that's not really relevant.
To test:
[1] Before applying the patch, try the following query in the OPAC:
pubdate,gt:2006
You should get "no results found".
[2] After applying the patch (and note that ccl.properties will usually
need to be installed in the run-time Zebra configuration directory), try
the same search. This time, you could get back the titles whose
publication date is after 2006.
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Jared Camins-Esakov [Thu, 7 Feb 2013 04:57:22 +0000 (23:57 -0500)]
Merge branch 'bug_7507' into 3.12-master
David Cook [Mon, 28 Jan 2013 22:55:58 +0000 (09:55 +1100)]
Bug 7507 - Audience Subtype limit on OPAC Advanced Search does not have all Audiences
The OPAC audience subtype limit did not have all the audiences defined
by the MARC record (and available in the staff client advanced search).
It also incorrectly labelled some of the audiences that it did include.
This patch copies the (correct) audiences from the staff client template
to the OPAC template.
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Test plan:
* Search before applying by audience
* Apply patch
* Search by a newly appeared audience
* Search by an audience that was there before
All tests pass!
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Replace tab with 4 spaces.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Jared Camins-Esakov [Thu, 7 Feb 2013 04:54:49 +0000 (23:54 -0500)]
Merge branch 'bug_9546' into 3.12-master
Chris Cormack [Tue, 5 Feb 2013 03:59:41 +0000 (16:59 +1300)]
Bug 9546 : Updating make manifest tardist
To test
perl Makefile.PL
make manifest tardist
Before the patch you will get an error, after the patch it will create
the tarball
Signed-off-by: Mason James <mtj@kohaaloha.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
make manifest tardist and make manifest zipdist work
perfectly after patch was applied.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Jared Camins-Esakov [Wed, 6 Feb 2013 17:37:20 +0000 (12:37 -0500)]
Merge branch 'bug_9421' into 3.12-master
Jared Camins-Esakov [Fri, 18 Jan 2013 02:39:38 +0000 (21:39 -0500)]
Bug 9421: tools/picture-upload.pl not Plack-compatible
This patch avoids using file-level private variables in subroutines
by passing the needed variables as parameters to the subroutines.
To test (under Plack):
1) Try uploading a patron image without applying the patch. Notice
it fails.
2) Apply patch.
3) Try uploading a patron image again, noticing this time it succeeds.
To test (under Apache):
1) Apply patch.
2) Try uploading a patron image, confirm that it works.
Signed-off-by: Mirko Tietgen <mirko@abunchofthings.net>
Fixes Plack, does not break Apache. Works as expected.
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Jared Camins-Esakov [Wed, 6 Feb 2013 17:31:41 +0000 (12:31 -0500)]
Merge branch 'bug_9432' into 3.12-master
Jared Camins-Esakov [Sat, 19 Jan 2013 00:48:20 +0000 (19:48 -0500)]
Bug 9432: Plack changes for acqui/addorderiso2409.pl
Without this patch, after selecting the file I want to add acquisitions
from, Plack explodes. With this patch, it works.
To test without Plack:
1) Apply patch.
2) Try adding an order item from a staged file.
3) If it works, there are no regressions from the patch.
To test with Plack:
1) Try adding an order item from a staged file. It will fail.
2) Apply patch.
3) Try adding an order item from a staged file.
3) If it works, the patch is successful.
Signed-off-by: Mirko Tietgen <mirko@abunchofthings.net>
Fixes Plack, does not break Apache. Works as expected.
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Jared Camins-Esakov [Tue, 5 Feb 2013 12:36:20 +0000 (07:36 -0500)]
Merge branch 'bug_9509' into 3.12-master
Kyle M Hall [Wed, 30 Jan 2013 17:44:32 +0000 (12:44 -0500)]
Bug 9509 - batchMod.pl does not ensure each barcode is unique
Test plan:
1) Browse to Tools › Batch item deletion
2) Enter a list of barcodes, make sure you have at
least one barcode listed more than once
3) Click continue
4) Verify the duplicated barcode shows up multiple times in the table
5) Apply patch
6) Refresh the page
7) Verify each barcode now displays only once
Signed-off-by: Liz Rea <liz@catalyst.net.nz>
verified bug and fix - both good.
Nice test plan, thanks!
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Jared Camins-Esakov [Mon, 4 Feb 2013 13:15:58 +0000 (08:15 -0500)]
Merge branch 'bug_9201' into 3.12-master
Mirko Tietgen [Thu, 13 Dec 2012 22:37:58 +0000 (23:37 +0100)]
Bug 9201 OAI-PMH mapping value cannot be 0
Allow the value of a OAI set mapping to be 0 / empty. Delete the mapping if field or subfield are empty.
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Now it is possible to add a value == 0 or an empty string.
Signed-off-by: Mason James <mtj@kohaaloha.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Jared Camins-Esakov [Mon, 4 Feb 2013 13:04:34 +0000 (08:04 -0500)]
Merge branch 'bug_8733' into 3.12-master
Jared Camins-Esakov [Mon, 4 Feb 2013 13:01:34 +0000 (08:01 -0500)]
Bug 8733: Increment version number
Database update for bug 8733 has been given version 3.11.00.017
Jonathan Druart [Fri, 1 Feb 2013 12:38:13 +0000 (13:38 +0100)]
Bug 8733: Follow-up The isbn sent to idream contains dash
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Jared Camins-Esakov [Thu, 31 Jan 2013 15:44:26 +0000 (10:44 -0500)]
Bug 8733 follow-up: restore isbn class in details page
For some reason the isbn CSS class was missing from the details
page, presumably due to a bad merge. This one-line commit re-adds
it so that the critics reviews will show up.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Jared Camins-Esakov [Mon, 24 Sep 2012 11:47:11 +0000 (07:47 -0400)]
Bug 8733: Add IDreamBooks.com enhanced content
Adds the following enhanced content to the OPAC, all controlled by
separate sysprefs:
1) A "Readometer" which summarizes reviews on the OPAC detail page
2) A tab with snippets of critical reviews on the OPAC detail page
3) A computed rating on the results page
To test:
Find a book that is listed on IDreamBooks.com (you may have to make
sure that you have the first edition), and one that is not. Try
each of IDreamBooksReadometer, IDreamBooksReviews, and
IDreamBooksResults sysprefs, taking note of the content appearing (or
not) as appropriate.
Updated to add missing CSS to new theme.
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
all tests pass.
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Rebased to latest master 2012-12-31
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Jared Camins-Esakov [Mon, 4 Feb 2013 12:46:45 +0000 (07:46 -0500)]
Merge branch 'bug_9503' into 3.12-master
Jonathan Druart [Thu, 31 Jan 2013 13:05:12 +0000 (14:05 +0100)]
Bug 9503: Followup remove unused parameters passed to parcel.pl
The booksellerid and datereceive parameters are useless.
Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Colin Campbell [Tue, 29 Jan 2013 11:56:15 +0000 (11:56 +0000)]
Bug 9503 Correct name of parameter passed to parcel.pl
invoiceid was being passed as invoice causing GetInvoiceDetails
to silently fail and a system error downstream when
accessing the 'orders' element of the undefined invoice
Added an error message if GetInvoiceDetails called on undef
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Jared Camins-Esakov [Fri, 1 Feb 2013 17:02:13 +0000 (12:02 -0500)]
Merge branch 'bug_9330' into 3.12-master
Adrien Saurat [Mon, 31 Dec 2012 11:12:02 +0000 (12:12 +0100)]
Bug 9330: title field empty when duplicating a patron
For a duplicated patron, the "Saluation" information
is now empty by default.
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Jared Camins-Esakov [Fri, 1 Feb 2013 16:30:47 +0000 (11:30 -0500)]
Merge branch 'bug_9439' into 3.12-master
David Cook [Tue, 22 Jan 2013 00:47:43 +0000 (11:47 +1100)]
Bug 9439 - Enforce superlibrarian mutual exclusivity of other permissions
Basically, when you check the checkbox for the superlibrarian permission
in the patron record, it will disable and uncheck all the other
permission checkboxes. When you uncheck the checkbox for the
superlibrarian permission, it will renable those boxes. There is also
some JS code there to ensure that the other boxes are disabled when
returning to the change permission screen (i.e. the patch is not just a
click handler).
In the event that the checkboxes for superlibrarian and other
permissions are already checked, the user will be shown a pop-up window
explaining that the superlibrarian permission is mutually exclusive to
the others (since it already includes the others) and that the
permissions for that patron will then be reset to just include the
superlibrarian permission.
Comment: Tested on master. Works as described.
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Jared Camins-Esakov [Fri, 1 Feb 2013 16:26:25 +0000 (11:26 -0500)]
Merge branch 'bug_9418' into 3.12-master
Vitor FERNANDES [Thu, 17 Jan 2013 14:38:02 +0000 (14:38 +0000)]
Bug 9418: Some corrections and additions to about.tt
Test plan:
- Apply patch
- See if KEEP SOLUTIONS and C & P Bibliography Services
- Software Coop should be now software.coop
Bug 9418: Some corrections and additions to about.tt
Replaced & with & according codelines.
Sponsored-by: KEEP SOLUTIONS
Combined to patches into one.
Reorder C-entries as per sort order.
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Jared Camins-Esakov [Fri, 1 Feb 2013 16:19:45 +0000 (11:19 -0500)]
Merge branch 'bug_9526' into 3.12-master
Owen Leonard [Thu, 31 Jan 2013 20:56:13 +0000 (15:56 -0500)]
Bug 9526 - Patron statistics table is not pretty, needs circ toolbar
This patch adds the circ/members toolbar, corrects page title and
breadcrumbs, and adds some handling for column names which are coming
from the database. The table of statistics can display any items table
column specified in the StatisticsFields preference, but we can at least
embed the most obvious cases in the template for human readability: item
type, collection code, location, home library, and holding library.
To test, view the patron statistics page. For a patron with no
statistics you should see a message saying so. For a patron with
statistics you should see human-friendly labels for the columns
referenced above.
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Comment: Works as described. No errors.
Wouldn't be better with centered cell contents?
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
FIX a typo:
- <h3>Statistcs for [% UNLESS ( I ) %][% title %] [% firstname %] [% END %] [% surname %] ([% cardnumber %])</h3>
+ <h3>Statistics for [% UNLESS ( I ) %][% title %] [% firstname %] [% END %] [% surname %] ([% cardnumber %])</h3>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Jared Camins-Esakov [Fri, 1 Feb 2013 16:06:18 +0000 (11:06 -0500)]
Merge branch 'bug_9401' into 3.12-master
Galen Charlton [Wed, 16 Jan 2013 05:45:00 +0000 (21:45 -0800)]
bug 9401: remove direct reads of CGISESSID cookie by JavaScript
Having embedded JavaScript read the session cookie directly
is unnecessary and prevents the CGISESSID cookie being marked
httpOnly as a security measure. The only Koha JS attempting
this was the AJAX tags code.
To test:
- In general, verify that there are no regression withs
adding tags in the OPAC or reviewing them in the staff interface.
- In specific, for the OPAC
- log into the OPAC
- retrieve a bib record
- add a tag
- refresh the bib details page to verify that the
tag was added
- make sure the TagsInputOnList syspref is on
- perform a search
- add a tag to more than one record from the search results page
- repeat the preceding using the CCSR theme
- And in the staff interface
- Go to the review tags tool
- Reject a tag
- Refresh to verify that the tag was rejected
Signed-off-by: Galen Charlton <gmc@esilibrary.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, 1 Feb 2013 15:50:27 +0000 (10:50 -0500)]
Merge branch 'bug_9102' into 3.12-master
Jonathan Druart [Mon, 3 Dec 2012 10:17:27 +0000 (11:17 +0100)]
Bug 9102 : Followup Set HttpOnly on the CGISESSID cookie
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Jared Camins-Esakov [Thu, 31 Jan 2013 16:48:47 +0000 (11:48 -0500)]
Merge branch 'bug_9265' into 3.12-master
Owen Leonard [Wed, 12 Dec 2012 17:47:20 +0000 (12:47 -0500)]
Bug 9265 - Switch to HTML5 doctype in OPAC and staff client
This patch replaces the XHTML DOCTYPE with an HTML5 one. The HTML5
validator seems to be significantly different than the XHTML one,
so I'm seeing lots of new errors. This patch includes corrections
for one: Deprecation of the "language" attribute of <script>
tags.
To test, view pages in the OPAC and staff client. They should
appear as normal. Numerous validation follow-ups will be required,
but I suggest these be handled incrementally.
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
test on some intranet pages and I found no regression. (chromium and
firefox).
The w3c page about the doctype: http://www.w3.org/TR/html5-diff/#doctype
Signed-off-by: Mason James <mtj@kohaaloha.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Jared Camins-Esakov [Thu, 31 Jan 2013 16:44:51 +0000 (11:44 -0500)]
Merge branch 'bug_9308' into 3.12-master
Ed Veal [Thu, 20 Dec 2012 15:23:06 +0000 (10:23 -0500)]
Bug 9308 - logo-koha.png not transparent in ccsr theme
This patch will allow the koha logo to be transparent so you can change
the background color.
To test this please change the background color within the css.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Jared Camins-Esakov [Thu, 31 Jan 2013 16:43:28 +0000 (11:43 -0500)]
Merge branch 'bug_9483' into 3.12-master
Owen Leonard [Thu, 24 Jan 2013 15:56:02 +0000 (10:56 -0500)]
Bug 9483 - Use DataTables on batch patron modifications page
Replace the tablesorter plugin with the DataTables plugin on the
batch patron modifications page.
To test, submit multiple patron barcodes for batch modification
(Tools -> Batch patron modification). Confirm that table sorting
works correctly.
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Elliott Davis <elliott@bywatersolions.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Jared Camins-Esakov [Thu, 31 Jan 2013 16:40:26 +0000 (11:40 -0500)]
Merge branch 'bug_9268' into 3.12-master
Liz Rea [Wed, 12 Dec 2012 01:55:14 +0000 (14:55 +1300)]
Bug 9268 - Scanning in barcode or ISBN in Acquisitions -> new order submits the form unexpectedly
To Test:
* Go to Acquisitions - Manage Orders
* Search for a vendor
* Click New Basket.
* Fill required fields
* Press Save.
* Click on "From a new (empty) record"
* Type in title Private Oz, Author Patterson, James.
* Scan (or type) ISBN -
9781864711875.
* (If not scanning, PRESS ENTER HERE)
* Nothing should happen. Form should not be submitted, no error message
should appear.
Sponsored by: Hauraki District Libraries, New Zealand
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Tested according to test plan in Firefox and Chromium on Ubuntu.
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Jared Camins-Esakov [Thu, 31 Jan 2013 16:34:24 +0000 (11:34 -0500)]
Merge branch 'bug_9382' into 3.12-master
Jared Camins-Esakov [Thu, 31 Jan 2013 16:12:57 +0000 (11:12 -0500)]
Bug 9382: Increment version number
Database update for bug 9382 has been given version 3.11.00.016
Liz Rea [Mon, 14 Jan 2013 02:32:42 +0000 (15:32 +1300)]
Bug 9382 - updating permission labels
first, replicate:
go to More -> permissions on any user. Notice that it says various things "privileges, flags, permissions" they are interchangeable and inconsistent.
also note that some of the permissions are nonsensical and/or not descriptive enough, or not using canonical terminology (borrowers instead of patrons, for example)
To test:
interface consistency changes
-> means "turns into"
- page title - privileges -> permissions
- breadcrumbs - privileges -> permissions
- headings - privileges -> permissions
- "set flags" button -> save
Permissions that have changed description:
- Catalogue changes to "Required for staff login" in bold (this was the original impetus for this boatload of changes)
- reports
- editauthorities
- management
- serials
- updatecharges
- circulate
- parameters
- borrowers
- tools
- staffaccess
- edit_patrons (only on updatedb, not on new db)
- Read through and make sure there are no typos, and that the descriptions seem to jive with what privileges the permission gives the user. Suggestions are, in fact, welcome.
- If you are feeling ambitious, go ahead and create a new, clean database and check the wording there as well - it should match what has been done in the db update.
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Tested both with existing database and new database
Signed-off-by: Elliott Davis <elliott@bywatersolions.com>
Tested with existing database. Introduces no new mysql-isms.
Kudos for adding that syspref in bold, that got me when I first started with Koha
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Jared Camins-Esakov [Thu, 31 Jan 2013 16:11:38 +0000 (11:11 -0500)]
Merge branch 'bug_9494' into 3.12-master
Galen Charlton [Fri, 25 Jan 2013 16:49:20 +0000 (11:49 -0500)]
Bug 9494: update default LOC z39.50 target settings
This patch updates the seed data from the target list at
http://www.loc.gov/z3950/lcserver.html#addr.
Comment: new target works. updated deleting and reloading
sample targets.
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Signed-off-by: Elliott Davis <elliott@bywatersolions.com>
I agree with Galen that this may need to be incorproated as a follow-up
for current installations. Works fine for new installs
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Jared Camins-Esakov [Thu, 31 Jan 2013 16:09:00 +0000 (11:09 -0500)]
Merge branch 'bug_8108' into 3.12-master
Owen Leonard [Thu, 13 Dec 2012 15:05:45 +0000 (10:05 -0500)]
Bug 8108 [Follow-up, revised] Remove unused OPAC images
This patch cleans up some loose ends:
- Star ratings images are now in one sprite. Removing
separate star ratings images.
- Amazon ratings have been removed. Related image files
are removed by this patch.
- The tag images associated with tag links on the search
results page were not incorporated into the main sprite.
Now they are.
Added: The Photoshop file from which the main sprite was
generated, in case that is helpful to others. Each layer
is named, and comments have been added to the CSS
referencing the layer names. The file is GIMP-compatible.
Revisions:
- Rebased on current master
- Ported some changes to CCSR theme
- Removed unused CSS which referred to deleted images
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Mason James <mtj@kohaaloha.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Jared Camins-Esakov [Thu, 31 Jan 2013 16:01:36 +0000 (11:01 -0500)]
Merge branch 'bug_8942' into 3.12-master
Fridolyn SOMERS [Wed, 28 Nov 2012 16:51:03 +0000 (17:51 +0100)]
Bug 8942: Translation process breaks javascript (followup 2)
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Tested all changes. Functionality is unchanged. Thanks for the taking
the extra effort to move alert strings into variables.
Signed-off-by: Mason James <mtj@kohaaloha.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Fridolyn SOMERS [Wed, 28 Nov 2012 15:10:09 +0000 (16:10 +0100)]
Bug 8942: Translation process breaks javascript (followup 1)
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Tested all effected functions. No change in functionality.
Signed-off-by: Mason James <mtj@kohaaloha.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Fridolyn SOMERS [Wed, 28 Nov 2012 14:37:22 +0000 (15:37 +0100)]
Bug 8942: Translation process breaks javascript
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
I tested most scripts affected by this patch and visually verified
all changes. Functionality is unaffected.
Signed-off-by: Mason James <mtj@kohaaloha.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Jared Camins-Esakov [Thu, 31 Jan 2013 15:59:15 +0000 (10:59 -0500)]
Merge branch 'bug_9174' into 3.12-master
Jared Camins-Esakov [Tue, 1 Jan 2013 00:52:49 +0000 (19:52 -0500)]
Bug 9174 follow-up: Eliminate warning and fix POD
Thanks to Marcel for spotting these issues.
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Mason James <mtj@kohaaloha.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Jared Camins-Esakov [Thu, 29 Nov 2012 21:58:27 +0000 (16:58 -0500)]
Bug 9174: Fix itemtype image display in OPAC lists
Prior to this patch, C4::VirtualShelves::Page did not make sure that
the itemtype images that it chose when displaying itemtype images for
biblio-level itemtypes were for the correct interface, so
even on the OPAC the Intranet icons were requested. On standard
installations, intranet-tmpl is not available to the OPAC.
To test:
1) Set noItemTypeImages to "Show" and item-level_items to "biblio record"
2) Create a list and add an item with the default item type (942$c in
MARC21) set to something with an itemtype image associated with it.
3) View the list in the OPAC.
4) If you are an a standard install, the itemtype image will be a broken
link. If on a dev install, you can confirm with Firebug or the like
that the image is pulled from /intranet-tmpl.
5) Apply patch.
6) Run `prove t/db_dependent/Koha.t` to confirm that the behavior of the
routine used to retrieve the image URL is correct. (Note that you
must have an item type with the code 'BK')
7) Refresh the list, noting that the display is now correct/the image is
pulled from opac-tmpl.
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
It works as expected. All tests in Koha.t passed.
Signed-off-by: Mason James <mtj@kohaaloha.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>