koha:mainline.git
9 years agoAdding OPDS http://opds-spec.org/ support to Koha opds
Chris Cormack [Wed, 3 Apr 2013 07:31:25 +0000 (20:31 +1300)]
Adding OPDS http://opds-spec.org/ support to Koha

So far only acquisition feed

9 years agoMerge branch 'bug_2835' into 3.12-master
Jared Camins-Esakov [Tue, 2 Apr 2013 13:03:46 +0000 (09:03 -0400)]
Merge branch 'bug_2835' into 3.12-master

9 years agoBug 2835 - Inconsistent use of colon at the end of sentences
Owen Leonard [Mon, 25 Mar 2013 20:08:04 +0000 (16:08 -0400)]
Bug 2835 - Inconsistent use of colon at the end of sentences

Labels which precede a text input or select typically have a colon
before them:

Name: [____]

This patch cleans up templates where labels in this context lack a
colon. Exceptions to this rule include radio buttons, checkboxes, and
labels inside tables.

To test, view the affected pages and confirm that labels look
consistent.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Patch adds more consistency.
Work for translators could be made easier using CSS instead
of whitespace after colon.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
9 years agoMerge branch 'bug_9947' into 3.12-master
Jared Camins-Esakov [Tue, 2 Apr 2013 12:58:54 +0000 (08:58 -0400)]
Merge branch 'bug_9947' into 3.12-master

9 years agoBug 9947 - Creating item for received serial prefills enumchron subfield
Fridolyn SOMERS [Thu, 28 Mar 2013 14:52:13 +0000 (15:52 +0100)]
Bug 9947 - Creating item for received serial prefills enumchron subfield

In serial receiving :
When creating an item for an issue, a javascript prefilles the $h subfield with issue number.
This is for MARC21, in UNIMARC serial number is on $v.

This patch replaces hard-coded value with the subfield mapped with "items.enumchron".

Test plan :
- Set "Koha to MARC mapping" of "items.enumchron" on a subfield other than $h, ie $z
- Go to a serial subscription detail with "Serial receipt creates an item record"
- Click on "Receive"
- On an issue, click on "Click to add item"
=> Check that issue number is copied into selected subfield, ie $z
You may test that with no mapping of "items.enumchron" there is no javascript error

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Nice catch! Works as advertised.
All tests pass after fixing tabulation characters in serials-edit.tt.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
9 years agoMerge branch 'bug_9572' into 3.12-master
Jared Camins-Esakov [Tue, 2 Apr 2013 12:56:44 +0000 (08:56 -0400)]
Merge branch 'bug_9572' into 3.12-master

9 years agoBug 9572 follow-up: duplicate jQueryUI upgrade in CCSR
Jared Camins-Esakov [Tue, 2 Apr 2013 12:55:28 +0000 (08:55 -0400)]
Bug 9572 follow-up: duplicate jQueryUI upgrade in CCSR

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
9 years agoBug 9572 - Opac info tooltip from branches is not well positioned
Owen Leonard [Tue, 12 Feb 2013 20:48:55 +0000 (15:48 -0500)]
Bug 9572 - Opac info tooltip from branches is not well positioned

This patch removes the jQuery plugin previously used to display the
library information tooltip on opac-detail.pl and implements the
functionality using jQueryUI's tooltip widget. jQueryUI has been
upgraded to 1.9.2 in the process, which required some ammendments to
jQueryUI-related CSS.

To test, make sure at least one of your libraries has "OPAC info" stored
as part of its configuration. View a record in the OPAC which is owned
by that library. Hover over the library's name in the holdings table and
you should see a properly-positioned tooltip showing the "OPAC info."

Also test other jQueryUI-related functionality to confirm that the
upgrade didn't break anything: Tabs and datepickers should still work
correctly.

Signed-off-by: Frederic Durand <frederic.durand@unilim.fr>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works nicely in prog theme, feature seems not to be available
for ccsr yet.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
9 years agoMerge branch 'bug_9609' into 3.12-master
Jared Camins-Esakov [Tue, 2 Apr 2013 12:41:43 +0000 (08:41 -0400)]
Merge branch 'bug_9609' into 3.12-master

9 years agoBug 9609: Rebuilding zebra reports double number of exported records.
Marcel de Rooy [Wed, 13 Feb 2013 13:45:15 +0000 (14:45 +0100)]
Bug 9609: Rebuilding zebra reports double number of exported records.

Test plan:
Clear the zebra queue (run rebuild). Update one biblio.
Rebuild zebra (again) with -z. Check zebra log: note 2 exported records.
Now apply patch, and repeat: You will see 1 exported record.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works as described.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
9 years agoMerge branch 'bug_9838' into 3.12-master
Jared Camins-Esakov [Tue, 2 Apr 2013 12:38:41 +0000 (08:38 -0400)]
Merge branch 'bug_9838' into 3.12-master

9 years agoBug 9838: fix on 04patron_status.t
Adrien Saurat [Mon, 18 Mar 2013 16:41:42 +0000 (17:41 +0100)]
Bug 9838: fix on 04patron_status.t

Some patron infos were hard coded instead
of using the variables defined in SIPtest.pm

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>
9 years agoMerge branch 'bug_9571' into 3.12-master
Jared Camins-Esakov [Tue, 2 Apr 2013 12:23:39 +0000 (08:23 -0400)]
Merge branch 'bug_9571' into 3.12-master

9 years agoBug 9571 - Fix width for textareas in Edit Item screen
David Cook [Fri, 8 Feb 2013 02:49:16 +0000 (13:49 +1100)]
Bug 9571 - Fix width for textareas in Edit Item screen

This patch adds a style for textareas on the Edit Item screen of addbiblio.pl so that they are roughly the same length as the other input elements around it on the page.

To test:

Before applying patch...

1) Create a new item for any biblio with a URL (subfield u) of over 100 characters (you can use www.lettercount.com to count the number of characters in your URL).
2) In any browser (I've already looked at IE, Firefox, and Chrome on Windows), edit the item (either by clicking "Edit Items" from the Normal view of the bib record then clicking "Edit" next to the applicable item, or clicking on the "Items" view in the bib record and clicking "Edit item" next to the relevant item).
3) Notice that the textarea for the url is absolutely tiny. Difficult to read and difficult to interact with.

Apply patch.

1) Notice that the textarea is roughly the same size as the other input elements on the page.

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>
9 years agoBug 9571 [Alternate] Fix width for textareas in Edit Item screen
Owen Leonard [Fri, 8 Feb 2013 16:21:11 +0000 (11:21 -0500)]
Bug 9571 [Alternate] Fix width for textareas in Edit Item screen

This alternative patch modifies the script where the input markup is
built and adds an alternative configuration for textareas. This gives
the textareas explicit "cols" and "rows" attributes. I think this
solution is preferable to a style fix because it solves the bug while
eliminating some invalid markup (no "size" or "maxlength" attributes on
textareas, which are invalid without explicit dimensions).

To test, add a nice big chunk of text to an existing item's item field
like "Public note" (952$z), save, and edit again. The field should now
be displayed in a more comfortably-sized textarea.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
9 years agoMerge branch 'bug_9952' into 3.12-master
Jared Camins-Esakov [Tue, 2 Apr 2013 12:17:40 +0000 (08:17 -0400)]
Merge branch 'bug_9952' into 3.12-master

9 years agoBug 9952: translation of the "tab 0" in MARC detail
Adrien Saurat [Fri, 29 Mar 2013 10:51:38 +0000 (11:51 +0100)]
Bug 9952: translation of the "tab 0" in MARC detail

The html code of 0 (&#48;) is necessary for this
tab to be correctly translated.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Fixes display in translated templates.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
9 years agoMerge branch 'bug_6554' into 3.12-master
Jared Camins-Esakov [Mon, 1 Apr 2013 22:52:41 +0000 (18:52 -0400)]
Merge branch 'bug_6554' into 3.12-master

9 years agoBug 6554 Followup for circulation patron search
Marcel de Rooy [Thu, 28 Mar 2013 12:06:23 +0000 (13:06 +0100)]
Bug 6554 Followup for circulation patron search

Adds decoding for patron name.

Test plan:
Go to Circulation.
Enter a name with a diacritic.
Find that patron or get a message with the name you entered without converted
characters.

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
9 years agoBug 6554: Followup for preferences.pl
Marcel de Rooy [Thu, 28 Mar 2013 11:51:26 +0000 (12:51 +0100)]
Bug 6554: Followup for preferences.pl

Decodes searchfield.

Test plan:
Look for e accent in preferences. You should no longer see converted chars.

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Works ok, no errors.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
9 years agoBug 6554: Followup for acquisitions
Marcel de Rooy [Thu, 28 Mar 2013 12:37:40 +0000 (13:37 +0100)]
Bug 6554: Followup for acquisitions

Adds decoding for url parameter.

Test plan:
Search for expressions with diacritics in vendor search, orders search.
Also try Orders search, Advanced search (within Acq).
Check what you see.

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
9 years agoBug 6554: Followup for serial search
Marcel de Rooy [Thu, 28 Mar 2013 12:23:08 +0000 (13:23 +0100)]
Bug 6554: Followup for serial search

Adds decoding for title, publisher and vendor.

Test plan:
Go to serials.
Search for a diacritic in title. Check.
Go to Advanced search (in Serials). Search for diacritic in title, vendor or
publisher. Check.

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Works ok, no errors.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
9 years agoBug 6554 QA Followup
Marcel de Rooy [Wed, 27 Mar 2013 12:30:16 +0000 (13:30 +0100)]
Bug 6554 QA Followup

Removing binmode, now encoding data in output_with_http_headers.
Replaced output_string by output_as_chars in XSLTParse4Display.

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
No errors.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
9 years agoBug 6554 - make Koha internally utf-8 clean
Dobrica Pavlinusic [Sun, 10 Jun 2012 14:18:42 +0000 (15:18 +0100)]
Bug 6554 - make Koha internally utf-8 clean

In current implementation (mostly commented out in this patch)
uses heuristic to guess which strings need decoding from utf-8
to binary representation and doesn't support utf-8 characters
in templates and has problems with utf-8 data from database.

With this changes, Koha perl code always uses utf-8 encoding
correctly. All incomming data from database is allready
correctly marked as utf-8, and decoding of utf8 is required
only from Zebra and XSLT transfers which don't set utf-8 flag
correctly.

For output, standard perl :encoding(utf8) handler is used
so it also removes various "wide character" warnings as side-effect.

Test scenario:
1. make sure that you have utf-8 characters in your biblio
   records, patrons, categories etc.
2. try to search records on intranet and opac which contain
   utf-8 characters
3. install language which has utf-8 characters, e.g. uk-UA
   dpavlin@koha-dev:/srv/koha/misc/translator(bug_6554) $
   PERL5LIB=/srv/koha/ perl translate install uk-UA
4. switch language to uk-UA and verify that templates
   display correctly
5. test search and Z39.50 search and verify that caracters
   are correct

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
I followed the test plan, adding utf-8 characters to library names,
patron categories, titles, and authorized values. I tried the uk-UA
translation and everything looked good.

When performing Z39.50 searches for titles containing utf-8 characters I
got results which were still occasionally contaminated with dummy
characters [?] but I assume this is Z39.50's fault not the patch's.

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Already signed, add mine.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
9 years agoMerge branch 'bug_9946' into 3.12-master
Jared Camins-Esakov [Mon, 1 Apr 2013 22:27:24 +0000 (18:27 -0400)]
Merge branch 'bug_9946' into 3.12-master

9 years agoBug 9946 - opac-topissues with no time limit
Fridolyn SOMERS [Thu, 28 Mar 2013 13:28:49 +0000 (14:28 +0100)]
Bug 9946 - opac-topissues with no time limit

When in opac-topissues using filter "of the last:" with value "No limit", the result shows the caption : "The 10 most checked-out in the past 999 months".

This patch corrects a typo error : $timeLimit was used instead of $timeLimitFinite

Test plan :
- Go to OPAC most popular
- Select "No limit" in last filter and submit
=> Check that result displays caption : "The 10 most checked-out of all time"
- Come back
- Select "6 months" in last filter and submit
=> Check that result displays caption : "The 10 most checked-out in the past 6 months"

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Passes all tests and QA script.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
9 years agoMerge branch 'bug_9791' into 3.12-master
Jared Camins-Esakov [Mon, 1 Apr 2013 22:20:25 +0000 (18:20 -0400)]
Merge branch 'bug_9791' into 3.12-master

9 years agoBut 9791: Remove single pixel on datatable tables
Jonathan Druart [Mon, 11 Mar 2013 15:08:12 +0000 (16:08 +0100)]
But 9791: Remove single pixel on datatable tables

5 tables (with datatables) are displayed with a pixel before and after.
List is:
- acqui/acqui-home.tt
- acqui/booksellers.tt
- acqui/neworderbiblio.tt
- acqui/supplier.tt
- members/statistics.tt

Test plan:
Check on the 5 pages that pixels are disappears after applying this
patch.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
members/statistics.tt was already fixed on master.
JavaScript change only, works nicely.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
9 years agoMerge branch 'bug_9954' into 3.12-master
Jared Camins-Esakov [Sun, 31 Mar 2013 13:00:44 +0000 (09:00 -0400)]
Merge branch 'bug_9954' into 3.12-master

9 years agoBug 9954 - CVS profile encoding not selected in edition
Fridolyn SOMERS [Fri, 29 Mar 2013 13:53:45 +0000 (14:53 +0100)]
Bug 9954 - CVS profile encoding not selected in edition

When editing an existing CSV profile, its encoding is not selected in combobox, first value "ascii" is always selected.

This patch corrects this (surely appeared with TT conversion) and also the fact that "uft8" is by default selected in creation form.

Test plan:
- Go to Tools/CSV Profiles
- In "New prodile" tab
=> Check that "uft8" is selected
- Create a new profile by entering name, an encoding (other than the first), and MARC fields
- Click on "Edit existing profile" tab
- Select created profile
=> Check that specified encoding is selected

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Template only change.
Fixed tabs.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
9 years agoMerge branch 'bug_9917' into 3.12-master
Jared Camins-Esakov [Sun, 31 Mar 2013 12:52:39 +0000 (08:52 -0400)]
Merge branch 'bug_9917' into 3.12-master

9 years agoBug 9917 - Routing list tab on patron account should depend on syspref/permission
Owen Leonard [Thu, 28 Mar 2013 15:30:45 +0000 (11:30 -0400)]
Bug 9917 - Routing list tab on patron account should depend on syspref/permission

The routing list tab displays on patron pages even if the RoutingSerials
preference is OFF. Display of the tab should be conditional on that pref
being turned on.

This patch adds a check for the RoutingSerials preference to the menu
include files and amends the affected scripts to make the variable
available on the pages where those includes are used.

To test, view the following pages with RoutingSerials both on and off.
The routing list tab should be shown and hidden accordingly:

- Circulation
- Patron details
- Patron fines
- Pay fines
- Pay amount/selected (click from the Pay fines page)
- Create manual invoice
- Create manual credit
- Patron circulation history
- Patron modification log
- Patron notices
- Patron routing lists
- Patron statistics
- Patron files
- Patron permissions
- Set patron password
- "Can't delete patron" page (try to delete a patron with checkouts).

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Touches a lot of files, but only a tiny change in each, works well.
Could perhaps be set in C4/Auth instead, but that's no reason not to
sign off

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
All tests and QA script pass.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
9 years agoMerge branch 'bug_8943' into 3.12-master
Jared Camins-Esakov [Sun, 31 Mar 2013 12:33:44 +0000 (08:33 -0400)]
Merge branch 'bug_8943' into 3.12-master

9 years agoBug 8943 - Add table sorting to labels - Followup - Sort pulldowns in batch export.
Kyle M Hall [Thu, 1 Nov 2012 16:47:13 +0000 (12:47 -0400)]
Bug 8943 - Add table sorting to labels - Followup - Sort pulldowns in batch export.

Signed-off-by: Melia Meggs <melia@bywatersolutions.com>
Signed-off-by: Nora Blake <nblake@masslibsystem.org>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
All tests and QA script pass.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
9 years agoBug 8943 - Add table sorting to labels
Kyle M Hall [Thu, 18 Oct 2012 14:04:44 +0000 (10:04 -0400)]
Bug 8943 - Add table sorting to labels

Signed-off-by: Melia Meggs <melia@bywatersolutions.com>
Signed-off by: Nora Blake <nblake@masslibsystem.org>

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
9 years agoMerge branch 'bug_9443' into 3.12-master
Jared Camins-Esakov [Sun, 31 Mar 2013 12:17:43 +0000 (08:17 -0400)]
Merge branch 'bug_9443' into 3.12-master

9 years agoBug 9443 [Revised] Use DataTables on MARC frameworks administration
Owen Leonard [Wed, 20 Mar 2013 18:51:44 +0000 (14:51 -0400)]
Bug 9443 [Revised] Use DataTables on MARC frameworks administration

Replace the tablesorter plugin with the DataTables plugin on the
MARC frameworks administration page.

To test, open the MARC frameworks dministration page (Administration ->
MARC bibliographic framework -> MARC structure). Confirm that table
sorting, paging, and searching works correctly.

Revision corrects path to DataTables assets, merges with new
Bootstrap version of the page, and corrects minor markup errors.

Signed-off-by: Frederic Durand <frederic.durand@unilim.fr>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works nicely.
All tests and QA script pass.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
9 years agoMerge branch 'bug_9479' into 3.12-master
Jared Camins-Esakov [Sun, 31 Mar 2013 03:37:14 +0000 (23:37 -0400)]
Merge branch 'bug_9479' into 3.12-master

9 years agoBug 9479 follow-up: only set KohaDates as dynamic once
Jared Camins-Esakov [Sun, 31 Mar 2013 03:35:55 +0000 (23:35 -0400)]
Bug 9479 follow-up: only set KohaDates as dynamic once

9 years agoBug 9479: FIX conflict with Bug 9014
Jonathan Druart [Fri, 22 Mar 2013 08:52:18 +0000 (09:52 +0100)]
Bug 9479: FIX conflict with Bug 9014

3rd parameters of output_pref is already used

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
All tests and QA script pass.

Checked sorting and display on notices page with various
settings for dateformat and TimeFormat system preferences.

Also checked other pages for correct display:
- List of checkouts in patron account
- Order search result list
- Basket list in vendor search
- Staff detail page
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
9 years agoBug 9479: The member notices page doesn't display dates in the syspref format
Jonathan Druart [Thu, 24 Jan 2013 10:50:08 +0000 (11:50 +0100)]
Bug 9479: The member notices page doesn't display dates in the syspref format

In order to let the KohaDates plugin display a datetime, this patch
modify this plugin.
Now it uses Koha::DateUtils instead of C4::Dates.

Test plan:
- check that the date format on the member notices page
  (members/notices.pl) is displayed according your syspref dateformat.
- check that existing dates are always in the good format (without the
  hours) e.g. acqui/histsearch.pl, acqui/basket.pl, etc.
- Modify your syspref and recheck the previous pages

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
This is a nice addition, and works according to the test plan. A nice
follow-up would be to create a system pref for formatting times
(12/24hr).

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Fixed a tab in notices.tt to make QA script happy.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
9 years agoMerge branch 'bug_9498' into 3.12-master
Jared Camins-Esakov [Sun, 31 Mar 2013 02:52:58 +0000 (22:52 -0400)]
Merge branch 'bug_9498' into 3.12-master

9 years agoBug 9498: Increment version number
Jared Camins-Esakov [Sun, 31 Mar 2013 02:52:50 +0000 (22:52 -0400)]
Bug 9498: Increment version number

Database update for bug 9498 has been given version 3.11.00.201

9 years agoBug 9498 QA Followup for updatedatabase
Marcel de Rooy [Wed, 27 Mar 2013 12:20:47 +0000 (13:20 +0100)]
Bug 9498 QA Followup for updatedatabase

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Small followup to update servers. No errors
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
9 years agoBug 9498 - Update encoding for Norwegian sample Z39.50 servers
Magnus Enger [Wed, 13 Feb 2013 12:43:22 +0000 (13:43 +0100)]
Bug 9498 - Update encoding for Norwegian sample Z39.50 servers

This patch
- Updates the sample servers installed by the web installer
- Does a database upgrade that changes the encoding for the servers
  in question

To test:
- Do a Norwegian installation and make sure to choose the optional
  sample Z39.50 targets
- Check that encodings for the Norwegian targets (BIBSYS, SAMBOK,
  NORBOK and DEICHMAN) are all set to ISO_6937 (which is the wrong
  encoding)
- Apply this patch and make sure updatadatabase.pl is run
- Check that the encoding for the four targets mentioned above are
  now ISO_8859-1
- Do one search against each target and check that there are no
  "strange" chars in the result list. Searching each of the targets
  for "hessen" should give results that include "norwegian vowels"
- Log on to the MySQL of the test installation and empty the table
  of Z39.50 targets:
  mysql> delete from z3950servers;
- Load this file into MySQL from the command line:
  installer/data/mysql/nb-NO/2-Valgfritt/z3950servers.sql
  and check that it loads without errors and that the four
  Norwegian targets are still set to have encoding = ISO_8859-1

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Comment: Work as described. No errors.
No koha-qa errors

Passed-QA-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
9 years agoMerge branch 'bug_9752' into 3.12-master
Jared Camins-Esakov [Sun, 31 Mar 2013 02:51:27 +0000 (22:51 -0400)]
Merge branch 'bug_9752' into 3.12-master

9 years agoBug 9752: Set marcflavour to NORMARC when NORMARC is chosen
Magnus Enger [Wed, 6 Mar 2013 14:20:59 +0000 (15:20 +0100)]
Bug 9752: Set marcflavour to NORMARC when NORMARC is chosen

Currently, if you install the Norwegian translations and run
through the web installer in Norwegian, choosing NORMARC as you
marcflavour, the marcflavour syspref is set to MARC21.

To test:
- Apply the patch
- Install nb-NO
- Run through the web installer, choosing nb-NO as the language
- Choose NORMARC as the MARC dialect
- When the web installer is done, check the value of the
  marcflavour syspref. It should be NORMARC, not MARC21.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Did a regression test installing UNIMARC too.
All tests and QA script pass.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
9 years agoMerge branch 'bug_9837' into 3.12-master
Jared Camins-Esakov [Sun, 31 Mar 2013 02:50:04 +0000 (22:50 -0400)]
Merge branch 'bug_9837' into 3.12-master

9 years agoBug 9837 - Fix Norwegian authorized values for the web installer
Magnus Enger [Mon, 18 Mar 2013 15:18:52 +0000 (16:18 +0100)]
Bug 9837 - Fix Norwegian authorized values for the web installer

This patch fixes the file of authorized values that is used when
the web installer is run in Norwegian:

Not translated: BOR_NOTES
Missing: REPORT_GROUP

To test:
- Install the Norwegian translation
- Run through the web installer in Norwegian
- Make sure the auth_val.sql file is included
- Check that there are no errors in the web installer
- Check that the BOR_NOTES and REPORT_GROUPS values are present
  in Home > Administration > Authorized values

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
I can't test the validity of the translation, but it doesn't break
anything :)

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
SQL and NORMARC only, works alright.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
9 years agoMerge branch 'bug_9605' into 3.12-master
Jared Camins-Esakov [Sun, 31 Mar 2013 02:11:19 +0000 (22:11 -0400)]
Merge branch 'bug_9605' into 3.12-master

9 years agoBug 9605: rotating collections permissions are wrong
Fridolyn SOMERS [Wed, 13 Feb 2013 09:29:15 +0000 (10:29 +0100)]
Bug 9605: rotating collections permissions are wrong

In tools / rotating collections, permissions are 'parameters => 1'.
But there is a dedicated permission : tools => rotating_collections.

Test plan :
- Disable tools/rotating_collections permission to your connected user
- Check you dont have access to those pages :
  rotating_collections/addItems.pl
  rotating_collections/editCollections.pl
  rotating_collections/rotatingCollections.pl
  rotating_collections/transferCollection.pl
- Enable tools/rotating_collections permission to your connected user
- Check you have access to above pages

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Fixes wrong permission on rotating collection related pages.
This will allow to block access to those.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
9 years agoMerge branch 'bug_9726' into 3.12-master
Jared Camins-Esakov [Sun, 31 Mar 2013 02:05:36 +0000 (22:05 -0400)]
Merge branch 'bug_9726' into 3.12-master

9 years agoBug 9726: XISBN service throttle not initialized
Fridolyn SOMERS [Thu, 28 Feb 2013 09:04:17 +0000 (10:04 +0100)]
Bug 9726: XISBN service throttle not initialized

For limiting XISBN API use, XISBNDailyLimit syspref is used to compare
with daily use count of the API. This count is stored in
services_throttle table. But this table content is never initialized,
not in installer nor in updatedatabase. So count is never increased and
API is used without limit.

This patch add an insert of service type in services_throttle if not
existing. So service throttle will be initialized.

Test plan :
- Check that you don't have a line in services_throttle for
  service_type=xisbn
- Activate FRBRizeEditions and XISBN sysprefs
- Set a small number in XISBNDailyLimit (ie 5)
- Go to a biblio page (with ISBN)
- Look at services_throttle table
  => you should have a line for service_type=xisbn with service_count=1.
- Refresh biblio page untill limit is reached
  => service_count should be equal to limit for service_type=xisbn

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Passes test plan correctly.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Passes all tests and QA script.
Fixes problem, tested according to test plan.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
9 years agoMerge branch 'bug_9484' into 3.12-master
Jared Camins-Esakov [Sun, 31 Mar 2013 01:55:18 +0000 (21:55 -0400)]
Merge branch 'bug_9484' into 3.12-master

9 years agoBug 9484: userid not generated consistently (different editing pages)
Adrien Saurat [Thu, 24 Jan 2013 16:11:31 +0000 (17:11 +0100)]
Bug 9484: userid not generated consistently (different editing pages)

When modifying a patron through different pages, the userid
generation does not behave always the same way; this patch
corrects this:
- when firstname and surname are present in the form, they
are used for the generation;
- if there are not in the form, the firstname and surname
in database are used instead.

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Comment: Work as described. No errors.
Test
This patch lacks a test plan, so I do the following
1) New user, empty userid, autocompleted
2) Edit user, change userid, saved correctly
3) Edit user, main edit window, emptied userid, autocompleted
4) Edit user, Detail > Library use, emptied userid, not autocomplete (not even a dot)
5) Applied patch
6) Repeated 1-3, same behavior
7) Repeated 4), now autocompletes with same userid as 3)

So, works as described.
No koha-qa errors.

NOTE: It's impossible now to delete userid from interface.

Off-topic: tried an userid in Arabic, works very well.

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
9 years agoMerge branch 'bug_9885' into 3.12-master
Jared Camins-Esakov [Sun, 31 Mar 2013 01:39:46 +0000 (21:39 -0400)]
Merge branch 'bug_9885' into 3.12-master

9 years agoBug 9885 Passwords generated by command line scripts are weak
Peter Crellan Kelly [Thu, 21 Mar 2013 09:53:09 +0000 (22:53 +1300)]
Bug 9885 Passwords generated by command line scripts are weak

This changes the scripts so that:
- in koha-create, the zebra password and mysql passwords are set to 16 character "secure" passwords, ie generated with pwgen -s 16 1
- the patron password is set to a 12 character "memorable" password.

Signed-off-by: Magnus Enger <magnus@enger.priv.no>
Looks good. I did not actually build, install and test new packages,
but i did test pwgen with the new arguments and the changes make
sense.

Signed-off-by: Robin Sheat <robin@catalyst.net.nz>
QA signoff
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
9 years agoMerge branch 'bug_9534' into 3.12-master
Jared Camins-Esakov [Sun, 31 Mar 2013 01:28:02 +0000 (21:28 -0400)]
Merge branch 'bug_9534' into 3.12-master

9 years agoBug 9534: Follow-up - Fixing directive inside HTML tag
Katrin Fischer [Sat, 30 Mar 2013 21:52:48 +0000 (22:52 +0100)]
Bug 9534: Follow-up - Fixing directive inside HTML tag

Resolving a construct with a TT directive inside an HTML tag.
Fixes xt/tt_valid.t

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
9 years agoBug 9534 - No way to get back to bib detail from edit record
Liz Rea [Thu, 7 Mar 2013 00:33:25 +0000 (13:33 +1300)]
Bug 9534 - No way to get back to bib detail from edit record

To test:

* Set your BiblioDefaultDisplay to one of the options (go through all three of them)
* view a record
* click "Edit Record"
* you should see a "Cancel" button on the toolbar - click it
* you will be redirected back to the detail page, in the default display method you have picked

* Click More -> Cataloging
* Click the Cancel button
* you should be redirected back to the cataloguing home page

This patch only applies on top of the patch for bug 9672 as it uses the bootstrap buttons.

Signed-off-by: Brendan <brendan@bywatersolutions.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Tested according to test plan, also with z39.50 overlay from
detail page.
All tests except for tt_valid and QA script pass.
Sending a follow-up to fix that problem.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
9 years agoMerge branch 'bug_9406' into 3.12-master
Jared Camins-Esakov [Sun, 31 Mar 2013 01:22:03 +0000 (21:22 -0400)]
Merge branch 'bug_9406' into 3.12-master

9 years agoBug 9406: ensure confirmation of patron renewal is displayed
Galen Charlton [Wed, 16 Jan 2013 17:38:28 +0000 (09:38 -0800)]
Bug 9406: ensure confirmation of patron renewal is displayed

When renewing a patron from the patron details page, ensure that
the "Patron's account has been renewed until XXX" is actually
displayed.

This patch introduces a was_renewed CGI and template parameter
to clarify the intent of the relevent template sections.

To test:

- Before applying the patch, renew a patron from the patron
  details page and verify that you don't see the renewal confirmation.
- After applying the patch, renew the patron from the details page
  and verify that the "Patron's account has been renewed until XXX"
  message shows up.
- Renew the patron from the checkout page and verify that the confirmation
  message shows up.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Message now displays for both tabs.
Fixed tab to make QA script pass.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
9 years agoMerge branch 'bug_9002' into 3.12-master
Jared Camins-Esakov [Sun, 31 Mar 2013 01:14:32 +0000 (21:14 -0400)]
Merge branch 'bug_9002' into 3.12-master

9 years agoBug 9002 - Remove Problematic Logic from Patron Messaging Preferences Form
David Cook [Wed, 31 Oct 2012 21:17:08 +0000 (08:17 +1100)]
Bug 9002 - Remove Problematic Logic from Patron Messaging Preferences Form

If you do not have SMSSendDriver set and you do not have a message_transport_type of "sms", you will get an extra table column filled with a hyphen "-" and no corresponding table heading in the Patron Messaging Preferences table.

This pushes the table out of alignment so the email checkbox goes under "Digests Only?", the digests checkbox goes under "Do not notify", and the Do not notify checkbox is pushed to the side with no heading.

Signed-off-by: Sophie Meynieux <sophie.meynieux@biblibre.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Tested for regressions.
All tests and QA script pass.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
9 years agoMerge branch 'bug_9274' into 3.12-master
Jared Camins-Esakov [Sun, 31 Mar 2013 00:59:57 +0000 (20:59 -0400)]
Merge branch 'bug_9274' into 3.12-master

9 years agoBug 9274: Software error in bibtex export
Fridolyn SOMERS [Wed, 12 Dec 2012 14:47:55 +0000 (15:47 +0100)]
Bug 9274: Software error in bibtex export

Exporting to Bibtex from OPAC returns a software error.
This is because call to C4::Biblio::GetMarcAuthors does
not return only authors but also authority link.
This patch replaces this call by a direct read of
MARC::Record, like for other Bibtex datas.
C4::Biblio::GetMarcAuthors is really destinated to a
direct use in a template.
Also, actually all author subfields are joined with
'and'. According to Bibtext format, authors should be
"firstname surname and ..." or "surname, firstname and
...". I have choosen second one because in non-UNIMARC
it corresponds to $a content.

For example UNIMARC :
700 $aDoe $bJohn
700 $aDoe $bJanne
Gives : Doe, John and Doe, Janne
For example MARC21 :
700 $aDoe, John
700 $aDoe, Janne
Gives : Doe, John and Doe, Janne

Test plan :
Without patch :
Exporting to Bibtex from OPAC returns a software error.
With patch :
Exporting to Bibtex from OPAC succeeds.
Authors are composed using : $a, $b and ... for UNIMARC, $a ... for other marc flavours.

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Comment: Works as decribed. All record export that produces
error pre-patch, now export without error.
No koha-qa errors

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Fixes error and output of additional authors.
Main entry in 100 is still missing.
All tests and  QA script pass.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
9 years agoAdd Aaron Wells to history as committer #207
Jared Camins-Esakov [Sun, 31 Mar 2013 00:41:00 +0000 (20:41 -0400)]
Add Aaron Wells to history as committer #207

9 years agoMerge branch 'bug_8816' into 3.12-master
Jared Camins-Esakov [Sun, 31 Mar 2013 00:40:17 +0000 (20:40 -0400)]
Merge branch 'bug_8816' into 3.12-master

9 years agoBug 8816: Add warning about manual edits to top of debian/control
Aaron Wells [Mon, 25 Mar 2013 04:24:59 +0000 (17:24 +1300)]
Bug 8816: Add warning about manual edits to top of debian/control

And we need to add it to control.in as well, because control is
created from control.in (which is the whole point of the warning ;)

Signed-off-by: Mason James <mtj@kohaaloha.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Adds comments with a warning.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
9 years agoMerge branch 'bug_9873' into 3.12-master
Jared Camins-Esakov [Sun, 31 Mar 2013 00:37:22 +0000 (20:37 -0400)]
Merge branch 'bug_9873' into 3.12-master

9 years agoBug 9873 - Quiet errors in the log from XSLT.pm
Owen Leonard [Wed, 20 Mar 2013 15:01:30 +0000 (11:01 -0400)]
Bug 9873 - Quiet errors in the log from XSLT.pm

If XSLTResultsDisplay is enabled and items in your search results lack a
shelving location or a ccode errors will appear in the log complaining
of "uninitialized value in hash element." This patch adds a check on
these values to quiet the errors.

To test, find or create a record with items which have no shelving
location and/or no collection code. Perform a search the results for
which will include your record. Check for errors in the log.

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Cleans up logs for result list quite a bit.
Passes all tests and QA script.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
9 years agoMerge branch 'bug_9882' into 3.12-master
Jared Camins-Esakov [Sun, 31 Mar 2013 00:33:58 +0000 (20:33 -0400)]
Merge branch 'bug_9882' into 3.12-master

9 years agoBug 9882 - Use DataTables on batch modifications pages
Owen Leonard [Thu, 21 Mar 2013 13:31:39 +0000 (09:31 -0400)]
Bug 9882 - Use DataTables on batch modifications pages

The batch modification pages (edit and delete) use the old tablesorter
plugin. They should use DataTables instead. This patch makes the
following changes:

- Remove tablesorter plugin from batchMod.tt where it was unused.
- Replace tablesorter assets with DataTables assets on batch edit and
  batch delete pages.
- Replace tablesorter code with DataTables code in batchMod.js, which
  provides table sorting functionality for both batch templates.
- Move position of batchMod.js script inclusion so that DataTables
  assets are loaded first.
- Remove inline table sorting code from batch edit page since it is
  provided by batchMod.js

To test, load barcodes on both the batch edit and batch delete pages.
Test JavaScript-based functionality on each results page:

- Check/Uncheck all
- Hide/show columns
- Table sorting on a variety of different kinds of data columns

Batch operations should complete normally.
There should be no JavaScript error on the batch operation "landing
page" (batchMod.tt).

Signed-off-by: Melia Meggs <melia@bywatersolutions.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
All tests and QA script pass.
Checked both patches, no problems found.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
9 years agoMerge branch 'bug_9685' into 3.12-master
Jared Camins-Esakov [Sat, 30 Mar 2013 21:30:38 +0000 (17:30 -0400)]
Merge branch 'bug_9685' into 3.12-master

9 years agoBug 9685: Allow sort baskets by number
Fridolyn SOMERS [Thu, 21 Feb 2013 14:55:11 +0000 (15:55 +0100)]
Bug 9685: Allow sort baskets by number

In acqui/booksellers.pl, first column of baskets tables is "name (#number)".
This allows to sort by name but not by numnber.

This patch splits acutal first column into 2 columns number and name to
allow sorting on number.
Sets default sort on name like existing.

Test plan:
Look at page and use sorting on name and number columns.

Signed-off-by: Marc Sabin <marc.sabin@sciencespo-grenoble.fr>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Nice change for better usability.
Sorting of both columns works nicely.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
9 years agoAdd Karam Qubsi as 206th committer to history
Jared Camins-Esakov [Sat, 30 Mar 2013 21:26:19 +0000 (17:26 -0400)]
Add Karam Qubsi as 206th committer to history

9 years agoMerge branch 'bug_9956' into 3.12-master
Jared Camins-Esakov [Sat, 30 Mar 2013 21:25:50 +0000 (17:25 -0400)]
Merge branch 'bug_9956' into 3.12-master

9 years agoBug 9956 : Add translators to the about page
Karam Qubsi [Sat, 30 Mar 2013 18:43:44 +0000 (21:43 +0300)]
Bug 9956 : Add translators to the about page

Hi all this patch is adding the translators for Arabic version. Thanks a lot . Karam Qubsi

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
String change, looks fine.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
9 years agoMerge branch 'bug_9697' into 3.12-master
Jared Camins-Esakov [Sat, 30 Mar 2013 21:23:04 +0000 (17:23 -0400)]
Merge branch 'bug_9697' into 3.12-master

9 years agoBug 9697: Follow-up - making QA script and tests happy
Katrin Fischer [Sat, 30 Mar 2013 20:48:27 +0000 (21:48 +0100)]
Bug 9697: Follow-up - making QA script and tests happy

- 2x single quotes for translated string in edit-batch.tt

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
9 years agoBug 9697 - Replace YUI buttons on the patron cards batch edit page with Bootstrap
Owen Leonard [Fri, 22 Feb 2013 15:26:53 +0000 (10:26 -0500)]
Bug 9697 - Replace YUI buttons on the patron cards batch edit page with Bootstrap

The patron card creator's batch edit page uses an include file to
display buttons styled by YUI. Bootstrap should be used instead.

This patch moves the contents of the include file into the main
template, this being the only page which requires it. YUI markup and
code has been removed and Bootstrap markup is added. The include file is
deleted.

To test, edit a batch of patrons in the patron card creator. Each
toolbar button should look correct and work correctly:

- Add item(s)
- Remove item(s)
- Delete batch
- Remove duplicates (Keeping Bug 9535 in mind)
- Export item(s)
- Export batch

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Comment: all buttons works and look well. No errors.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Will fix some smaller things in a QA follow up.
Works as expected.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
9 years agoMerge branch 'bug_9904' into 3.12-master
Jared Camins-Esakov [Sat, 30 Mar 2013 21:19:17 +0000 (17:19 -0400)]
Merge branch 'bug_9904' into 3.12-master

9 years agoBug 9904 - Link to plugins management should not be in global navigation
Owen Leonard [Fri, 22 Mar 2013 15:34:18 +0000 (11:34 -0400)]
Bug 9904 - Link to plugins management should not be in global navigation

With the addition of the Plugins feature a link was added to the global
navigation in the "More" submenu. I think this is unnecessary. The
global navigation should be limited to primary Koha functons.

This patch removes the link. To test, apply the patch and confirm that
there is no longer a link to Plugins in the header navigation under
"More."

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Template patch, works as advertised.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
9 years agoMerge branch 'bug_9932' into 3.12-master
Jared Camins-Esakov [Sat, 30 Mar 2013 21:15:09 +0000 (17:15 -0400)]
Merge branch 'bug_9932' into 3.12-master

9 years agoBug 9932 - Broken calendar image and misplaced masthead include for CCSR theme
ByWater Migration Support [Tue, 26 Mar 2013 16:17:15 +0000 (09:17 -0700)]
Bug 9932 - Broken calendar image and misplaced masthead include for CCSR theme

Test Plan:
1) Enable CCSR theme
2) View opac-reserve.pl
3) Note the misplaced background and the broken calendar images
4) Apply the patch
5) Note the background and images now display correctly

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Corrects path to calendar icon.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
9 years agoMerge branch 'bug_9945' into 3.12-master
Jared Camins-Esakov [Sat, 30 Mar 2013 21:10:41 +0000 (17:10 -0400)]
Merge branch 'bug_9945' into 3.12-master

9 years agoBug 9945: Changed display: inline to inline-block on the inline CSS styling on the...
Jonathan Druart [Thu, 28 Mar 2013 14:37:26 +0000 (15:37 +0100)]
Bug 9945: Changed display: inline to inline-block on the inline CSS styling on the li elements.

When adding/modifying an authorised values.

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Improves icon set display in authorised value configuration.
CSS only.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
9 years agoMerge branch 'bug_9953' into 3.12-master
Jared Camins-Esakov [Sat, 30 Mar 2013 21:08:29 +0000 (17:08 -0400)]
Merge branch 'bug_9953' into 3.12-master

9 years agoBug 9953 - When OpacMaintenance breaks lifting debarment
Fridolyn SOMERS [Fri, 29 Mar 2013 12:08:05 +0000 (13:08 +0100)]
Bug 9953 - When OpacMaintenance breaks lifting debarment

When OpacMaintenance is on, any opac page will redirect to maintenance.pl.
Some pages of intranet have the same behavior and you get 404 error.
This is because in checkauth, if type arg is undefined it is "opac" by default.

This patch adds type arg in all intranet calls of checkauth.

Test plan :
- Set syspref OpacMaintenance=Show
- Go to a borrower page
- Click on "Fines" and "Create manual invoice"
- Enter an amount and save
=> Check you go to members/boraccount.pl and not maintenance.pl with 404 error

OK

- Click on "Fines" and "Create manual credit"
- Enter an amount and save
=> Check you go to members/boraccount.pl and not maintenance.pl with 404 error

OK

- Edit borrower
- Set "Restricted" to yes and save
- Click on "Lift restriction" in messages
=> Check you keep in member page and not maintenance.pl with 404 error

OK

- Edit borrower
- Set "Expiry date" to a day in the past and save
- Click on "Renew" in messages
=> Check you keep in member page and not maintenance.pl with 404 error

OK

Signed-off-by: Liz Rea <liz@catalyst.net.nz>
Good catch, a tricky bug.
http://bugs.koha-community.org/show_bug.cgi?id=9952

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Removed a few tabs from mancredit.
All tests and QA script pass now.
Good test plan.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
9 years agoMerge branch 'bug_9937' into 3.12-master
Jared Camins-Esakov [Sat, 30 Mar 2013 21:05:18 +0000 (17:05 -0400)]
Merge branch 'bug_9937' into 3.12-master

9 years agoBug 9937: Add new unit tests for new routines (introduced by bug 5343)
Jonathan Druart [Wed, 27 Mar 2013 14:14:26 +0000 (15:14 +0100)]
Bug 9937: Add new unit tests for new routines (introduced by bug 5343)

New unit tests for 4 routines:
- C4::Serials::subscriptionCurrentlyOnOrder
- C4::Acquisition::GetLastOrderNotReceivedFromSubscriptionid
- C4::Acquisition::GetLastOrderReceivedFromSubscriptionid
- C4::Budgets::GetBudgetName

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Fixed a tab in t/db/dependent/Budgets.t
All tests, new db_dependent tests and QA script pass. Thx Jonathan!
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
9 years agoMerge branch 'bug_9928' into 3.12-master
Jared Camins-Esakov [Sat, 30 Mar 2013 20:59:04 +0000 (16:59 -0400)]
Merge branch 'bug_9928' into 3.12-master

9 years agoBug 9928 - no way to see all purchase suggestions at all
Kyle M Hall [Tue, 26 Mar 2013 13:58:57 +0000 (09:58 -0400)]
Bug 9928 - no way to see all purchase suggestions at all

Test Plan:
1) Apply patch
3) Create suggestions for multiple libraries
2) Select 'Any' for the 'For' field under 'Acquisition information'
3) Note you are seeing the suggestions for all branches

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Works as described

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Patch fixes wrong behaviour.
All tests and QA script pass.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
9 years agoMerge branch 'bug_9610' into 3.12-master
Jared Camins-Esakov [Sat, 30 Mar 2013 12:46:18 +0000 (08:46 -0400)]
Merge branch 'bug_9610' into 3.12-master

9 years agoBug 9610 - Spanish translation of MARC21 default bibliographic framework
Bernardo Gonzalez Kriegel [Wed, 13 Feb 2013 20:33:08 +0000 (17:33 -0300)]
Bug 9610 - Spanish translation of MARC21 default bibliographic framework

This (large) patch adds spanish translation to default
MARC21 bibliographic frameworks.

Based on final EN default framework of Bug 5858,
strings from http://www.bne.es/es/Micrositios/Guias/Marc21/index.html

Automated substitution of strings, to change as
little as possible the original file and ensure
that no entry is removed.

Only to new installs.

To test
1) Delete default framework.
2) Load installer/data/mysql/es-ES/marcflavour/marc21/mandatory/marc21_framework_DEFAULT.sql
   into database. Must load without errors.
3) Edit a record y choose default framework, legends must be in spanish
   (save for obsoleted fields, left untranslated on pourpose)

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
SQL changes only.
Dropped my database and ran the Spanish web installer with
all sample files. No errors and frameworks in Koha look fine.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
9 years agoMerge branch 'bug_9745' into 3.12-master
Jared Camins-Esakov [Sat, 30 Mar 2013 12:26:05 +0000 (08:26 -0400)]
Merge branch 'bug_9745' into 3.12-master

9 years agoBug 9745 - don't nuke translated strings in permissions on DB upgrade
Liz Rea [Mon, 4 Mar 2013 22:39:54 +0000 (11:39 +1300)]
Bug 9745 - don't nuke translated strings in permissions on DB upgrade

To test:

(this is best done by someone who has a database with translated
strings for user permissions - I'm looking towards Katrin. :))

Get a 3.6-3.8 era database loaded as test data - also please use
a low value test database.

Translate or change the strings in the database for the user
permissions that follow in mysql client (for those who didn't
install with a different language that has translated files
at install time) -

update userflags set flagdesc="Translated text 1" where flag
IN('catalogue','editauthorities','reports','management','serials',
'updatecharges','circulate','parameters','borrowers','tools',
'staffaccess','edit_patrons');
(you will notice that this changes all of the permission labels
in the interface to "translated text 1" for the affected
permission flags. This is why I don't want you to use a high
value test database.)

Update that to master + this patch - your "translations"
should be intact.

Blow that database away, and make a brand new one 3.6-3.8 era
with the english database definitions. Run the update again with
this patch, the strings should be updated correctly.

Signed-off-by: Magnus Enger <magnus@enger.priv.no>
There was a typo in the patch, the first database update had to be
changed from this: $dbh->do{(q{ to this: $dbh->do(q{

* Test 1:
- git checkout v3.06.05
- Run through the web installer in Norwegian, installing all
  Norwegian sample data
- git checkout <master + patch for bug 9745>
- Run web installer/upgrade
- Almost all of the permissions are still in Norwegian. The ones
  that are in English are not touched by the database update for
  3.11.00.016, so they must have been introduced by other updates.

* Test 2:
- git checkout v3.06.05
- Run through the web installer in English, installing all English
  sample data
- git checkout <master + patch for bug 9745>
- Run web installer/upgrade
- All permissions have been updated as expected, except "Perform
  batch modification of patrons" which is not in the 'userflags'
  table, but in the 'permissions' table. I have amended the patch
  to account for this.

Two fixes to the original patch, please give a shout if this
makes a second signoff necessary!

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
I tested this on an English and a German sample base updating
from 3.06.07 successfully.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Corrected incorrect field names in the last query (it's
permissions.description not permissions.flagdesc).

9 years agoUpdate history adding Jen Zajac as 205th committer
Jared Camins-Esakov [Sat, 30 Mar 2013 12:18:55 +0000 (08:18 -0400)]
Update history adding Jen Zajac as 205th committer

9 years agoMerge branch 'bug_5648' into 3.12-master
Jared Camins-Esakov [Sat, 30 Mar 2013 12:17:34 +0000 (08:17 -0400)]
Merge branch 'bug_5648' into 3.12-master

9 years agoBug 5648: Changed display: inline to inline-block on the inline CSS styling on the...
Jen Zajac [Mon, 25 Mar 2013 03:49:36 +0000 (16:49 +1300)]
Bug 5648: Changed display: inline to inline-block on the inline CSS styling on the li elements.

Signed-off-by: Frédéric Durand <frederic.durand@unilim.fr>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>