koha.git
7 years agoBug 9226: Wrong branch filter after suggestion creation
Fridolyn SOMERS [Thu, 6 Dec 2012 14:11:57 +0000 (15:11 +0100)]
Bug 9226: Wrong branch filter after suggestion creation

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Before the patch, upon submitting a new suggestion in the staff client I
was redirected to a view which was not filtered by branch. After the
patch I was redirected to a view which was filtered by my logged-in
branch.
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
7 years agoMerge branch 'bug_9385' into 3.12-master
Jared Camins-Esakov [Fri, 15 Feb 2013 13:30:26 +0000 (08:30 -0500)]
Merge branch 'bug_9385' into 3.12-master

7 years agoBug 9385 - patron add labels right aligned in chrome
Owen Leonard [Mon, 11 Feb 2013 17:12:58 +0000 (12:12 -0500)]
Bug 9385 - patron add labels right aligned in chrome

The <legend> element has been given right alignment which seems to only
be respected by WebKit-based browsers. Users of Chrome and Safari see a
right-aligned legend while others see a left-aligned one. Given that the
legend is often applied to fieldsets spanning much of the screen it
seems wiser to have them left-aligned.

This patch removes "text-align:right" from the CSS so that <legend> will
inherit the default left alignment. To test, view any page with a legend
element, for instance the patron add form. In Firefox, Chrome, Safari,
IE, etc. the legend ("Patron identity," "Main address," etc.) should be
left-aligned in the fieldset.

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Comment: Works as described. Tested in IE, Chrome, Firefox, Opera.
No errors.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
All tests pass

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
7 years agoMerge branch 'bug_9545' into 3.12-master
Jared Camins-Esakov [Fri, 15 Feb 2013 13:28:40 +0000 (08:28 -0500)]
Merge branch 'bug_9545' into 3.12-master

7 years agoBug 9545 - Followup Fix import MARC bibliographic framework text label
Jonathan Druart [Thu, 14 Feb 2013 14:23:01 +0000 (15:23 +0100)]
Bug 9545 - Followup Fix import MARC bibliographic framework text label

The export action for the default framework did not work.

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
7 years agoBug 9545 - Fix import MARC bibliographic framework text label
Owen Leonard [Mon, 11 Feb 2013 10:49:05 +0000 (05:49 -0500)]
Bug 9545 - Fix import MARC bibliographic framework text label

This patch improves the labeling of import controls on the
MARC frameworks page by making import options more explicit. Other
changes:

- Form markup fixed to match standard form constructions
- JavaScript corrected to make more embedded English strings
  translatable.
- Form labels made clickable by making "for" attributes match unique
  form field ids.
- Some warning re-worded for readability and translatability.
- Large "loading" icon replaced with more proportional smaller one.

To test, view the MARC frameworks page (admin/biblio_framework.pl) and
test Export and Import functionality. Clicking each should display a
form with options clearly labeled. Import and Export operations should
complete correctly.

Signed-off-by: David Cook <dcook@prosentient.com.au>
Works as described, although I see what Owen means about it being a good candidate for replacement with a modal dialog box in the future.

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
7 years agoMerge branch 'bug_9585' into 3.12-master
Jared Camins-Esakov [Fri, 15 Feb 2013 13:13:44 +0000 (08:13 -0500)]
Merge branch 'bug_9585' into 3.12-master

7 years agoBug 9585 - Fix spelling mistake in default tab conditional for opac-detail
David Cook [Mon, 11 Feb 2013 05:24:20 +0000 (16:24 +1100)]
Bug 9585 - Fix spelling mistake in default tab conditional for opac-detail

There is just a small typo where one of the results of a conditional is
"subscription" rather than "subscriptions".

If this comes up, the correct tab (subscriptions) will not be chosen.

I'm not sure what will happen...it'll probably just have the
"holdings", "subscriptions", and "serial collection" tabs all default
to closed with none of them being open.

Test Plan:

The easiest way to test is just to double-check the other strings in the
conditional which say "subscriptions" rather than "subscription".

You can also look at opac-detail.tt where the param is shown, and note
that there is no condition for "subscription" - just "subscriptions".

Any tests other than that would be overly complex for such a trivial
patch.

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>
7 years agoMerge branch 'bug_9592' into 3.12-master
Jared Camins-Esakov [Fri, 15 Feb 2013 13:07:53 +0000 (08:07 -0500)]
Merge branch 'bug_9592' into 3.12-master

7 years agoBug 9592 - update dependencies, allow blacklisting
Robin Sheat [Tue, 12 Feb 2013 01:56:14 +0000 (14:56 +1300)]
Bug 9592 - update dependencies, allow blacklisting

* Update the dependencies to match master
* Blacklist the CHI and Data::Pagination
* Perltidyed the list-deps script

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
7 years agoBug 9592 - remove db-dependency from Members.pm
Robin Sheat [Wed, 13 Feb 2013 00:55:59 +0000 (13:55 +1300)]
Bug 9592 - remove db-dependency from Members.pm

This was causing test cases to fail on package builds, introduced in bug
7243.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
7 years agoMerge branch 'bug_9608' into 3.12-master
Jared Camins-Esakov [Fri, 15 Feb 2013 12:49:16 +0000 (07:49 -0500)]
Merge branch 'bug_9608' into 3.12-master

7 years agoBug 9608 - White background on header on check in
Owen Leonard [Wed, 13 Feb 2013 16:11:23 +0000 (11:11 -0500)]
Bug 9608 - White background on header on check in

The white background behind the header search form on the checkin
page appears because the search include is missing a <div> which carries
the background gradient CSS. This patch adds the missing markup to the
checkin search header include file and 6 others.

To test, view the following pages and confirm that the normal gradient
background appears behind the header search form:

- Checkin
- Contracts administration
- Currencies administration
- Notices and slips
- Printers administration (admin/printers.pl)
- Stop words administration (admin/stopwords.pl)
- Adding an order to a basket from a suggestions (Acquisitions -> Basket
  -> Add order to basket -> From a suggestions).

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>
7 years agoMerge branch 'bug_7608' into 3.12-master
Jared Camins-Esakov [Fri, 15 Feb 2013 12:46:59 +0000 (07:46 -0500)]
Merge branch 'bug_7608' into 3.12-master

7 years agoBug 7608: Manual history should not always be enabled
Jared Camins-Esakov [Sun, 10 Feb 2013 18:39:50 +0000 (13:39 -0500)]
Bug 7608: Manual history should not always be enabled

When editing a subscription, the "manual history" block is visible even
if the subscription was created with manual history off.

To test:
1) Create a subscription and do not check the "Manual history" checkbox.
2) Save the subscription.
3) Edit the subscription. Note that the manual history section does not
   appear.
4) Enable manual history. Note the appearance of the manual history
   section.
5) Save the subscription.
6) Edit the subscription. Note that the manual history section appears.
7) Click "[cancel manual history]". Note the disappearance of the manual
   history section, and the unchecking of the "Manual history" checkbox.
8) Sign off on patch.

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>
7 years agoMerge branch 'bug_9454' into 3.12-master
Jared Camins-Esakov [Fri, 15 Feb 2013 12:44:09 +0000 (07:44 -0500)]
Merge branch 'bug_9454' into 3.12-master

7 years agoBug 9454: Use placeholders when adding basket
Colin Campbell [Wed, 23 Jan 2013 10:52:28 +0000 (10:52 +0000)]
Bug 9454: Use placeholders when adding basket

Should always use placeholders when passing variables
to DBI; avoids unforeseen bugs and security issues.

Also:

- reformated the long lists of parameters to add CR
- moved the setting of defaults out of the call to ModBasket to
  clarify code
- Setting parameters to undef if they were not defined
  was unnecessary bloat and obscuration

Testing:
Patch should not change functional behaviour. To test check that
order baskets can still be correctly created.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
All tests and QA script pass.
Created a new basket, added order lines and closed basket.
Checked everything worked in the staff interface, also checked
the entry for the new basket in aqbasket in the database.
Logs are clean too.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
7 years agoMerge branch 'bug_7253' into 3.12-master
Jared Camins-Esakov [Tue, 12 Feb 2013 15:00:46 +0000 (10:00 -0500)]
Merge branch 'bug_7253' into 3.12-master

7 years agoBug 7253: followup : manage toolbar for fastcataloging
Fridolyn SOMERS [Fri, 11 Jan 2013 11:16:29 +0000 (12:16 +0100)]
Bug 7253: followup : manage toolbar for fastcataloging

During fast cataloging, hide some toolbar menus of biblio edition page :
- Save and view record
- Z3950 Search
- Framework change
Also display "(fast cataloging)" in biblio and item editon.

Signed-off-by: koha.aixmarseille <koha.aixmarseille@gmail.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Passes all tests and QA script.

Tested:
- adding a fast add with duplicate and without
- adding a new record, checked toolbar showed up correctly
- editing existing record, checked toolbar showed up correctly
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
7 years agoBug 7253: fast cataloging not always checking out
Fridolyn SOMERS [Mon, 7 Jan 2013 14:46:26 +0000 (15:46 +0100)]
Bug 7253: fast cataloging not always checking out

When using fast cataloguing to create a biblio and item on the fly, workflow looses datas when a duplicate is detected.
This comes from the use of a mix of circborrowernumber and borrowernumber in forms.

This patch corrects by using always circborrowernumber in fast cataloguing workflow.
Also adds html and uri escape for barecode where necessery.

Test plan :
With duplicate :
- Go to a borrower circulation page
- Enter a non existing barcode
- Enter a due date
- Click on "Check Out"
=> a message says the barcode was not found
- Click on "Fast cataloguing"
=> The biblio edition page appears with fast cataloguing framework
- Fill mandatory fields by using an existing ISBN
- Click on "Save"
=> a yes/no message says "Duplicate record suspected"
(Choosing yes will brake fast caloguing workflow, in this case librarian should create an item and checkout again)
- Click on "No"
=> The item edition page appears with barcode already filled
- Fill mandatory datas
- Click on "Add item"
=> Borrower circulation page appears again, check that item has been checked out with the specified due date

You may test without duplicate

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Tested following the plan and by fast cataloging a non-duplicate.
All works as expected.

Signed-off-by: koha.aixmarseille <koha.aixmarseille@gmail.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
7 years agoMerge branch 'bug_9471' into 3.12-master
Jared Camins-Esakov [Tue, 12 Feb 2013 14:14:49 +0000 (09:14 -0500)]
Merge branch 'bug_9471' into 3.12-master

7 years agoBug 9471 - Use DataTables on serials claims page
Owen Leonard [Wed, 23 Jan 2013 20:26:14 +0000 (15:26 -0500)]
Bug 9471 - Use DataTables on serials claims page

Replace the tablesorter plugin with the DataTables plugin on the
serials claims page.

This patch replaces some custom table fitlering code with code which
uses DataTables' built-in table fitlering. A minor correction to markup
has also been made to properly align inputs in the filter form.

To test, run the serials claims report for a vendor with data which will
populate results. Confirm that table sorting works correctly. Confirm
also that filtering by title and branch works.

Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Works as advertised. I have compared side by side the both pages, with
tablesorter, and with DataTables. The both work. No regression. With
DataTables, no more sorting on Begin clam column, which is great. A new sort
option may be usefull on the Library column (wasn't the with tablesorter
neither).

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
7 years agoMerge branch 'bug_9462' into 3.12-master
Jared Camins-Esakov [Tue, 12 Feb 2013 14:05:15 +0000 (09:05 -0500)]
Merge branch 'bug_9462' into 3.12-master

7 years agoBug 9462 [Revised] Use DataTables on patron detail page
Owen Leonard [Wed, 23 Jan 2013 17:16:39 +0000 (12:16 -0500)]
Bug 9462 [Revised] Use DataTables on patron detail page

Replace the tablesorter plugin with the DataTables plugin on the
patron detail page.

To test, open a patron detail page for a patron who has checkouts,
holds, and relatives' checkouts. Confirm that table sorting works
correctly for each of those three tables.

Revision adds some JavaScript designed to handle table-sizing for tables
which are hidden initally in tabs. DataTables has an approved method for
handling these cases:
http://www.datatables.net/examples/api/tabs_and_scrolling.html

This should prevent the table of existing holds from looking squeezed.

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>
7 years agoMerge branch 'bug_9469' into 3.12-master
Jared Camins-Esakov [Tue, 12 Feb 2013 13:59:56 +0000 (08:59 -0500)]
Merge branch 'bug_9469' into 3.12-master

7 years agoBug 9469 - Use Datatables in serials statistics wizard
Owen Leonard [Wed, 23 Jan 2013 19:35:03 +0000 (14:35 -0500)]
Bug 9469 - Use Datatables in serials statistics wizard

Replace the tablesorter plugin with the DataTables plugin on the
serials staitsics wizard report.

To test, run the serials statistics wizard (Reports -> Serials). Confirm
that table sorting works correctly.

Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Works with DataTables as it used to work with tablesorter.

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
7 years agoMerge branch 'bug_9440' into 3.12-master
Jared Camins-Esakov [Tue, 12 Feb 2013 13:52:21 +0000 (08:52 -0500)]
Merge branch 'bug_9440' into 3.12-master

7 years agoBug 9440 - update Koha's LICENSE file from GPL2 to GPL3
Mason James [Tue, 22 Jan 2013 09:43:03 +0000 (22:43 +1300)]
Bug 9440 - update Koha's LICENSE file from GPL2 to GPL3

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
I'm not sure what the correct test plan for this is, but a diff
of LICENSE in Koha after applying the patch and the file at
http://www.gnu.org/licenses/gpl-3.0.txt shows no differences.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
7 years agoMerge branch 'bug_9105' into 3.12-master
Jared Camins-Esakov [Tue, 12 Feb 2013 13:50:02 +0000 (08:50 -0500)]
Merge branch 'bug_9105' into 3.12-master

7 years ago9105: Followup for closing Zoom connections
Marcel de Rooy [Mon, 7 Jan 2013 12:49:07 +0000 (13:49 +0100)]
9105: Followup for closing Zoom connections

Housekeeping: close the results sets and connections from Z3950 searches.
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
No regression found, all tests and QA script pass.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
7 years agoMerge branch 'bug_9323' into 3.12-master
Jared Camins-Esakov [Tue, 12 Feb 2013 13:45:39 +0000 (08:45 -0500)]
Merge branch 'bug_9323' into 3.12-master

7 years agoBug 9323 [Counter-proposal] Untranslatable string in serials search
Owen Leonard [Thu, 27 Dec 2012 15:14:26 +0000 (10:14 -0500)]
Bug 9323 [Counter-proposal] Untranslatable string in serials search

The translator seems to have a problem with the _() function inside
HTML. Rather than move only the translatable string to the <script>
block, why not move all of the JavaScript to the <script> tag? This
keeps things a little more organized and lets us follow the guideline to
always use double quotes with _().

Same test plan as Jonathan's patch:

- translate update LANG
- Check in your po file that the string "Are you sure you want to
  reopen this subscription?" does not exist.
- Apply the patch
- translate update LANG
- Check in your po file that the string is translatable

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
String is now translatable.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
7 years agoMerge branch 'bug_9583' into 3.12-master
Jared Camins-Esakov [Tue, 12 Feb 2013 13:40:58 +0000 (08:40 -0500)]
Merge branch 'bug_9583' into 3.12-master

7 years agoBug 9583 - OPAC cart button display problem in Chromium
Owen Leonard [Mon, 11 Feb 2013 13:19:43 +0000 (08:19 -0500)]
Bug 9583 - OPAC cart button display problem in Chromium

Legacy markup in the script which generates the OPAC's Cart button
causes display problems in Chrome under the new HTML5 doctype.

This patch removes the extra markup, which has been unnecessary since
we changed the way the Cart and Lists buttons are displayed in Bug
7584.

To test, view the OPAC in several browsers, including a Chromium-based
browser (Specifically Chromium-based. It is not a WebKit-related bug).
The Cart button should display correctly with and without items in the
cart.

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Comment: Works great, back to normal.
Tested in windows (chrome, firefox, opera) and linux (chrome, chromium)

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Tested with Chromium and Firefox in Ubuntu. No regression found and
display is correct now.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
7 years agoMerge branch 'bug_9222' into 3.12-master
Jared Camins-Esakov [Sun, 10 Feb 2013 18:16:03 +0000 (13:16 -0500)]
Merge branch 'bug_9222' into 3.12-master

7 years agoBug 9222: manual history reversed in subscription-detail.pl
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>
7 years agoMerge branch 'bug_9380' into 3.12-master
Jared Camins-Esakov [Sun, 10 Feb 2013 15:18:32 +0000 (10:18 -0500)]
Merge branch 'bug_9380' into 3.12-master

7 years agoBug 9380 - branch not recording right on writeoff
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>
7 years agoMerge branch 'bug_9392' into 3.12-master
Jared Camins-Esakov [Sat, 9 Feb 2013 02:39:08 +0000 (21:39 -0500)]
Merge branch 'bug_9392' into 3.12-master

7 years agoBug 9392: confirmation does not appear for negative notforloan items issues
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>
7 years agoMerge branch 'bug_9283' into 3.12-master
Jared Camins-Esakov [Fri, 8 Feb 2013 14:48:37 +0000 (09:48 -0500)]
Merge branch 'bug_9283' into 3.12-master

7 years agoBug 9283 - Change structure of export checkouts form
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>
7 years agoMerge branch 'bug_9417' into 3.12-master
Jared Camins-Esakov [Fri, 8 Feb 2013 14:35:01 +0000 (09:35 -0500)]
Merge branch 'bug_9417' into 3.12-master

7 years agoBug 9417 - Allow number of results per page to be selectable for guided reports
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>
7 years agoMerge branch 'bug_9332' into 3.12-master
Jared Camins-Esakov [Fri, 8 Feb 2013 14:23:53 +0000 (09:23 -0500)]
Merge branch 'bug_9332' into 3.12-master

7 years agoBug 9332: Display call number in "Holds waiting" notice
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>
7 years agoMerge branch 'bug_9329' into 3.12-master
Jared Camins-Esakov [Fri, 8 Feb 2013 14:07:45 +0000 (09:07 -0500)]
Merge branch 'bug_9329' into 3.12-master

7 years agoBug 9329: Wrong message for already expired cards
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>
7 years agoMerge branch 'bug_9320' into 3.12-master
Jared Camins-Esakov [Fri, 8 Feb 2013 14:02:57 +0000 (09:02 -0500)]
Merge branch 'bug_9320' into 3.12-master

7 years agoBug 9320 Pending reserves report should not show waiting items
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>
7 years agoMerge branch 'bug_9451' into 3.12-master
Jared Camins-Esakov [Fri, 8 Feb 2013 13:42:35 +0000 (08:42 -0500)]
Merge branch 'bug_9451' into 3.12-master

7 years agoBug 9451: Quiet warnings and Plackify borrower_stats.pl
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>
7 years agoMerge branch 'bug_9499' into 3.12-master
Jared Camins-Esakov [Fri, 8 Feb 2013 00:44:56 +0000 (19:44 -0500)]
Merge branch 'bug_9499' into 3.12-master

7 years agoBug 9499 - --itemscontent= option is undocumented in advanced-notice.pl cronjob ...
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>
7 years agoMerge branch 'bug_9034' into 3.12-master
Jared Camins-Esakov [Fri, 8 Feb 2013 00:36:24 +0000 (19:36 -0500)]
Merge branch 'bug_9034' into 3.12-master

7 years agoBug 9034: Filters are disabled by default
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>
7 years agoBug 9034 [Follow-up] Add sorting and filtering on items table (catalogue/detail.pl)
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>
7 years agoBug 9034: Add CSS rule to reduce width of items table
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>
7 years agoBug 9034: Add sorting and filtering on items table (catalogue/detail.pl)
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>
7 years agoMerge branch 'bug_9143' into 3.12-master
Jared Camins-Esakov [Fri, 8 Feb 2013 00:31:06 +0000 (19:31 -0500)]
Merge branch 'bug_9143' into 3.12-master

7 years agoBug 9143 - changelog and build script updates
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>
7 years agoMerge branch 'bug_9493' into 3.12-master
Jared Camins-Esakov [Fri, 8 Feb 2013 00:25:59 +0000 (19:25 -0500)]
Merge branch 'bug_9493' into 3.12-master

7 years agoBug 9493: confirmations for user holds in opac are not translatable
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>
7 years agoMerge branch 'bug_9556' into 3.12-master
Jared Camins-Esakov [Thu, 7 Feb 2013 13:37:25 +0000 (08:37 -0500)]
Merge branch 'bug_9556' into 3.12-master

7 years agoBug 9556: fix setting messaging prefs when changing patron category
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>
7 years agoMerge branch 'bug_9473' into 3.12-master
Jared Camins-Esakov [Thu, 7 Feb 2013 12:48:24 +0000 (07:48 -0500)]
Merge branch 'bug_9473' into 3.12-master

7 years agoBug 9473: Use DataTables on tags list page
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>
7 years agoMerge branch 'bug_9476' into 3.12-master
Jared Camins-Esakov [Thu, 7 Feb 2013 12:39:52 +0000 (07:39 -0500)]
Merge branch 'bug_9476' into 3.12-master

7 years agoBug 9476: Use Datatables on Koha news page
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>
7 years agoMerge branch 'bug_9477' into 3.12-master
Jared Camins-Esakov [Thu, 7 Feb 2013 12:37:01 +0000 (07:37 -0500)]
Merge branch 'bug_9477' into 3.12-master

7 years agoBug 9477 - Use DataTables on notices page
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>
7 years agoMerge branch 'bug_5790' into 3.12-master
Jared Camins-Esakov [Thu, 7 Feb 2013 12:33:30 +0000 (07:33 -0500)]
Merge branch 'bug_5790' into 3.12-master

7 years agoBug 5790 - Prevent deletion of records with holds - QA Followup
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>
7 years agoBug 5790 - Prevent deletion of records with holds
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>
7 years agoMerge branch 'bug_9529' into 3.12-master
Jared Camins-Esakov [Thu, 7 Feb 2013 12:21:04 +0000 (07:21 -0500)]
Merge branch 'bug_9529' into 3.12-master

7 years agoBug 9529 - Adding a patron shows javascript on screen under login section
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>
7 years agoMerge branch 'bug_9521' into 3.12-master
Jared Camins-Esakov [Thu, 7 Feb 2013 05:38:05 +0000 (00:38 -0500)]
Merge branch 'bug_9521' into 3.12-master

7 years agoBug 9521: Move common jQuery assets to koha-tmpl/intranet-tmpl/lib
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>
7 years agoMerge branch 'bug_9552' into 3.12-master
Jared Camins-Esakov [Thu, 7 Feb 2013 05:21:41 +0000 (00:21 -0500)]
Merge branch 'bug_9552' into 3.12-master

7 years agoBug 9552 - BIB1 Relation "Greater Than" Attribute Not Mapped Properly in CCL.Properties
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>
7 years agoMerge branch 'bug_7507' into 3.12-master
Jared Camins-Esakov [Thu, 7 Feb 2013 04:57:22 +0000 (23:57 -0500)]
Merge branch 'bug_7507' into 3.12-master

7 years agoBug 7507 - Audience Subtype limit on OPAC Advanced Search does not have all Audiences
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>
7 years agoMerge branch 'bug_9546' into 3.12-master
Jared Camins-Esakov [Thu, 7 Feb 2013 04:54:49 +0000 (23:54 -0500)]
Merge branch 'bug_9546' into 3.12-master

7 years agoBug 9546 : Updating make manifest tardist
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>
7 years agoMerge branch 'bug_9421' into 3.12-master
Jared Camins-Esakov [Wed, 6 Feb 2013 17:37:20 +0000 (12:37 -0500)]
Merge branch 'bug_9421' into 3.12-master

7 years agoBug 9421: tools/picture-upload.pl not Plack-compatible
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>
7 years agoMerge branch 'bug_9432' into 3.12-master
Jared Camins-Esakov [Wed, 6 Feb 2013 17:31:41 +0000 (12:31 -0500)]
Merge branch 'bug_9432' into 3.12-master

7 years agoBug 9432: Plack changes for acqui/addorderiso2409.pl
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>
7 years agoMerge branch 'bug_9509' into 3.12-master
Jared Camins-Esakov [Tue, 5 Feb 2013 12:36:20 +0000 (07:36 -0500)]
Merge branch 'bug_9509' into 3.12-master

7 years agoBug 9509 - batchMod.pl does not ensure each barcode is unique
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>
7 years agoMerge branch 'bug_9201' into 3.12-master
Jared Camins-Esakov [Mon, 4 Feb 2013 13:15:58 +0000 (08:15 -0500)]
Merge branch 'bug_9201' into 3.12-master

7 years agoBug 9201 OAI-PMH mapping value cannot be 0
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>
7 years agoMerge branch 'bug_8733' into 3.12-master
Jared Camins-Esakov [Mon, 4 Feb 2013 13:04:34 +0000 (08:04 -0500)]
Merge branch 'bug_8733' into 3.12-master

7 years agoBug 8733: Increment version number
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

7 years agoBug 8733: Follow-up The isbn sent to idream contains dash
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>
7 years agoBug 8733 follow-up: restore isbn class in details page
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>
7 years agoBug 8733: Add IDreamBooks.com enhanced content
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>
7 years agoMerge branch 'bug_9503' into 3.12-master
Jared Camins-Esakov [Mon, 4 Feb 2013 12:46:45 +0000 (07:46 -0500)]
Merge branch 'bug_9503' into 3.12-master

7 years agoBug 9503: Followup remove unused parameters passed to parcel.pl
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>
7 years agoBug 9503 Correct name of parameter passed to parcel.pl
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>