Commit graph

7573 commits

Author SHA1 Message Date
aad2599fb1 Bug 8032: Sort lists by call number
Precaution: Joining the items table makes that the table is sorted on
the item call number of the first item (in case there are more items).

Signed-off-by: Melia Meggs <melia@test.bywatersolutions.com>
Passed-QA-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-30 07:28:37 -05:00
Jared Camins-Esakov
0f6487bc32 Merge branch 'bug_7687' into 3.12-master 2012-11-29 22:18:06 -05:00
90d00a5267 Bug 7687 - Remove problematic CSS gradient declarations targeting Internet Explorer
Removing and revising some CSS which causes problems in
Internet Explorer:

- User sidebar menu tabs in the OPAC
- Sidebar menu tabs in the staff client (circ, catalog, etc)
- List edit/delete buttons in the OPAC (when viewing the
  list of lists and viewing a list itself).

Also fixed is the sprite positioning for the "new list"
link which showed the wrong icon.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>

I tested this in Firefox, and Chromium and it didn't break anything,
I trust it works for IE too.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-29 22:17:52 -05:00
Jared Camins-Esakov
f8c6966940 Merge branch 'bug_7731' into 3.12-master 2012-11-28 19:10:45 -05:00
900e1d30b2 Bug 7731 [Follow-up] Library should be used instead of branch and site
This patch corrects new and old instances of the use of the
term "branch" and replaces them with "library."

Signed-off-by: Melia Meggs <melia@test.bywatersolutions.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
All tests pass, changes look good.
Also inlcudes some bookseller > vendor changes.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-28 19:10:36 -05:00
bc1cd0a656 Bug 8710 - Don't show the images tab in the OPAC if the record has no local images
For unknown reasons, having ListImagesForBiblio return undef
when there are no images still results in a variable being passed
to the template which evaluates as true, with a size of 1.

This patch alters ListImagesForBiblio to remove the "return undef"
condition, allowing the template to evaluate images as false
and show no tab.

To test, turn on local cover images and view records in the OPAC
which do and do not have cover images attached. Images should
display as expected when present, and no images tab should appear
on records which have none.

Signed-off-by: Melia Meggs <melia@test.bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-28 18:54:40 -05:00
Jared Camins-Esakov
6f283a5a36 Merge branch 'bug_8557' into 3.12-master 2012-11-28 18:35:01 -05:00
Christophe Croullebois
963b1af8a8 Bug 8557: Prevents form validation by pressing "Enter"
this patch prevents a scan machine to send 'enter' to the form when it is not expected.
The patch is on orderreceive.tt and serials-edit.tt.
Written by Alex Arnaud. MT6626.

Signed-off-by: Marc Veron <veron@veron.ch>

Tested with receiving orders and receiving serials. Could reporduce problem befor applying the patch. After applying the patch both forms behaved as expected.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Checked order receive and serials edit page, barcode + enter does
no longer submit the form.
All tests pass.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-28 18:34:48 -05:00
Jared Camins-Esakov
c2c3a7f643 Merge branch 'bug_8559' into 3.12-master 2012-11-28 17:09:43 -05:00
82d1fe4086 Bug 8559 - conflicting item statuses - Force cancel or revert
If a librarian checks out a waiting hold to a different patron
it gives the item conflicting statuses. The item will show as both
checked out to the different patron, and waiting for the original
patron.

This patch fixes this by not allowing this situation to occurr. If
a librarian attempts to issue an item that is waiting for a different
patron, the system will force the librarian to choose to
a) not issue the item
b) issue the item, and cancel the waiting hold
c) issue the item, and revert the waiting hold

In this scenario, reverting the waiting hold means to push it back
on the reserves queue as a hold with a priority of 1, which will push
the priorities of any existing holds back by 1 as well. It will become
an item level hold for the given item, as we cannot know if the hold
was item-level or bib-level given the data we have about the hold.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>

All three cases tested, correct outcome each time

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-28 17:09:32 -05:00
d772d3af4d Bug 9137 - Focus when editing/adding new itemtypes/authorised values
This patch adds the "focus" class to the relevant inputs so
that the global staff client JS will move the focus to those fields.
Logic in the authorised_values template puts the focus on the
correct field whether you're adding a new category, a new value,
or performing an edit.

To test, try the following operations:
 - add an itemtype
 - edit an itemtype
 - add an authorised value category
 - add an authorised value value
 - edit an authorised value value

In all cases the focus should automatically be in the first
form field.

Signed-off-by: Melia Meggs <melia@test.bywatersolutions.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
All tests pass and works nicely.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-28 16:52:36 -05:00
Jared Camins-Esakov
51b671224f Merge branch 'bug_9106' into 3.12-master 2012-11-28 15:42:43 -05:00
Nicole C. Engard
e7954504f3 Follow up to Bug 6680: tiny up download lists formats
Explains what uses RIS, and replaces iso2709 with 'MARC'.

Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Simply change, all tests pass.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-28 08:31:22 -05:00
Robin Sheat
7d1d4b85db Bug 6680 - simple tidy-up of cart download format descriptions
Explains what uses RIS, and replaces iso2709 with 'MARC'.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Simple change, all tests pass.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-28 08:31:22 -05:00
Jared Camins-Esakov
6081b94e3c Merge branch 'bug_7143' into 3.12-master 2012-11-28 08:24:54 -05:00
Katrin Fischer
bd63817139 Bug 7143: Small fix for About page
Adding missing version numbers:

Frédéric Demians (3.4, 3.6, 3.8, and 3.10 Translation Manager)

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-28 08:24:26 -05:00
2bc5b29cc1 Bug 7143 About changes for 3.12
Proposing a new section for current release team.

Signed-off-by: Marc Veron <veron@veron.ch>

Section appears on about page as expected.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Looks ok to me, passes tests.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-28 08:24:26 -05:00
Fridolyn SOMERS
0682139bb8 Bug 9132: Paging through OPAC authority search results does not work (followup 1) input with and_ora instread of and_or
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-28 08:13:18 -05:00
Jared Camins-Esakov
081e1ba4c3 Merge branch 'bug_9025' into 3.12-master 2012-11-25 18:41:55 -05:00
Sophie Meynieux
00d7f44f98 Bug 9025: Adding new icons for itemtypes from Sudoc
Signed-off-by: Melia Meggs <melia@test.bywatersolutions.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Checked that new images show up when managing itemtypes and
authorised values and can be selected and used.
Checked about page for license information.
All tests pass.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-25 18:41:53 -05:00
Jared Camins-Esakov
db15627b7a Merge branch 'bug_9059' into 3.12-master 2012-11-25 18:34:00 -05:00
df1db0d4dc Bug 9059: Followup
Removes last occurrence of dependent= parameter. See also report 7368.

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Passes all tests.
Tested successfully in Chromium and Firefox in Ubuntu.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-25 18:32:47 -05:00
7ff10e2e14 Bug 9059: Increase size of opac-sendbasket window
Change window settings for opac-sendbasket. If you need to login
first, the window should be much larger.

Typo dependant should be dependent. Note that this setting is
ignored in much browsers. Will submit another patch to cover more occurrences.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-25 18:32:47 -05:00
85c4cd4712 Bug 8515 - OPAC password change does not obey OpacPasswordChange
The OPAC change password template enforces the OpacPasswordChange
preference by preventing the form from appearing. However, the
script doesn't contain any check for OpacPasswordChange so it is
vulnerable to someone submitting data to it by some other means.

This patch adds a check for OpacPasswordChange to the script and
revises the template logic in order to show the right warning
in all circumstances.

To test, turn off OpacPasswordChange and navigate manually to
opac-passwd.pl. You should see a warning that you can't change
your password.

Turn on OpacPasswordChange load the change password page and
save the page to your desktop. Turn off OpacPasswordChange and
submit a password change via the saved page. Without the patch
this would result in a password change. After the patch it
should not.

Signed-off-by: Melia Meggs <melia@test.bywatersolutions.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Confirmed bug and made sure patch fixes it.
Passes all tests and perlcritic.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-25 18:30:14 -05:00
Jared Camins-Esakov
eb27e4084d Merge branch 'bug_7358' into 3.12-master 2012-11-25 18:20:32 -05:00
Jonathan Druart
d57194e24d Bug 7358: reaffect a closed basket to a closed basketgroup
The list of basketgroups when looking at a closed basket show all the
basketgroups.
It should not be possible to affect a basket to a closed basketgroup,
since this basketgroup should have been sent to a supplier.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-25 18:19:29 -05:00
Jared Camins-Esakov
de84bd9e46 Merge branch 'bug_9073' into 3.12-master 2012-11-25 18:09:14 -05:00
3a7488f874 Bug 9073 - Download option from the cart should match the menu button in lists
This patch moves the staff client Cart download choices into a toolbar
menu button instead of requiring that the user make the choice via a form
in the pop-up window.

To test, add items to Cart in the staff client. Open the cart and
choose a download option from the Download menu. Your download
should complete correctly without the page changing or reloading.

Unrelated edit: Eliminating duplicate document.ready() block by
consolidating a couple of lines of JavaScript.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Checked all export formats can be selected and downloaded, including
CSV profiles.
All tests and perlcritic pass.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-25 18:08:46 -05:00
3247c1774f Bug 9115 - basket window should close automatically when placing a hold
If you choose to place a hold from the Cart pop-up, the entire
holds process (possibly including login) takes place in the cart
window. Upon completion of the operation you're left with a second
window which has lost its context as the Cart.

This patch revises the hold process so that when you click the
hold link in the cart the operation is moved to the main window
and the Cart window closes.

Since the holdSel() function doesn't require interaction with
template variables I have moved it to basket.js along with the
described changes.

To test, put items in your Cart and open it. Select items to
place on hold and click the "Place hold" link. The cart
should close, and the items you selected should appear on the
place hold screen in the main window.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Checked in Firefox and Chromium in Ubuntu, works nicely.
All tests pass.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-25 18:06:11 -05:00
Jared Camins-Esakov
f13b13dc16 Merge branch 'bug_8660' into 3.12-master 2012-11-23 16:39:37 -05:00
Fridolyn SOMERS
dd5ce614aa Bug 8660: follow-up: Porting changes to ccsr theme
Signed-off-by: Mason James <mtj@kohaaloha.com>
Passed-QA-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-23 16:39:13 -05:00
Fridolyn SOMERS
02755f6c55 Bug 8660: Tag status does not show on multiple tag add
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Passed-QA-by: Paul Poulain <paul.poulain@biblibre.com>
Passed-QA-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-23 16:38:32 -05:00
Jared Camins-Esakov
986a18c82b Merge branch 'bug_8986' into 3.12-master 2012-11-23 13:35:24 -05:00
Jonathan Druart
2b5000c7d4 Bug 8986: Followup FIX a JS error if there is no valid card number
Signed-off-by: Owen Leonard <oleonard@myacpl.org>

I can't reproduce the JS error but the template changes are correct
with regard to how the page should handle errors.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-23 13:35:03 -05:00
a6c0175967 Bug 8986: Batch patron modification template corrections
Many minor template changes:

- Correcting title and headings
- Adding translation to string in JavaScript
- Tweaking table sorter
- Wrapping card number in link to patron detail page
- Adding standard styles to "clear" links (see patron attributes)
- Terminiology corrections (borrower-> patron, cardnumber -> card number)
- Capitalization corrections
- Improve display of extended attributes

Signed-off-by: Melia Meggs <melia@test.bywatersolutions.com>
Passed-QA-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-23 13:34:05 -05:00
Jared Camins-Esakov
83da56662d Merge branch 'bug_8899' into 3.12-master 2012-11-23 13:30:32 -05:00
cb535ea6f7 Bug 8899 [Revised] Remove unused CSS declarations from staff client CSS
Using an add-on for Firefox called CSS Usage I found some
instances of CSS in staff-global.css which are unused. Unused
selectors were confirmed by a search of the code.

Testers can't exactly check the whole staff client for things
which look off, but can confirm by their own search that
the removed CSS has no corresponding markup.

Revision adds back lines which were discoverd by QA to be in use.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Passed-QA-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-23 13:30:14 -05:00
4e97465463 Bug 5521 - item edit form appears if no items found
This patch changes the template so that if no items are
found the page doesn't show "The following barcodes were found"
and doesn't show the item edit form.

To test, submit a batch which contains no valid barcodes.
Compare to a batch which contains some or all valid barcodes.

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

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-23 13:06:04 -05:00
Jared Camins-Esakov
560e2d7f67 Merge branch 'bug_8546' into 3.12-master 2012-11-23 13:02:31 -05:00
8c1aa96d02 Bug 8546 - Error in description of OPAC Advanced Search Publication date range search
The publication date range search description in the OPAC suggests
that a search like "-1987" or "2008-" is not inclusive when it
actually is. This patch corrects the description.

Signed-off-by: Melia Meggs <melia@test.bywatersolutions.com>
Passed-QA-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-23 13:01:29 -05:00
Fridolyn SOMERS
19ce907384 Bug 8983: Typo in UNIMARCslim2OPACResults.xsl
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Passed-QA-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-23 12:59:04 -05:00
c5e91b8060 Bug 8163: Click to populate XSLT preferences with "default" or empty values
This patch adds markup and JavaScript to the system preferences
interface so that the user can click "default" or "empty" to populate
an XSLT-related pref with those vaules.

To test, open system preferences for the OPAC or staff client. In
the description for an XSLT-related preference click the "default"
link to populate the field with "default." Click the "leave empty"
link to empty the field.

Revised according to Julian Maurice's suggestion for a more
generic, flexible way to implement it.

Signed-off-by: Melia Meggs <melia@test.bywatersolutions.com>
Passed-QA-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-23 12:28:02 -05:00
Jared Camins-Esakov
48ce46e8fb Merge branch 'bug_8664' into 3.12-master 2012-11-23 12:12:59 -05:00
4fbadbaed4 Bug 8664 - Add floating toolbar with save button to system preferences editor
This patch adds a copy of the "save" button in a toolbar at
the top of the system preferences editor. The toolbar becomes
fixed at the top of the page when you scroll down, exactly like
the toolbar on addbiblio.pl.

Because multiple save buttons might appear when the system prefs
page displays search results, the toolbar does not appear in
this case.

To test, open the system preferences editor and change a setting.
Try saving both with the button in the toolbar and the button at
the top of the page. Test scrolling to confirm that the toolbar
"sticks" to the top of the page when you scroll down.

Signed-off-by: Mirko Tietgen <mirko@abunchofthings.net>
Passed-QA-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-23 12:12:37 -05:00
Jared Camins-Esakov
2512581533 Merge branch 'bug_8758' into 3.12-master 2012-11-23 11:44:55 -05:00
Jared Camins-Esakov
e93cc44941 Merge branch 'bug_2832' into 3.12-master
Conflicts:
	installer/data/mysql/nb-NO/1-Obligatorisk/system_preferences.sql
	installer/data/mysql/updatedatabase.pl

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-23 11:41:48 -05:00
Jared Camins-Esakov
6a265eb793 Merge branch 'bug_9008' into 3.12-master 2012-11-23 11:40:46 -05:00
91a88e6f00 Bug 9106 - Filtering list of uncertain price list by owner empties order information
The form which filters the list of orders with uncertain prices
includes a parameter which tells the script to modify the orders,
resulting in order information being lost. This patch removes
the unnecessary form field.

To test you must have orders with uncertain prices, preferably from
more than one user. Go to the uncertain prices page. Before applying
this patch, submitting the "orders from" form would cause the page
to refresh with no results. This is because the script cleared the
orders of price, quantity, etc. information.

After applying this patch the uncertain prices list should refresh
and show the correct results, either your orders ("me") or all
("Everyone").

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-22 09:40:36 -05:00
Marc Veron
abf72944dd Bug 9017 - Quote of the day: Table footer not translated
The strings for the table footer of the QOD feature are translated in /datatables-strings.inc, but they did not show up in staff client due to missing code in quotes.tt -> $(document).ready(function(), part "oLanguage"
Code added as appropriate.
See: http://datatables.net/usage/i18n

Additionally, quotes.tt had a stray </script> tag after [% INCLUDE 'datatables-strings.inc' %]

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-20 14:10:19 -05:00
29d1aa1be0 Bug 8971 - Sort holds queue report using DataTables
Replacing the old tablesorter plugin with DataTables on
this page will fix sorting bugs related to whitespace and
markup in table cells which tablesorter couldn't handle.

I have also taken the liberty of changing the default sort
from patron to call number, assuming that the librarian
uses this list to pull items from the shelf, and the shelf
is organized by call number.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-20 08:10:51 -05:00