Commit graph

17450 commits

Author SHA1 Message Date
Jared Camins-Esakov
51b671224f Merge branch 'bug_9106' into 3.12-master 2012-11-28 15:42:43 -05:00
Jared Camins-Esakov
bfb67119ce Merge branch 'bug_6680' into 3.12-master 2012-11-28 08:31:25 -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
Lyon3 Team
17ee9d3afb Bug 9098 Replace tabulations by spaces in opac-user.pl
There was a bunch of tabulations from line 157 and followings

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
The following command show us there is no change:
  git show HEAD --ignore-all-space
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-28 08:27:19 -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
Jared Camins-Esakov
bc9cb5b478 Merge branch 'bug_2832' into 3.12-master 2012-11-28 08:17:58 -05:00
Jonathan Druart
de235cef33 Bug 2832: [SIGNED-OFF] Followup: Add a default value
Signed-off-by: Magnus Enger <magnus@enger.priv.no>
Makes sense, and works as advertised.
2012-11-28 08:16:07 -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
Fridolyn SOMERS
815a9ff1ec Bug 9132: Paging through OPAC authority search results does not work
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Fixes paging in authority result list in OPAC.
All tests pass.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-28 08:13:18 -05:00
18b83eedd3 Bug 9142 - Remove the use of subtests
Debian stable's version of Test::More is older than the one I used on my
12.04 dev box, and doesn't support subtests, which I used to avoid side
effects between different test scenarios.

This patch removes that subtest definition.

Signed-off-by: Robin Sheat <robin@catalyst.net.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
All tests pass.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-28 07:19:34 -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
7e25faace8 Merge branch 'bug_9020' into 3.12-master 2012-11-25 18:36:09 -05:00
Paul Poulain
a853db6adb Bug 9020: follow-up fixes french translation for permissions
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
All tests pass.
Installed Koha with all French sample data and checked that
all permissions were translated and diacritics were displayed
correctly.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-25 18:35:40 -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
ea418af205 Merge branch 'bug_2832' into 3.12-master
Conflicts:
	kohaversion.pl

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-23 11:44:26 -05:00
Jared Camins-Esakov
2c65bdcdcc Update kohaversion for 3.11.000.001 2012-11-23 11:42:34 -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
Jared Camins-Esakov
8445934612 Update history to reflect 3.10.0 and 3.8.7 releases
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-23 11:38:56 -05:00
Paul Poulain
7703dd6ce3 Adding 3.10 release notes 2012-11-23 11:34:33 -05:00
Paul Poulain
9a0e4911e6 Bumping version to 3.10.0 and adding sponsors that are were not already written
Sponsored-by: Central Kansas Library System (CKLS), Plum Creek Library System and Washoe County Library System
Sponsored-by: Los Gatos Public Library and Harrison Carmel Public Library
Sponsored-by: Talking Tech
Sponsored-by: VOKAL
Sponsored-by: Brooklyn Law School Library
Sponsored-by: North Central Regional Library (NCRL)
Sponsored-by: Washoe County Library System
Sponsored-by: Corpus Christi Public Libraries
Sponsored-by: Northeast Kansas Library System (NEKLS)
Sponsored-by: Université d'Aix-Marseille
Sponsored-by: Université de Rennes 2
Sponsored-by: Université de Lyon 3
Sponsored-by: Université de St Etienne
Sponsored-by: BdP de la Meuse
2012-11-23 11:34:23 -05:00
Paul Poulain
ab159bd8a2 Bug 9122: fix the problem when writing-off a fine
The problem was introduced by the addition of accountlines_id in bug 7671

The WriteOffFee sub was called with accountlines_id as second parameter
but still dealing with the accountno column.

As a result, the UPDATE was failing (updating nothing), and the fine
note written off even if the writeoff itself was saved. In other words:
the writeoff was not "attached" to the fine.

This patch fixes the problem.

Test plan: do what katrin says in initial description of the problem:
- add some fines manually, I did 'new card' and sundry
- try writing off all of them or one of them
- the fine is correctly written off

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Passed-QA-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-23 09:09:53 -05:00