koha.git
11 years agoBug 9925 - Remove unused table-pager include
Owen Leonard [Tue, 9 Apr 2013 13:29:32 +0000 (09:29 -0400)]
Bug 9925 - Remove unused table-pager include

While the tablesorter plugin has not been completely eliminated from the
staff client yet, there are no more instances where it requires the
include file for showing paging controls. table-pager.inc can be safely
removed.

To test, apply the patch and confirm that the file is gone. A search of
Koha templates for references to table-pager.inc should return no
results.

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>
11 years agoMerge branch 'bug_10050' into 3.14-master
Jared Camins-Esakov [Fri, 26 Apr 2013 01:22:16 +0000 (21:22 -0400)]
Merge branch 'bug_10050' into 3.14-master

11 years agoBug 10050: Update German web installer files for 3.12 - Language settings
Katrin Fischer [Sun, 14 Apr 2013 21:28:41 +0000 (23:28 +0200)]
Bug 10050: Update German web installer files for 3.12 - Language settings

Activate German and English for OPAC and intranet by default.

To test:
- Run the German web installer
- Check that when logging into Koha the German interface is shown
  and you can switch between English and German using the links
  at the bottom of the page
- Check language relevant settings in the system preferences
  are correctly set

Note: The German po files in master are buggy, please
use files from translate.koha-community.org for testing.

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoBug 10050: Update German web installer files for 3.12 - Optional
Katrin Fischer [Sun, 14 Apr 2013 20:56:30 +0000 (22:56 +0200)]
Bug 10050: Update German web installer files for 3.12 - Optional

This patch updates the German web installer files from the
optional directory.

This includes:
- Adding the bridge/reference.gif to the REF itemtype
- Updating currency rates and setting EUR to active
- Adding branchcode MPL to the sample holidays
- Updating a few strings on the patroncard samples
- Fixing typos and rephrasing

To test:
- Run the web installer with German installed
- Verify all optional SQL files are installed correctly

Note: The German po files in master are buggy, please
use files from translate.koha-community.org for testing.

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoBug 10050: Update German web installer files for 3.12 - Mandatory
Katrin Fischer [Sun, 14 Apr 2013 20:14:50 +0000 (22:14 +0200)]
Bug 10050: Update German web installer files for 3.12 - Mandatory

This patch updates the German web installer files from the
mandatory directory.

This includes:
- CalendarFirstDayOfWeek defaults to Monday
- gist rates default to 0.07|0.19|0.00
- RoutlingListNote default text translation
- uniqueitemfields default set to barcode stocknumber
- Translation of new user flags and permissions
- Corrections to existing translations and typo corrections

To test:
- Run the web installer with German installed
- Verify all mandatory SQL files are installed correctly

Note: The German po files in master are buggy, please
use files from translate.koha-community.org for testing.

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoMerge branch 'bug_10070' into 3.14-master
Jared Camins-Esakov [Fri, 26 Apr 2013 00:35:25 +0000 (20:35 -0400)]
Merge branch 'bug_10070' into 3.14-master

11 years agoBug 10070: Anonymous search history is not being set in the cookie
Jonathan Druart [Wed, 17 Apr 2013 13:37:57 +0000 (15:37 +0200)]
Bug 10070: Anonymous search history is not being set in the cookie

Test plan:
1 - turn on EnableOpacSearchHistory
2 - launch some searches at the opac
3 - go to your search history
4 - there is no history!
5 - apply this patch
6 - retry steps 1 to 3
7 - your history search is available!

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
This does fix the bug, but does undo the change to make the cookie
utf-8 safe, however I think that change was done in the wrong way so
I am happy to sign this off

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Wondering if the comment line should be deleted now too.
Patch fixes the problem.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoMerge branch 'bug_9804' into 3.14-master
Jared Camins-Esakov [Wed, 24 Apr 2013 13:16:20 +0000 (09:16 -0400)]
Merge branch 'bug_9804' into 3.14-master

11 years agoBug 9804 - Fix name for NORMARC biblio-koha-indexdefs.xml
Magnus Enger [Mon, 15 Apr 2013 18:24:08 +0000 (20:24 +0200)]
Bug 9804 - Fix name for NORMARC biblio-koha-indexdefs.xml

When i did bug 8805, I gave the biblio-koha-indexdefs.xml file the
wrong name, and called it biblio-zebra-indexdefs.xml. This patch
fixes that.

To reproduce:
- Check that etc/zebradb/marc_defs/normarc/biblios/biblio-zebra-
  indexdefs.xml exists

To test:
- Apply the patch and check that etc/zebradb/marc_defs/normarc/
  biblios/biblio-zebra-indexdefs.xml no longer exists, but that
  etc/zebradb/marc_defs/normarc/biblios/biblio-koha-indexdefs.xml
  does exist.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoMerge branch 'bug_9903' into 3.14-master
Jared Camins-Esakov [Wed, 24 Apr 2013 13:11:22 +0000 (09:11 -0400)]
Merge branch 'bug_9903' into 3.14-master

11 years agoBug 9903: Followup: use the KohaDates T::T plugin to display dates.
Jonathan Druart [Wed, 24 Apr 2013 08:31:19 +0000 (10:31 +0200)]
Bug 9903: Followup: use the KohaDates T::T plugin to display dates.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoBug 9903 - Sort by date broken on patron detail page
Owen Leonard [Tue, 9 Apr 2013 12:55:45 +0000 (08:55 -0400)]
Bug 9903 - Sort by date broken on patron detail page

When the patron detail page switched to DataTables no accommodation was
made for metric date formats in sorting.

This patch adds sorting based on data in a span's title attribute, and
thus requires that the patch for Bug 9887 be applied.

To test, view the detail page for a patron who has assorted checkouts,
relatives' checkouts, and holds. Sorting of date columns should be
correct with the dateformat preference set to any value.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
All tests and QA script pass.
Nice improvement.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoMerge branch 'bug_10023' into 3.14-master
Jared Camins-Esakov [Wed, 24 Apr 2013 12:57:42 +0000 (08:57 -0400)]
Merge branch 'bug_10023' into 3.14-master

11 years agoBug 10023 follow-up: Remove the last occurrences of N[degree sign]
Jared Camins-Esakov [Wed, 24 Apr 2013 12:48:30 +0000 (08:48 -0400)]
Bug 10023 follow-up: Remove the last occurrences of N[degree sign]

11 years agoBug 10023: Change degree notation for number to No.
Katrin Fischer [Sun, 14 Apr 2013 14:29:40 +0000 (16:29 +0200)]
Bug 10023: Change degree notation for number to No.

This patch changes N<little circle> to No. in three templates.

To test:
1) Search for a vendor with visible baskets.
   Check that the first column of the basket table in the
   is now labelled No.

2) Print a PDF order in acquisitons with layout2pages.

3) Print a PDF oder in acquisitons with layout3pages.

Check both generated PDFs for the correct syntax.

Note: you need to switch the system preference
OrderPdfFormat in order to test 2) and 3).
The 2 possible settings are:
pdfformat::layout3pages
pdfformat::layout2pages

It's not only Koha - git bz doesn't like the degree
notation either.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
I prefer "No." over "#" and my survey of the templates shows that "No."
appears more often. Looks like something to add to our style guide.
Passed-QA-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoBug 10023: Change degree notation for number to #
Katrin Fischer [Sun, 14 Apr 2013 14:57:03 +0000 (16:57 +0200)]
Bug 10023: Change degree notation for number to #

This patch changes N<little circle> to # in three templates.

To test:
1) Search for a vendor with visible baskets.
   Check that the first column of the basket table in the
   is now labelled #

2) Print a PDF order in acquisitons with layout2pages.

3) Print a PDF oder in acquisitons with layout3pages.

Check both generated PDFs for the correct syntax.

Note: you need to switch the system preference
OrderPdfFormat in order to test 2) and 3).
The 2 possible settings are:
pdfformat::layout3pages
pdfformat::layout2pages

It's not only Koha - git bz doesn't like the degree
notation either.
Passed-QA-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoMerge branch 'bug_9358' into 3.14-master
Jared Camins-Esakov [Tue, 23 Apr 2013 13:04:19 +0000 (09:04 -0400)]
Merge branch 'bug_9358' into 3.14-master

11 years agoBug 9358 - Followup - Fixed field plugins for MARC21 should be updated for MARC21...
Bernardo Gonzalez Kriegel [Tue, 26 Mar 2013 23:50:05 +0000 (20:50 -0300)]
Bug 9358 - Followup - Fixed field plugins for MARC21 should be updated for MARC21 update #15

This little patch adds a few values and descriptions to complete
value builder for marc21 008.

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Follow-up works as described.
XML change only.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoBug 9358 - Fixed field plugins for MARC21 should be updated for MARC21 update #15
Bernardo Gonzalez Kriegel [Mon, 7 Jan 2013 22:10:56 +0000 (19:10 -0300)]
Bug 9358 - Fixed field plugins for MARC21 should be updated for MARC21 update #15

This patch, together with 9357, fix plugins for leader, 006, 007 and 008 MARC21 fields

Leader18 c and i is fixed on Bug 9357

Added missing/renamed fields on 007

Options 'o' and 'q' already present on 006 and 008,
fixing spaces and removing unnecessary descriptions.

To test:
1) Catalog/edit a record
2) On 007 value builder, check missing values
   on 008, BKS, check for example 33- Literary form,
   i- Letters has a description
3) Apply the patch
4) Clean your browser cache
5) On 007 value builder, new values are present
   On 008/6 descriptions are absent

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works as described.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoMerge branch 'bug_10026' into 3.14-master
Jared Camins-Esakov [Tue, 23 Apr 2013 12:44:07 +0000 (08:44 -0400)]
Merge branch 'bug_10026' into 3.14-master

11 years agoBug 10026 - OPAC cart not showing location anymore
Owen Leonard [Wed, 10 Apr 2013 18:24:16 +0000 (14:24 -0400)]
Bug 10026 - OPAC cart not showing location anymore

When Bug 7570 added availability information to the cart it switched
which subroutine was used to get item information, and thus changed how
the information was being returned.

This patch makes accommodations for this change by adding processing of
item location information to the script in a way that will match the
existing template variables.

To test, add items to the cart in the OPAC some of which include
shelving location information. When you view the cart you should see the
shelving location displayed.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoMerge branch 'bug_8294' into 3.14-master
Jared Camins-Esakov [Tue, 23 Apr 2013 12:39:11 +0000 (08:39 -0400)]
Merge branch 'bug_8294' into 3.14-master

11 years agoBug 8294: Fix display of serial enumeration for OPAC holds
Katrin Fischer [Sun, 14 Apr 2013 17:29:13 +0000 (19:29 +0200)]
Bug 8294: Fix display of serial enumeration for OPAC holds

It turns out that this was not a missing but a broken feature.
This patch corrects the template variables to make enumchron
show up on the item table for item level holds in the OPAC.

To test:
Try to place item level holds on
1) a record where at least one item
2) a record where none of the items
has items.enumchron information.

The column with enumchron should only show for 1), but not
for 2).

Signed-off-by: David Cook <dcook@prosentient.com.au>
Works as described.

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoMerge branch 'bug_10085' into 3.14-master
Jared Camins-Esakov [Tue, 23 Apr 2013 12:34:02 +0000 (08:34 -0400)]
Merge branch 'bug_10085' into 3.14-master

11 years agoBug 10085: unapi does not function under Plack
Jared Camins-Esakov [Sat, 20 Apr 2013 02:52:07 +0000 (22:52 -0400)]
Bug 10085: unapi does not function under Plack

The following errors appear when trying to use unapi under Plack (among
others):
Variable "$cgi" is not available at /home/jcamins/kohaclone/opac/unapi line 160.
Variable "$format_to_stylesheet_map" is not available at /home/jcamins/kohaclone/opac/unapi line 173.
Variable "$format_info" is not available at /home/jcamins/kohaclone/opac/unapi line 174.
Variable "$format_to_stylesheet_map" is not available at /home/jcamins/kohaclone/opac/unapi line 185.

To test:
1) Try to view /cgi-bin/koha/unapi under Plack
2) There is no step 2. Plack crashes.
3) Apply patch.
4) Try to view /cgi-bin/koha/unapi again, and note that it doesn't crash

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
I'm puzzled how this ever worked anyway, accidentally i'm guessing,
this tidies up some lazy coding

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoMerge branch 'bug_9523' into 3.14-master
Jared Camins-Esakov [Mon, 22 Apr 2013 01:06:56 +0000 (21:06 -0400)]
Merge branch 'bug_9523' into 3.14-master

11 years agoBug 9523: importing staged bib records hangs if a matched bib has been deleted
Kyle M Hall [Thu, 7 Feb 2013 14:57:47 +0000 (09:57 -0500)]
Bug 9523: importing staged bib records hangs if a matched bib has been deleted

Test Plan:
1) Stage a MARC record file that will have matches with existing records
2) Delete the bib from Koha that was matched on
3) Attempt to import the records into Koha, the import will hang
4) Apply the patch
5) Reload manage-marc-import.pl and attempt to import again, this time it should succeed.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoMerge branch 'bug_9588' into 3.14-master
Jared Camins-Esakov [Mon, 22 Apr 2013 00:54:25 +0000 (20:54 -0400)]
Merge branch 'bug_9588' into 3.14-master

11 years agoBug 9588: weighted search query with index
Fridolyn SOMERS [Mon, 11 Feb 2013 13:47:09 +0000 (14:47 +0100)]
Bug 9588: weighted search query with index

When QueryWeightFields is enabled, the searching query is created with several options.
In C4::Search::_build_weighted_query, when no index is defined, the query is build with fuzzy and stemming options. When an index is defined, theses options are missing, only unconditional right truncation is used.
The consequence is that when QueryStemming is disabled, a search with index can give more results (due to right truncation) that a search without.

This patch adds stemming and fuzzy on search with index, conditioned with QueryFuzzy and QuerryStemming sysprefs.
Also changes world list search (wrld) weight to r6 in order to set fuzzy search to r8 and stemming search to r9 (like search without index).

Test plan :
- Go to searching preferences (admin/preferences.pl?tab=searching)
- Set QueryAutoTruncate to "only if * is added"
- Set QueryFuzzy and QuerryStemming to "Don't try"
- Set QueryWeightFields to "Enable"
- Go to advanced search page
- Select an indexe (ie Title) and perform a search on a short word
=> Look at zebrarv log and see that query does not contain right truncation : @attr 5=1
- Set QueryFuzzy to "Try"
- Perform same search
=> Look at zebrarv log and see that query contains fuzzy : @attr 5=103
- Set QueryFuzzy to "Don't try" and QuerryStemming to "Try"
- Perform same search
=> Look at zebrarv log and see that query contains rigth truncation on stemmed word : @attr 5=1

Signed-off-by: koha.aixmarseille <koha.aixmarseille@gmail.com>
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
This patch makes Fuzzy and Stemming influence search results on weighted
queries when using an index. Side-effect is however that the results for a
search like index=term* (add truncation manually too) could be LOWER than the
the number of hits for index=term. Further comments on Bugzilla.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoMerge branch 'bug_9984' into 3.14-master
Jared Camins-Esakov [Mon, 22 Apr 2013 00:44:05 +0000 (20:44 -0400)]
Merge branch 'bug_9984' into 3.14-master

11 years agoBug 9984: Remove server-side sort on the hold ratios table
Jonathan Druart [Wed, 3 Apr 2013 13:31:08 +0000 (15:31 +0200)]
Bug 9984: Remove server-side sort on the hold ratios table

JS is a requirement for the staff client, so the sort link on header is
useless.

Test plan:
Check that there is no regression (sort, data, etc.) on the hold ratios
table.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Tested on top of patch for bug 9459.
All tests and QA script pass.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoMerge branch 'bug_10049' into 3.14-master
Jared Camins-Esakov [Sun, 21 Apr 2013 14:00:43 +0000 (10:00 -0400)]
Merge branch 'bug_10049' into 3.14-master

11 years agoBug 10049 [Alternate] Comments tab shows ( ) instead of ( 0 ) on translated templates
Owen Leonard [Mon, 15 Apr 2013 13:23:58 +0000 (09:23 -0400)]
Bug 10049 [Alternate] Comments tab shows ( ) instead of ( 0 ) on translated templates

This patch is an alternate solution to the problem of "0" not appearing
on the comment tab in translated templates. It uses the Template Toolkit
option of specifying a default value for a variable:

[% reviews.size || 0 %]

This syntax is already in use elsewhere in the template.

Same test plan:

1) Make sure comments/reviews are activated
2) Find a record with 0 comments/reviews in the opac
3) The tab shows: Comments ( 0 )
4) Switch to any other languages.
5) Tab now shows: <translation of Comments> ( )
6) Apply patch
7) Check English templates stil work correctly
8) Rerun 'perl translate install <langcode>
9) Check display is now correct.
10) Also check that number shows correctly for records
    with comments.

Signed-off-by: Magnus Enger <magnus@enger.priv.no>
Tested with nb-NO. English still works after the patch. Norwegian
was showing "Comments" untranslated, which had me a bit unnerved.
Turns out the string to be translated changed from "Comments ( %s%s%s%s )"
to "Comments ( %s )", so to make sure all was well, I had to update
the nb-NO translation, fix the number of %s's in the Norwegian string,
make sure it was not marked as fuzzy and then install nb-NO. And it
works!

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoMerge branch 'bug_9839' into 3.14-master
Jared Camins-Esakov [Sun, 21 Apr 2013 13:57:10 +0000 (09:57 -0400)]
Merge branch 'bug_9839' into 3.14-master

11 years agoBug 9839 - when importing MARC records, item record not created even when set to...
Kyle M Hall [Wed, 27 Mar 2013 17:57:01 +0000 (13:57 -0400)]
Bug 9839 - when importing MARC records, item record not created even when set to "always add"

Test Plan:
1) Catalog a new record with an ISBN
2) Add some items to the record
3) Download the record as MARCXML
4) Delete the itemnumbers from the 952 fields in the record,
   Change the barcode fields to unused barcodes
5) Use xml2marc to save as a standard MARC file
6) Import the record using the 'Stage MARC for import' tool
   Use the settings:
       Record matching rule: ISBN
       Action if matching record found: ignore
       Action if no match found: ignore
       Item processing: always_add
       Check for embedded item record data?: Yes
       How to process items: Always add items
7) Import, note the bib is ignored, and the items are not processed
8) Undo import into catalog
8) Apply this patch
9) Import this batch into the catalog
10) Note the items were processed and are now added to the matching
record

Signed-off-by: Mathieu Saby <mathieu.saby@univ-rennes2.fr>
Tested with UNIMARC record. I followed the test plan, just changing 952 by 995
Signed-off-by: Mason James <mtj@kohaaloha.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoMerge branch 'bug_9995' into 3.14-master
Jared Camins-Esakov [Sun, 21 Apr 2013 13:54:56 +0000 (09:54 -0400)]
Merge branch 'bug_9995' into 3.14-master

11 years agoBug 9995 - For reference items no longer listed in XSLT result lists
Kyle M Hall [Mon, 8 Apr 2013 13:07:43 +0000 (09:07 -0400)]
Bug 9995 - For reference items no longer listed in XSLT result lists

Re-added the xsl that shouldn't have been removed.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Tested with different settings for OpacItemLocation
and not for loan set in the item and for the item type.

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoMerge branch 'bug_10065' into 3.14-master
Jared Camins-Esakov [Sun, 21 Apr 2013 13:47:14 +0000 (09:47 -0400)]
Merge branch 'bug_10065' into 3.14-master

11 years agoBug 10065 - Style invoice edit form according to standard structure
Owen Leonard [Tue, 16 Apr 2013 13:37:24 +0000 (09:37 -0400)]
Bug 10065 - Style invoice edit form according to standard structure

The structure of the invoice edit form does not match that of similar
forms in the staff client. This patch alters it to be consistent.

To test you must also have the patch for Bug 10046 applied.

Go to Acquisitions -> Invoices and search for invoices. Click an invoice
to view/edit details. The form displaying fields for shipment date,
billing date, etc. should look correct and work correctly.

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoAdd Barry Cannon to the history file
Jared Camins-Esakov [Sun, 21 Apr 2013 13:43:16 +0000 (09:43 -0400)]
Add Barry Cannon to the history file

Welcome, Barry, you are the 208th developer with a patch in Koha!

11 years agoMerge branch 'bug_8745' into 3.14-master
Jared Camins-Esakov [Sun, 21 Apr 2013 13:41:56 +0000 (09:41 -0400)]
Merge branch 'bug_8745' into 3.14-master

11 years agoBug 8745: General whitespace and tab tidy
Mason James [Tue, 2 Apr 2013 09:36:16 +0000 (22:36 +1300)]
Bug 8745: General whitespace and tab tidy

http://bugs.koha-community.org/show_bug.cgi?id=8745
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
1) Runs not with root.
2) Runs with root and -run-as-root.
3) Runs using the normal koha user.

Note: Maybe the message should be clear about why
running as root is bad and which user you should
be running the script with?
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoBug 8745 - Disallow rebuild_zebra.pl from executing, when run by root user.
Barry Cannon [Mon, 10 Sep 2012 14:23:29 +0000 (15:23 +0100)]
Bug 8745 - Disallow rebuild_zebra.pl from executing, when run by root user.

Added a check to warn users of execution as root user.
Added a 'runas-root' switch to allow users to force execution as root user.

Signed-off-by: Mason James <mtj@kohaaloha.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoMerge branch 'bug_9613' into 3.14-master
Jared Camins-Esakov [Sun, 21 Apr 2013 13:38:40 +0000 (09:38 -0400)]
Merge branch 'bug_9613' into 3.14-master

11 years agoBug 9613: items namespace missing in XSLT
Fridolyn SOMERS [Thu, 14 Feb 2013 13:23:30 +0000 (14:23 +0100)]
Bug 9613: items namespace missing in XSLT

In some XSLT, "items" namespace is used in exclude-result-prefixes but is not defined.

This patch add this namespace where missing.
Also corrects a koha.org, instead of koha-community.org, in one namespace URL.

Test plan :
- Enable XSLT on search results
- Perform a search
=> Look at error logs to check that there is no xsl error like :
[Fri Feb 08 15:35:06 2013] [error] [client 127.0.0.1] [Fri Feb  8 15:35:06 2013] opac-search.pl: compilation error: file koha-tmpl/opac-tmpl/prog/en/xslt/UNIMARCslimUtils.xsl line 8 element stylesheet, referer: http://opac.master.community.localhost/cgi-bin/koha/opac-detail.pl?biblionumber=299
[Fri Feb 08 15:35:06 2013] [error] [client 127.0.0.1] [Fri Feb  8 15:35:06 2013] opac-search.pl: xsl:exclude-result-prefixes : undefined namespace items, referer: http://opac.master.community.localhost/cgi-bin/koha/opac-detail.pl?biblionumber=299

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Mathieu Saby <mathieu.saby@univ-rennes2.fr>
Passed-QA-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
With comment on Bugzilla.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoMerge branch 'bug_10046' into 3.14-master
Jared Camins-Esakov [Sun, 21 Apr 2013 13:37:15 +0000 (09:37 -0400)]
Merge branch 'bug_10046' into 3.14-master

11 years agoBug 10046: Standardize terms used in invoices
Katrin Fischer [Sun, 14 Apr 2013 15:29:20 +0000 (17:29 +0200)]
Bug 10046: Standardize terms used in invoices

Changes are:
budget > where actually fund is meant
branch > library
bookseller, supplier > vendor

To test:

1) Receive a shipment, check the little form where you
   enter your invoice number for correct use of terms.
2) Receive some orders and save finish receiving.
3) Search for your created invoice. Check filters and
   results table for correct use of terms.
4) Look at the details of your invoice, repeat check there.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoMerge branch 'bug_9860' into 3.14-master
Jared Camins-Esakov [Sun, 21 Apr 2013 13:33:56 +0000 (09:33 -0400)]
Merge branch 'bug_9860' into 3.14-master

11 years agoBug 9860 [Alternate] Incorrect box heading 'Cannot check in' when a late document...
Owen Leonard [Mon, 8 Apr 2013 14:13:11 +0000 (10:13 -0400)]
Bug 9860 [Alternate] Incorrect box heading 'Cannot check in' when a late document is returned

The fix for Bug 9397 moved the "cannot check in" heading from within the
one conditional where it should have been displayed to the top of all
check-in errors/messages. "Cannot check in" is still only valid if the
item is withdrawn and BlockReturnOfWithdrawnItems is ON.

In order to accomplish the goal of Bug 9397 while fixing Bug 9860 this
patch puts "cannot check in" back into the correct conditional and adds
a generic heading to check in messages for accessibility purposes.

To test, check in items which will trigger a variety of errors
including:

- item must be returned to home library
- item is lost
- item is withdrawn (wtih BlockReturnOfWithdrawnItems on and off)
- item is overdue

...as well as items which should check in normally. Messages should
display correctly.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoMerge branch 'bug_8746' into 3.14-master
Jared Camins-Esakov [Sun, 21 Apr 2013 13:23:33 +0000 (09:23 -0400)]
Merge branch 'bug_8746' into 3.14-master

11 years agoBug 8746 [Follow-up] Replace == by eq in string comparison
Julian Maurice [Tue, 19 Mar 2013 13:54:32 +0000 (13:54 +0000)]
Bug 8746 [Follow-up] Replace == by eq in string comparison

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
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>
11 years agoBug 8746: Fix indexation in DOM index mode
Julian Maurice [Fri, 11 Jan 2013 10:57:41 +0000 (11:57 +0100)]
Bug 8746: Fix indexation in DOM index mode

When in DOM index mode, files exported by `rebuild_zebra.pl -x` are
wrapped by '<collection></collection>' tag.
This is a problem because splitting files produces invalid files.
This is fixed by adding the missing <collection> tags in each generated
file.
Another problem was that the wrong zebra configuration file was used.
The script now uses C4::Context->zebraconfig($server)->{config} to know
which configuration file has to be used.

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoBug 8746: rebuild_zebra_sliced.sh now export/index records as MARCXML
Julian Maurice [Thu, 20 Sep 2012 10:12:31 +0000 (12:12 +0200)]
Bug 8746: rebuild_zebra_sliced.sh now export/index records as MARCXML

This avoid indexing failures due to "bad offset" or "bad length" error
with ISO2709 format

+ minor improvements:
  -  --length parameter is optional. If not given, it will execute the
     right sql query to find the number of records to index
  -  new parameter --reset-index. If set, index is reset before indexing

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

Test: Edit record to make it longer than 9999. Without patch rebuild_sliced
fails. With patches works.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoMerge branch 'bug_9951' into 3.14-master
Jared Camins-Esakov [Sat, 20 Apr 2013 03:26:20 +0000 (23:26 -0400)]
Merge branch 'bug_9951' into 3.14-master

11 years agoBug 9951: Followup for tools/viewlog.pl
Marcel de Rooy [Tue, 2 Apr 2013 13:17:31 +0000 (15:17 +0200)]
Bug 9951: Followup for tools/viewlog.pl

Adds utf8 cgi parameter decoding.

Test plan: Enter diacritics in librarian field. Submit. Check.

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
This is ok in this case, as we are not doing any post/get of binary
data, but I note from the man page

This makes CGI.pm treat all parameters as UTF-8 strings. Use this with
care, as it will interfere
with the processing of binary uploads. It is better to
manually select which fields are expected
to return utf-8 strings and convert them using code like
this:

  use Encode;
  my $arg = decode utf8=>param('foo');
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoBug 9951: Followup for Tools
Marcel de Rooy [Tue, 2 Apr 2013 12:06:02 +0000 (14:06 +0200)]
Bug 9951: Followup for Tools

Adds decoding for Patron Cards/Patron Search and Tags (moderation).

Test plan:
Goto Tools. Add accent with diacritics in both areas. Check if you do not see
converted characters.

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoMerge branch 'bug_10072' into 3.14-master
Jared Camins-Esakov [Sat, 20 Apr 2013 03:17:01 +0000 (23:17 -0400)]
Merge branch 'bug_10072' into 3.14-master

11 years agoBug 10072 - "my suggestions" always says "There are no pending purchase suggestions."
Kyle M Hall [Wed, 17 Apr 2013 18:07:55 +0000 (14:07 -0400)]
Bug 10072 - "my suggestions" always says "There are no pending purchase suggestions."

Test Plan:
1) Switch off the IndependantBranches syspref
2) Log into the OPAC
3) Place a suggestions
4) Instead of seeing your suggestion, you will see "There are no pending
   purchase suggestions."
5) Apply this patch
6) Reload the page
7) You should now see your suggestions

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoMerge branch 'bug_10019' into 3.14-master
Jared Camins-Esakov [Sat, 20 Apr 2013 03:13:24 +0000 (23:13 -0400)]
Merge branch 'bug_10019' into 3.14-master

11 years agoBug 10019: Fix for userid containing UTF8 chars
Marcel de Rooy [Wed, 10 Apr 2013 08:13:52 +0000 (10:13 +0200)]
Bug 10019: Fix for userid containing UTF8 chars

Decodes userid on two places in checkauth of C4/Auth.pm

Test plan:
Include some non-Latin characters in your userid (loginname). Arab, Chinese?
Login into opac and check user page.
Go to staff (no new login), check your login name at various places.
Logout, login via staff.
Do the same.
Go to opac again (no new login), check user page.
Optionally: Remove all your sessions from table. Do a login. Check sessions.

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Comment: Works as described. No errors.
This patch fixes this problem, but I wonder if
there is a general solution that handle all as utf8.
Tested in opac and staff.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoMerge branch 'bug_10074' into 3.14-master
Jared Camins-Esakov [Sat, 20 Apr 2013 03:07:14 +0000 (23:07 -0400)]
Merge branch 'bug_10074' into 3.14-master

11 years agoBug 10074: QA Followup for InstallAuth.pm
Marcel de Rooy [Fri, 19 Apr 2013 12:44:35 +0000 (14:44 +0200)]
Bug 10074: QA Followup for InstallAuth.pm

Moving use Output.pm to optional require.

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoBug 10074 - Encoding problems for installer
Tomas Cohen Arazi [Thu, 18 Apr 2013 19:27:03 +0000 (16:27 -0300)]
Bug 10074 - Encoding problems for installer

Bug 6554 patched output_html_with_http_headers to encode utf8 data, and Templates.pm to expect utf8 data to be encoded.
The Installer page login screen outputs directly to STDOUT (InstallAuthAuth.pm does, WHICH IS WRONG!) and wasn't fixed to do the encoding first.

This patch makes it use output_html_with_http_headers and solves the problem.

Regards
To+

Sponsored-by: Universidad Nacional de Cordoba
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoBug 10074 - Encoding problems at login time
Tomas Cohen Arazi [Thu, 18 Apr 2013 18:07:40 +0000 (15:07 -0300)]
Bug 10074 - Encoding problems at login time

Bug 6554 patched output_html_with_http_headers to encode utf8 data, and Templates.pm to expect utf8 data to be encoded.
(At least) the staff login screen outputs directly to STDOUT (Auth.pm does, WHICH IS WRONG!) and wasn't fixed to do the encoding first.

This patch makes it use output_html_with_http_headers and solves the problem.

Changed 'use' for 'require' as jcamins and marcelr suggested.

Regards
To+

Sponsored-by: Universidad Nacional de Cordoba
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoMerge branch 'bug_10058' into 3.14-master
Jared Camins-Esakov [Sat, 20 Apr 2013 02:57:37 +0000 (22:57 -0400)]
Merge branch 'bug_10058' into 3.14-master

11 years agoBug 10058 - Fix unapi for NORMARC
Magnus Enger [Mon, 15 Apr 2013 19:56:53 +0000 (21:56 +0200)]
Bug 10058 - Fix unapi for NORMARC

This patch uses a lot of MARC21 XSLT to transform NORMARC records
to desired formats. Since NORMARC is mostly a subset of MARC21, I
think this should give passable results. And better results than
no unapi-support at all for NORMARC!

To reproduce:
- Make sure you have marcflavour = NORMARC
- Visit /cgi-bin/koha/unapi in a browser
- Observe the empty <formats></formats> element

To test:
- Apply the patch
- Visit /cgi-bin/koha/unapi in a browser
- Observe the the list of formats in the <formats></formats> element
- Import the provided sample NORMARC record and make a note of its
  biblionumber
- View the record at /cgi-bin/koha/unapi?id=koha:biblionumber:x&format=y
  where x = the biblionumber of the sample record and y = one of the
  formats marcxml, marcxml-full, mods, mods-full, mods3, mods3-full,
  oai_dc, rdfdc, rss2, rss2-full and srw_dc
- Check that the transformed records make some kind of superficial
  sense

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoMerge branch 'bug_7368' into 3.14-master
Jared Camins-Esakov [Thu, 18 Apr 2013 13:48:06 +0000 (09:48 -0400)]
Merge branch 'bug_7368' into 3.14-master

11 years ago7368 Typo in edithelp.pl warning
Marcel de Rooy [Mon, 15 Apr 2013 13:05:54 +0000 (15:05 +0200)]
7368 Typo in edithelp.pl warning

Typo: able save => able to save.

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoBug 7368: Typo in kohastructure.sql documentation line
Marcel de Rooy [Thu, 4 Apr 2013 07:58:17 +0000 (09:58 +0200)]
Bug 7368: Typo in kohastructure.sql documentation line

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoMerge branch 'bug_6554' into 3.14-master
Jared Camins-Esakov [Thu, 18 Apr 2013 13:29:32 +0000 (09:29 -0400)]
Merge branch 'bug_6554' into 3.14-master

11 years agoBug 6554 Fix error caused by modifying $_ in a map
Colin Campbell [Thu, 4 Apr 2013 09:54:03 +0000 (10:54 +0100)]
Bug 6554 Fix error caused by modifying $_ in a map

Error 'Modification of a read-only value attempted' triggered
on login because of manipulation of $_ in the map

Moved the mod to a loop as recommended in the doc for map

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoMerge branch 'bug_10000' into 3.14-master
Jared Camins-Esakov [Thu, 18 Apr 2013 13:18:18 +0000 (09:18 -0400)]
Merge branch 'bug_10000' into 3.14-master

11 years agoBug 10000 - Little typo in intranet-tmpl/prog/en/modules/help/tools/letter.tt: sliip
Owen Leonard [Mon, 8 Apr 2013 14:26:06 +0000 (10:26 -0400)]
Bug 10000 - Little typo in intranet-tmpl/prog/en/modules/help/tools/letter.tt: sliip

This patch removes the extra i in "sliip."

To test, go to Tools -> Notices & Slips and view the help file. The last
bulleted item on the page should contain no typo.

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Comment: Can't resist to sign Bug 10000!!
Work as described. No errors.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Can't resist to QA - All tests and QA script pass.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoMerge branch 'bug_10002' into 3.14-master
Jared Camins-Esakov [Thu, 18 Apr 2013 13:11:59 +0000 (09:11 -0400)]
Merge branch 'bug_10002' into 3.14-master

11 years agoBug 10002 - Don't include line breaks in strings that are translated
Owen Leonard [Tue, 9 Apr 2013 19:44:45 +0000 (15:44 -0400)]
Bug 10002 - Don't include line breaks in strings that are translated

Several JS alert messages contain "\n" which is problematic for
translation. This patch removes those instances (a line break is not
strictly necessary anyway). Also corrected: two instances of "holds(s)"

To test, place a hold on a title with items. From the biblio detail page
choose Edit -> Delete all items and Edit -> Delete record. In each case
you should see error messages with no line breaks and no misspellings.

Delete all items attached to the record with holds from the item edit
page. Go back to the detail page and choose Edit -> Delete record. You
should see an error message about existing hold(s) with no line breaks
or misspellings.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Harmless change, fixes misspellings and makes translations easier

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoMerge branch 'bug_10008' into 3.14-master
Jared Camins-Esakov [Thu, 18 Apr 2013 12:58:48 +0000 (08:58 -0400)]
Merge branch 'bug_10008' into 3.14-master

11 years agoBug 10008 - Serials search results 'Opened' tab should be 'Open'
Owen Leonard [Tue, 9 Apr 2013 19:27:15 +0000 (15:27 -0400)]
Bug 10008 - Serials search results 'Opened' tab should be 'Open'

The searials search results "Opened" tab should be labeled "Open." This
patch makes this correction and changes the wording in another place
which used "opened." Markup has also been added to maintain consistency
in display of messages.

To test, perform a search for a subscription. If your search returns
results you should see an "Open" and a "Closed" tab. To test other
affected changes perform searches which return no results, only open
subscriptions, or only closed subscriptions. "No results" messages
should display correctly and consistently.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoMerge branch 'bug_10042' into 3.14-master
Jared Camins-Esakov [Thu, 18 Apr 2013 12:36:24 +0000 (08:36 -0400)]
Merge branch 'bug_10042' into 3.14-master

11 years agoBug 10042 - Minor typo ("Communnity") in packages docs
Tomas Cohen Arazi [Sun, 14 Apr 2013 00:31:14 +0000 (21:31 -0300)]
Bug 10042 - Minor typo ("Communnity") in packages docs

VERY trivial string patch. Couldn't help sending it.

To+

Signed-off-by: Magnus Enger <magnus@enger.priv.no>
Thanks for fixing my typo! I did not test by building packages
etc, but by grepping for "Communnity". The patch removes
all occurences of the typo.

Passed-QA-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoMerge branch 'bug_9997' into 3.14-master
Jared Camins-Esakov [Thu, 18 Apr 2013 12:33:13 +0000 (08:33 -0400)]
Merge branch 'bug_9997' into 3.14-master

11 years agoBug 9997 - Suspected typo in patron self registration code
Kyle M Hall [Mon, 8 Apr 2013 13:32:08 +0000 (09:32 -0400)]
Bug 9997 - Suspected typo in patron self registration code

String fix. The field name is also incorrect, causing the alternate
contact country to not be stored.

To test: Submit an update to an existing patron record an include a
change to the alternate contact's country field. Before the patch this
line would not appear in the staff client for approval. After the patch
it should.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Reminder: Even small patches require test plans. I have added one which
I think covers the changes in the patch.

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>
11 years agoMerge branch 'bug_9737' into 3.14-master
Jared Camins-Esakov [Thu, 18 Apr 2013 12:25:48 +0000 (08:25 -0400)]
Merge branch 'bug_9737' into 3.14-master

11 years agoBug 9737 - Local Covers sometimes appear then disappear on OPAC Search Results/Lists
David Cook [Fri, 1 Mar 2013 02:22:33 +0000 (13:22 +1100)]
Bug 9737 - Local Covers sometimes appear then disappear on OPAC Search Results/Lists

The current problem:

When the verify_images() function runs from amazonimages.js, it loops
through every img element and selects the elements that come from Amazon
sources.

However, if the height/width is 1 (i.e. Amazon passes off a blank image)
or if the img element's complete property is null or non-existent, then
it searches for the parent node and re-writes the HTML with the "No
Cover Image Available" (NO_AMAZON_IMAGE) text, even though that parent
node might contain other img elements that have images available (from
Google, local images, etc)!

Proposed fix:

Wrap the Amazon image in a span tag (as we do with the Google and local
covers), so that it re-writes the HTML within that parent span, rather
than the parent anchor which contains all the other images.

To test:

1) Turn on the OPACAmazonCoverImages, GoogleJackets, and
   OPACLocalCoverImages system preferences
2) Replace the ISBN in one of your records with 9780615352435
3) Now load a local cover image for that record
4) Search for that record (but make sure you're vague enough to have
   multiple search results)
5) For a split second, you may notice the local cover image appears before being replaced by a "No Cover Image Available".

Now apply this patch

6) Refresh your search results page
7) You should now see your local cover image, PLUS the "No Cover Image
   Available" for the Amazon image, and whatever other graphics/"no
   cover image available" "graphics" for the Google Jackets.

To be comprehensive, try the same set of steps using the OPAC Lists
rather than the OPAC Search Results

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoMerge branch 'bug_9894' into 3.14-master
Jared Camins-Esakov [Thu, 18 Apr 2013 11:55:27 +0000 (07:55 -0400)]
Merge branch 'bug_9894' into 3.14-master

11 years agoBug 9894: Add labels for checkboxes
Jonathan Druart [Thu, 4 Apr 2013 07:47:25 +0000 (09:47 +0200)]
Bug 9894: Add labels for checkboxes

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoBug 9894 - (3.12) Small followup
Tomas Cohen Arazi [Wed, 3 Apr 2013 18:50:49 +0000 (15:50 -0300)]
Bug 9894 - (3.12) Small followup

Liz's patch adds the 'flagged' value back, but there's a problem with its logic that prevents it to work on startup (works fine for changing values)

Regards
To+

Sponsored-by: Universidad Nacional de Córdoba
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoBug 9894 - Followup: Add support for "flagged" values
Liz Rea [Fri, 29 Mar 2013 09:33:33 +0000 (22:33 +1300)]
Bug 9894 - Followup: Add support for "flagged" values

Even though we don't know what they mean or do.

To test:
- open the docs to have at hand the list of codes/visibility options combinations and
try changing several subfields from a single tagfield. Save, and reopen the "Edit subfields" page.
- Click the "Flagged" checkbox - it should disable the other checkboxes as this setting is (apparently) exclusive to the others.
- Step through several tabs and set your visibilities as you like.
- I had a MySQL shell opened to repeatedly run this query (i tested against field 886
  on the default framework):
>  SELECT tagfield,tagsubfield,hidden FROM marc_subfield_structure WHERE frameworkcode='' AND tagfield=886;
- Compare what was saved on the DB with the docs for that visibility selection.

Bug 9894 - Help file updates

To test:

Click the Help link in the upper right hand corner of the MARC subfield editor
Verify that the epic list of values is gone
Verify that the help page overall looks alright
Verify that the help makes sense and is understandable.

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoBug 9894 - (3.12) de-serialize the 'hidden' value for subfields in frameworks
Tomas Cohen Arazi [Tue, 26 Mar 2013 01:55:11 +0000 (22:55 -0300)]
Bug 9894 - (3.12) de-serialize the 'hidden' value for subfields in frameworks

This patch aims to provide a non-intrusive way (with respect to Koha's code, so
it could have got into 3.12) for the users to easily choose the visibility settings
for each subfield.

This patch is also known to have arrived late for 3.12. I've been struggling with
other stuff at work, but I just wanted to put this somewhere just in case it can
be reused or something else.

The patch adds two JavaScript functions that deal with (de)serialization of the 'hidden'
value for subfields. One each way. Listeners are added to the checkboxes so the (actually, heh)
'hidden' value gets correctly updated on each checkbox change.

There's a costly function to update all checkboxes on every tab to match the 'hidden' value on page load.

To test:
- open the docs to have at hand the list of codes/visibility options combinations and
try changing several subfields from a single tagfield. Save, and reopen the "Edit subfields" page.
- I had a MySQL shell opened to repeatedly run this query (i tested against field 886
  on the default framework):
>  SELECT tagfield,tagsubfield,hidden FROM marc_subfield_structure WHERE frameworkcode='' AND tagfield=886;
- Compare what was saved on the DB with the docs for that visibility selection.

Regards
To+

PS: I promise I'll work on the proper patch for 3.14, which would involve DB structure changes and
(more than I expected) rewriten code.

Sponsored-by: Universidad Nacional de Córdoba
Signed-off-by: Liz Rea <liz@catalyst.net.nz>
I promise to hug you the next time we meet. This works, and is a reasonable work around for a very longstanding awkward interface.

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoMerge remote branch 'origin/new/bug_10018_10061_deb_pkg_fixes'
Galen Charlton [Tue, 16 Apr 2013 15:16:26 +0000 (08:16 -0700)]
Merge remote branch 'origin/new/bug_10018_10061_deb_pkg_fixes'

11 years agoBug 10061 - Fix tinymce path references broken by bug 9172
Robin Sheat [Mon, 15 Apr 2013 23:07:19 +0000 (11:07 +1200)]
Bug 10061 - Fix tinymce path references broken by bug 9172

Only affects the package builds

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
11 years agoBug 10018 - version update for 3.13
Robin Sheat [Wed, 10 Apr 2013 02:33:33 +0000 (14:33 +1200)]
Bug 10018 - version update for 3.13

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
11 years agoMerge branch 'bug_9172' into 3.14-master
Jared Camins-Esakov [Mon, 15 Apr 2013 13:32:07 +0000 (09:32 -0400)]
Merge branch 'bug_9172' into 3.14-master

11 years agoBug 9172 - Move TinyMCE library outside of language-specific directory
Owen Leonard [Thu, 29 Nov 2012 19:58:53 +0000 (14:58 -0500)]
Bug 9172 - Move TinyMCE library outside of language-specific directory

This patch removes the TinyMCE library from its language-specific
location and puts it in intranet-tmpl/lib. The most recent version
of TinyMCE is used, and the files added have been limited to
those required for proper functionality of the editor.

Files omitted: documentation, examples, unused plugins.

To test, visit each page which uses the TinyMCE editor: News
editing (tools/koha-news.pl), library editing (admin/branches.pl),
and online help editing (help/edithelp.pl). The editor should
look and function as before.

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Signed-off-by: Mason James <mtj@kohaaloha.com>
(cherry picked from commit 81714f8141de147a9133944057b059df47160315
 on github.com/KohaAloha/Koha-Dev:bug_9172)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Corrected authorship and date

11 years agoMerge branch 'bug_9463' into 3.14-master
Jared Camins-Esakov [Mon, 15 Apr 2013 13:16:05 +0000 (09:16 -0400)]
Merge branch 'bug_9463' into 3.14-master

11 years agoBug 9463 [Revised] Use DataTables on patron sent notices page
Owen Leonard [Wed, 23 Jan 2013 17:25:39 +0000 (12:25 -0500)]
Bug 9463 [Revised] Use DataTables on patron sent notices page

Replace the tablesorter plugin with the DataTables plugin on the
patron sent notices page.

This patch adds default sorting by time (descending).

This patch depends on the one for Bug 9887, which introduces a new
DataTables plugin to allow sorting on data embedded in a <span>'s
"title" attribute. This allows sorting to be done on an unformatted
datetime.

To test, open the sent notices page for a patron who has multiple sent
notices. Confirm that table sorting works correctly with various date
format settings.

Revision corrects an error which occurs when there are no notices:
Instead of displaying an empty table with a message the table is not
displayed and a standard dialog message is displayed. In order to
prevent page-specific CSS and JS from conflicting with the standard
"message" class the page-specific classes have been changed from
"message*" to "notice*" Test this change by viewing a page with existing
notices and clicking the titles to show/hide the notice contents.

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>
11 years agoMerge branch 'bug_9905' into 3.14-master
Jared Camins-Esakov [Mon, 15 Apr 2013 13:13:36 +0000 (09:13 -0400)]
Merge branch 'bug_9905' into 3.14-master

11 years agoBug 9905 - Use DataTables on calendar page
Owen Leonard [Fri, 22 Mar 2013 17:38:13 +0000 (13:38 -0400)]
Bug 9905 - Use DataTables on calendar page

The calendar management page uses the old tablesorter plugin. This patch
replaces tablesorter code with DataTables.

In order to easily sort date columns under various dateformat system
preference settings, date columns now sort based on an unformatted date
in a <span>'s title attribute (requiring the patch for Bug 9887).

To test, view the calendar page--preferably with plenty of existing
holiday data to populate the holiday summary tables. Confirm that
sorting works correctly on all sorted tables with the dateformat
preference set in all settings.

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Note: This has to be tested together with the patch for bug 9887.
All tests and QA script pass.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoMerge branch 'bug_9887' into 3.14-master
Jared Camins-Esakov [Mon, 15 Apr 2013 13:10:16 +0000 (09:10 -0400)]
Merge branch 'bug_9887' into 3.14-master

11 years agoBug 9887 [Revised] Use DataTables on circulation page
Owen Leonard [Thu, 21 Mar 2013 15:31:43 +0000 (11:31 -0400)]
Bug 9887 [Revised] Use DataTables on circulation page

The circulation page, when the  UseTablesortForCirc preference is
enabled, uses the old tablesorter plugin. It should use DataTables
instead.

This patch removes references to the tablesorter plugin and makes these
changes to enable use of DataTables:

- Pass two new unformatted date variables to the template from
  circulation.pl so that sorting can be performed on this data.
- Add DataTables configurations for the table of checkouts and the
  table of relatives' checkouts.
- Add a new plugin to the main DataTables configuration script to allow
  sorting on data embedded in a <span>'s 'title' attribute.
- Add <span>s to each table with a title attribute containing the
  unformatted date data which DataTables needs to perform correct
  sorting.  This eliminates the need for a special sorting algorithm to
  accomodate various date and datetime formatting options.
- Set a template variable for checking whether circ exports are enabled.
  This reduces repetition. DataTables configuration changes based on how
  many columns are present.

To test, load the circulation page for patrons who match various
conditions:

- Having only checkouts from today
- Having checkouts from today and previous days
- Having checkouts only from previous days
- Having relatives who have checkouts (from today, from previous days,
  from both)

Test these situations with UseTablesortForCirc enabled and disabled.
Test these situations with circ exports enabled or disabled (with
ExportRemoveFields filled or empty, for instance).

Sorting should work correctly on all columns with the dateformat
preference set to any option.

All other circulation functions should work normally.

Revision adds missing include for table footer when there are previous
checkouts and removes &nbsp; from empty table header cells which were
messing up auto-detection of numeric data. The global CSS for table
borders has been tightened up to improve handling of alternating row
colors in DataTables-sorted tables.

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
All tests and QA script pass.
Note: Don't forget it's the checkout tab and to turn on the
preference to allow sorting there.
Also, while checkouts sorts dates correctly, sorting on the
details tabs was not always correct in my tests.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoMerge branch 'bug_9414' into 3.14-master
Jared Camins-Esakov [Mon, 15 Apr 2013 12:52:40 +0000 (08:52 -0400)]
Merge branch 'bug_9414' into 3.14-master