koha.git
8 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>
8 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

8 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>
8 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

8 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>
8 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

8 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>
8 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>
8 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>
8 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

8 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>
8 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

8 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>
8 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>
8 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

8 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>
8 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

8 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>
8 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

8 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>
8 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

8 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>
8 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

8 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>
8 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

8 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>
8 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

8 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>
8 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

8 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>
8 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>
8 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>
8 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>
8 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'

8 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>
8 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>
8 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

8 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

8 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

8 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>
8 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

8 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>
8 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

8 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>
8 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

8 years agoBug 9414 - Fix sample letters for German and Norwegian
Magnus Enger [Mon, 18 Mar 2013 14:42:03 +0000 (15:42 +0100)]
Bug 9414 - Fix sample letters for German and Norwegian

Some letters were missing or not translated in the German and
Norwegian data for the webinstaller. This patch adds them.

German
- RENEWAL (present, but not translated)
- OPAC_REG_VERIFY (missing)

Norwegian
- RENEWAL (present, but not translated)
- ISSUESLIP (missing)
- ISSUEQSLIP (missing)
- RESERVESLIP (missing)
- TRANSFERSLIP (missing)
- OPAC_REG_VERIFY (missing)

To test:
- Install Norwegian and German* translations
- Run through the web installer in German, making sure that
  the sample letters are selected
- Check that there are no errors in the web installer
- Check <intranet>/cgi-bin/koha/tools/letter.pl - that the
  letters look OK, and are translated
- Repeat the process for Norwegian

* = I had some problems with installing the German
translations that are in master, but now I can't reproduce
it. If you run into a problem where only some of the
subdirectories of koha-tmpl/intranet-tmpl/prog/de-DE/modules/
are cerated, try downloading and installing the 3.10 .po
files from Pootle.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
8 years agoMerge branch 'bug_9986' into 3.14-master
Jared Camins-Esakov [Mon, 15 Apr 2013 12:46:27 +0000 (08:46 -0400)]
Merge branch 'bug_9986' into 3.14-master

8 years agoBug 9986: Two fixes for Z3950 search
Marcel de Rooy [Wed, 3 Apr 2013 14:36:25 +0000 (16:36 +0200)]
Bug 9986: Two fixes for Z3950 search

Searching for stdid: Standard ID, srchany: RAW (any) somehow did not work
anymore.
Probably my fault :) Note that these two fields are in Cataloging Z3950 search
and not in Acquisition.

Fixing encoding problems: When adding -utf flag for CGI in acqui/z3950 and
cataloging/z3950, the decoding statements in C4/Breeding, Z3950Search should be
removed.

Test plan:
Search in Cataloging with:
Standard ID: 9782358670043 on LOC
RAW (any): musee [add an accent aigu on first e]  on LOC  -- Add diacritic!!!

Search in Acquisition
Somewhere, does not matter, but use a diacritic.

A note: My git version still has a hard time with utf8. Need to upgrade to version 1.7.10 to resolve this..

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Comment: Work as described. No errors
Without patch z39.50 search for example Std ID OR musee gives no results,
with patch there are.
No problems in acq search.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Good catch, passes all tests and QA script.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
8 years agoMerge branch 'bug_9591' into 3.14-master
Jared Camins-Esakov [Mon, 15 Apr 2013 12:41:00 +0000 (08:41 -0400)]
Merge branch 'bug_9591' into 3.14-master

8 years agoMerge branch 'bug_9933' into 3.14-master
Jared Camins-Esakov [Mon, 15 Apr 2013 12:40:50 +0000 (08:40 -0400)]
Merge branch 'bug_9933' into 3.14-master

8 years agoMerge branch 'bug_9591' into 3.12-master
Jared Camins-Esakov [Mon, 15 Apr 2013 12:36:15 +0000 (08:36 -0400)]
Merge branch 'bug_9591' into 3.12-master

8 years agoBug 9591 : Set Library changes after viewing Holds Queue >> reserves item
Chris Cormack [Mon, 8 Apr 2013 09:20:51 +0000 (21:20 +1200)]
Bug 9591 : Set Library changes after viewing Holds Queue >> reserves item

To test
1. Log in to the staff client. Note your logged in library.
2. Navigate to Circulation -> Holds queue.
3. Select a holds queue report for a library other than your own.
4. From the holds queue report page, click the "Check out" tab and
   enter the card number of a patron who has holds.
5. On the circulation page for that patron, click the "Holds" tab.
6. Click one of the titles in the list of holds.

Your logged in branch will now match the library you chose for the
holds queue report.

Alternate sequence:

4. From the holds queue report page, click the "Check out" tab and
   do a non-exact search (search which will return more than one result)
   for a patron who has holds.
5. Choose the correct patron from the list of results.

Your logged in branch will now match the library you chose for
the holds queue report.

Apply the patch and repeat, this time it should not change your logged
in branch

Signed-off-by: Mirko Tietgen <mirko@abunchofthings.net>
Weird bug, the patch works for me.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Good catch. All tests and QA script pass.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
8 years agoMerge branch 'bug_9933' into 3.12-master
Jared Camins-Esakov [Mon, 15 Apr 2013 12:31:44 +0000 (08:31 -0400)]
Merge branch 'bug_9933' into 3.12-master

8 years agoBug 9933: Unable to edit or add rules for any branch except default
Chris Cormack [Mon, 8 Apr 2013 08:43:45 +0000 (20:43 +1200)]
Bug 9933: Unable to edit or add rules for any branch except default

To test
1/ Select a branch in circ rules
2/ Edit or add a rule, note this change is made for default instead of
the library you selected
3/ Apply the patch
4/ Try 1 and 2 again

Signed-off-by: Mirko Tietgen <mirko@abunchofthings.net>
Works as expected.
Signed-off-by: Mason James <mtj@kohaaloha.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
8 years agoBug 8770 - amount does not equal amountoutstanding on a fine with no payments or...
Kyle M Hall [Wed, 3 Apr 2013 17:05:52 +0000 (13:05 -0400)]
Bug 8770 - amount does not equal amountoutstanding on a fine with no payments or credits

If a lost item fee is owed and partially paid off when an item is
returned and a refund is processed, Koha tries to pay off existing
fees before adding any leftover balance as a credit on the account.

However, those fee payments aren't actually processed, due to a bug
where the accountnumber was quoted as a string literal, and thus the
for the fee payment would fail. This did not result in an DB error,
as the query was still valid SQL. Checking the return value of the
query would have revealed that the accountline had not been updated.

History:
This bug was introduced on April 23, 2007 with the commit
'reintroducing fixaccountforlostandreturned as requested by rosalie'.
Commit id 111d590e9cdaf801256822e23f170bfc2365338f

On July 30, 2009 the error was flagged with a FIXME and remained
in that state until now.
Commit id 51e8fc2cb6a0cf79f19206c822a4361aeca6f63f

Test plan:
1) Create a test patron
2) Check out an item to that patron and give it a due date in the past
3) Run fines.pl to generate the fine for the item
4) Mark the item long overdue on the item tab (not in edit items)
5) Pay for the lost item
6) Check the item back in
7) Note the incorrect fines. Only the lost fee balance  due is refunded,
   not the entire lost fee, but no other fees are paid off.
8) Apply the patch
9) Repeat steps 1-6, then not the fines are paid correctly

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Totel due is correct after applying the patch.
All tests and QA script pass.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
8 years agoMerge remote branch 'origin/new/bug_8770'
Galen Charlton [Mon, 8 Apr 2013 03:16:51 +0000 (20:16 -0700)]
Merge remote branch 'origin/new/bug_8770'

8 years agoBug 8770 - amount does not equal amountoutstanding on a fine with no payments or...
Kyle M Hall [Wed, 3 Apr 2013 17:05:52 +0000 (13:05 -0400)]
Bug 8770 - amount does not equal amountoutstanding on a fine with no payments or credits

If a lost item fee is owed and partially paid off when an item is
returned and a refund is processed, Koha tries to pay off existing
fees before adding any leftover balance as a credit on the account.

However, those fee payments aren't actually processed, due to a bug
where the accountnumber was quoted as a string literal, and thus the
for the fee payment would fail. This did not result in an DB error,
as the query was still valid SQL. Checking the return value of the
query would have revealed that the accountline had not been updated.

History:
This bug was introduced on April 23, 2007 with the commit
'reintroducing fixaccountforlostandreturned as requested by rosalie'.
Commit id 111d590e9cdaf801256822e23f170bfc2365338f

On July 30, 2009 the error was flagged with a FIXME and remained
in that state until now.
Commit id 51e8fc2cb6a0cf79f19206c822a4361aeca6f63f

Test plan:
1) Create a test patron
2) Check out an item to that patron and give it a due date in the past
3) Run fines.pl to generate the fine for the item
4) Mark the item long overdue on the item tab (not in edit items)
5) Pay for the lost item
6) Check the item back in
7) Note the incorrect fines. Only the lost fee balance  due is refunded,
   not the entire lost fee, but no other fees are paid off.
8) Apply the patch
9) Repeat steps 1-6, then not the fines are paid correctly

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Totel due is correct after applying the patch.
All tests and QA script pass.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
8 years agoMerge branch 'bug_9381' into 3.12-master
Jared Camins-Esakov [Sun, 7 Apr 2013 17:49:09 +0000 (13:49 -0400)]
Merge branch 'bug_9381' into 3.12-master

8 years agoBug 9381: Increment version number
Jared Camins-Esakov [Sun, 7 Apr 2013 17:48:46 +0000 (13:48 -0400)]
Bug 9381: Increment version number

Database update for bug 9381 has been given version 3.11.00.202

8 years agoFollowup 2 - Bug 9381 - Add Catalan language
Bernardo Gonzalez Kriegel [Sat, 16 Feb 2013 15:43:31 +0000 (12:43 -0300)]
Followup 2 - Bug 9381 - Add Catalan language

Sorry, this followup fulfills K. Fischer request to
base de-DE file in english one.

The differences are small corrections and added languages.

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Rebased to master

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
8 years agoFollowup Bug 9381 - Add Catalan language
Bernardo Gonzalez Kriegel [Sat, 16 Feb 2013 15:28:05 +0000 (12:28 -0300)]
Followup Bug 9381 - Add Catalan language

This followup adds Catalan language into languages
other than english.

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Rebased to master

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
8 years agoBug 9381: Add Catalan language
Bernardo Gonzalez Kriegel [Sun, 13 Jan 2013 02:23:33 +0000 (23:23 -0300)]
Bug 9381: Add Catalan language

Simply add catalan language.

No translation yet, so can't be really tested.
But it will come soon.

Until then, to test:
1) cp misc/translator/po/es-ES* to ca-ES*
2) do perl translate install ca-ES,
3) apply the patch
4) run updatedatabase.pl
5) enable language and display on system preferences.
6) check labels

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Rebased to current master

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
8 years agoMerge branch 'bug_9812' into 3.12-master
Jared Camins-Esakov [Sun, 7 Apr 2013 17:44:37 +0000 (13:44 -0400)]
Merge branch 'bug_9812' into 3.12-master

8 years agoBug 9812 - Forbid access to several files through the browser
Tomas Cohen Arazi [Wed, 13 Mar 2013 17:24:20 +0000 (14:24 -0300)]
Bug 9812 - Forbid access to several files through the browser

This patch hides (-Indexes) and forbids (Deny from all) access to some stuff through a browser.
Specifically "xlst", "modules" and "includes" dirs and its contents.

This is just a quick fix we talked about at IRC. The proper solution would be to remove this from htdocs which will still be needed.

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>
I do not have an installation that uses Apache at this point, but the
changes look correct and this was signed off and QAed by Chris and
Jonathan, both of whom have Apache installations.

8 years agoMerge branch 'bug_8200' into 3.12-master
Jared Camins-Esakov [Sun, 7 Apr 2013 17:38:10 +0000 (13:38 -0400)]
Merge branch 'bug_8200' into 3.12-master

8 years agoBug 8200: Follow up - Removing unused file stats.pl
Katrin Fischer [Sun, 7 Apr 2013 12:15:14 +0000 (14:15 +0200)]
Bug 8200: Follow up - Removing unused file stats.pl

Patch removes misc/translator/stats.pl that is no
longer used and references deleted script
update.pl in same directory.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
8 years agoBug 8200 - removing misc/translator/update.pl - deprecated file
Chris Cormack [Sun, 24 Mar 2013 06:08:11 +0000 (19:08 +1300)]
Bug 8200 - removing misc/translator/update.pl - deprecated file

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Patch removes unused file.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
8 years agoMerge branch 'bug_7853' into 3.12-master
Jared Camins-Esakov [Sun, 7 Apr 2013 17:34:15 +0000 (13:34 -0400)]
Merge branch 'bug_7853' into 3.12-master

8 years agoBug 7853 - opac-maintanance.pl should correctly redirect back to opac-main.pl, if...
Mason James [Tue, 2 Apr 2013 08:20:12 +0000 (21:20 +1300)]
Bug 7853 - opac-maintanance.pl should correctly redirect back to opac-main.pl, if no updates are outstanding

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Works exactly as it should according to the test plan. This is a nice
improvement.

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Amended patch: Check OpacMaintenance!

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
8 years agoMerge branch 'bug_9459' into 3.12-master
Jared Camins-Esakov [Sun, 7 Apr 2013 17:30:57 +0000 (13:30 -0400)]
Merge branch 'bug_9459' into 3.12-master

8 years agoBug 9459 [Revised] Use DataTables on hold ratios report page
Owen Leonard [Wed, 23 Jan 2013 15:57:09 +0000 (10:57 -0500)]
Bug 9459 [Revised] Use DataTables on hold ratios report page

Replace the tablesorter plugin with the DataTables plugin on the
hold ratios report page.

To test, open the hold ratios report (Circulation -> Hold ratios).
Confirm that table sorting works correctly.

Revision adds correct pagination options and natural sort for 'items
needed' column.

Patch now depends on Bug 9431
(http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=9431) which
introduces the natural sort plugin.

Further revision corrects template path to datatables assets.

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Comment: On top of Bug 9431. Sorting works. No errors.
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
8 years agoMerge branch 'bug_9850' into 3.12-master
Jared Camins-Esakov [Sun, 7 Apr 2013 17:28:19 +0000 (13:28 -0400)]
Merge branch 'bug_9850' into 3.12-master

8 years agoBug 9850: FOLLOW UP: Add Missing Plugin Help for 3.12
Nicole C. Engard [Tue, 2 Apr 2013 12:31:10 +0000 (08:31 -0400)]
Bug 9850: FOLLOW UP: Add Missing Plugin Help for 3.12

This patch is a follow up to the one that adds the plugin help.

To test:

Visit the upload a plugin page and review the help and links.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Fixed capitalization issues.

8 years agoBug 9850: Update Tools Help for 3.12
Nicole C. Engard [Sat, 30 Mar 2013 17:40:08 +0000 (13:40 -0400)]
Bug 9850: Update Tools Help for 3.12

Update the text and links in the Tools help files.

To test:

Check the text and links on all help files under Tools.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
I fixed one instance of a link to 3.10 instead of 3.12.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
8 years agoBug 9850: Add Plugin Help File for 3.12
Nicole C. Engard [Sat, 30 Mar 2013 17:42:40 +0000 (13:42 -0400)]
Bug 9850: Add Plugin Help File for 3.12

This adds a help file to the new plugins module.

To test:

Activate the plugin module and check the text and links in the help file

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
8 years agoBug 9850: Update Circ Help Files for 3.12
Nicole C. Engard [Sat, 30 Mar 2013 16:23:49 +0000 (12:23 -0400)]
Bug 9850: Update Circ Help Files for 3.12

This updates the text and links for the Circulation Help Files.  It also removes
an unused help file 'billing.tt'.

To test:

Visit the help files on all circ pages and confirm links and text are right.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
8 years agoBug 9850: Offline Circ Help Files for 3.12
Nicole C. Engard [Sat, 30 Mar 2013 15:25:36 +0000 (11:25 -0400)]
Bug 9850: Offline Circ Help Files for 3.12

This updates the text and links in the offline circulation tool help files.

To test:

Visit all offline circulation pages in the staff client and review the text and links.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
8 years agoBug 9850: Suggestion Help File for 3.12
Nicole C. Engard [Sat, 30 Mar 2013 14:36:02 +0000 (10:36 -0400)]
Bug 9850: Suggestion Help File for 3.12

This updates the text and link on the suggestions help file.

To test:

Visit the manage suggestions page and review the help file.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
8 years agoBug 9850: Serial Help Files for 3.12
Nicole C. Engard [Sat, 30 Mar 2013 14:18:24 +0000 (10:18 -0400)]
Bug 9850: Serial Help Files for 3.12

Update text and links for Serials help files.

To test:

Visit all serial related pages and check the text of the help and
test the links.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
8 years agoBug 9850: Update Reports Help for 3.12
Nicole C. Engard [Sat, 30 Mar 2013 14:14:06 +0000 (10:14 -0400)]
Bug 9850: Update Reports Help for 3.12

This updates the reports help for Koha 3.12.

To test:

Visit all reports pages and review the help for textual changes
and correct links.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
8 years agoBug 9850: Cataloging Help for 3.12
Nicole C. Engard [Sat, 30 Mar 2013 13:35:14 +0000 (09:35 -0400)]
Bug 9850: Cataloging Help for 3.12

This updates just the links in the cataloging help, no text changes where made.

To test:

Visit help in cataloging and click the manual links and make sure they're right.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
8 years agoMerge branch 'bug_9902' into 3.12-master
Jared Camins-Esakov [Sun, 7 Apr 2013 17:20:40 +0000 (13:20 -0400)]
Merge branch 'bug_9902' into 3.12-master

8 years agoBug 9902 - item subfields not populating
Kyle M Hall [Wed, 27 Mar 2013 13:18:24 +0000 (09:18 -0400)]
Bug 9902 - item subfields not populating

Test Plan:
1) Create a new serial with a default location, call number, and library
   ( the library will need to be any but the one you are logged in as )
2) Click the "Recieve" button for this serial
3) Click "Click to add item"
4) Note those values are not populated
5) Apply the patch
6) Reload the page
7) Click "Click to add item"
8) Note those values are now populated

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

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
This seems to restore the former behaviour.

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>
8 years agoMerge branch 'bug_7449' into 3.12-master
Jared Camins-Esakov [Sun, 7 Apr 2013 17:08:31 +0000 (13:08 -0400)]
Merge branch 'bug_7449' into 3.12-master

8 years agoBug 7449: billingplace and freedeliveryplace not saved when creating a new basketgroup
Fridolyn SOMERS [Fri, 22 Feb 2013 09:14:15 +0000 (10:14 +0100)]
Bug 7449: billingplace and freedeliveryplace not saved when creating a new basketgroup

billingplace and freedeliveryplace are missing in C4::Acquisition::NewBasketgroup.

Test plan :
- Go to a vendor basket groups
- Create a new basket group
- Enter a name
- Choose a billing place
- Do not choose a delivery place in combobox but enter a text in delivery place textarea
- Enter a comment
- Save
- Edit created basket group
=> Check that billing place and free delivery place are ok

Signed-off-by: Mathieu Saby <mathieu.saby@univ-rennes2.fr>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works according to test plan, delivery place is now
correctly saved into the databas and was before lost.
All tests and QA script pass.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
8 years agoMerge branch 'bug_8061' into 3.12-master
Jared Camins-Esakov [Sun, 7 Apr 2013 16:52:23 +0000 (12:52 -0400)]
Merge branch 'bug_8061' into 3.12-master

8 years agoBug 8061: Follow Up (Opac-Prog) - enhancement to D Ruth's patch
Karam Qubsi [Fri, 5 Apr 2013 19:47:08 +0000 (22:47 +0300)]
Bug 8061: Follow Up (Opac-Prog) - enhancement to D Ruth's patch

In this Patch I added some changes to the rtl.css file
I made some changes in the file opac-bottom.inc and add css
classes to the lang list and I define the class value in
the opac.css
I add If statment to the opac-detail.tt to chose the rtl.css
when rtl lang.

http://bugs.koha-community.org/show_bug.cgi?id=8061

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Reformatted commit message and added bug number.

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Tested with po files for Arabic from 3.8.
All tests and QA script pass.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
8 years agoBug 8061: Follow up - RTL CSS overrides (staff client)
Karam Qubsi [Fri, 5 Apr 2013 10:07:43 +0000 (13:07 +0300)]
Bug 8061: Follow up - RTL CSS overrides (staff client)

I think this patch is good for th rtl langs.
and based on what D.Ruth send before, I added some edits
as a right to left reader.

Tested on master with Arabic
I used the updated po files for v. 3.8 (because the 3.12 )
need some revision ...

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
8 years agoBug 8061: RTL CSS overrides (OPAC)
D Ruth Bavousett [Fri, 5 Apr 2013 14:58:33 +0000 (17:58 +0300)]
Bug 8061: RTL CSS overrides (OPAC)

This patch repairs a few things in templates and CSS to allow
for the injection of right-to-left CSS, also in this patch.
It should apply to 3.8 and master.

To test, install and enable a right-to-left language for the
OPAC, currently Hebrew or Arabic.
The Arabic OPAC translations for 3.6 are mostly-complete, so
they are a good test case.

It's helpful to have a reader of the language handy, but the
layout should be easy enough to figure out, even for
non-readers.

Signed-off-by: Karam Qubsi <karamqubsi@gmail.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Amended patch adding back author and adding sign off.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
8 years agoBug 8061: RTL CSS overrides (staff client)
D Ruth Bavousett [Fri, 5 Apr 2013 09:41:25 +0000 (12:41 +0300)]
Bug 8061: RTL CSS overrides (staff client)

This patch tweaks a few templates, and enables right-to-left
flipping via CSS in the staff client.

Signed-off-by: Karam Qubsi <karamqubsi@gmail.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Amended patch, putting back author and adding sign off.

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
8 years agoMerge branch 'bug_9980' into 3.12-master
Jared Camins-Esakov [Sun, 7 Apr 2013 16:15:11 +0000 (12:15 -0400)]
Merge branch 'bug_9980' into 3.12-master

8 years agoBug 9980: Fix for anonymous searches
Chris Cormack [Sun, 7 Apr 2013 07:55:37 +0000 (19:55 +1200)]
Bug 9980: Fix for anonymous searches

To test
Search in the OPAC both logged and logged out

Signed-off-by: Magnus Enger <magnus@enger.priv.no>
When I turn off XSLT for the OPAC I can recreate the problem.
After applying the patch things work as expected for all
combinations of:
- Search results and detail view
- Logged in and not logged in
- XSLT and non-XSLT view

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Passes all tests, QA script and test plan.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
8 years agoMerge branch 'bug_9981' into 3.12-master
Jared Camins-Esakov [Wed, 3 Apr 2013 11:16:08 +0000 (07:16 -0400)]
Merge branch 'bug_9981' into 3.12-master

8 years agoBug 9981: Handle sort1 field when duplicating patron
Owen Leonard [Tue, 26 Mar 2013 14:19:58 +0000 (10:19 -0400)]
Bug 9981: Handle sort1 field when duplicating patron

It is noted in Bug 5432 that during a duplicate operation one field,
'Sort1' does not automatically clear when the cursor moves into it. This
patch corrects this.

Edit a patron record to have data in the Sort1 and Sort2 fields. Perform
a duplicate operation on this patron and confirm that the Sort1 and
Sort2 fields show the information from the original patron record. When
you click on each field the contents should disappear.

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>
8 years agoMerge branch 'bug_4862' into 3.12-master
Jared Camins-Esakov [Wed, 3 Apr 2013 11:09:22 +0000 (07:09 -0400)]
Merge branch 'bug_4862' into 3.12-master

8 years agobug 4862 - Change label of Browse by subject or author to Authority search
Liz Rea [Wed, 27 Mar 2013 03:14:43 +0000 (16:14 +1300)]
bug 4862 - Change label of Browse by subject or author to Authority search

Replicate:
Load the OPAC
You should see "Browse by Subject or Author right below the search box

To test:
Apply patch
Load the OPAC
You should see "Authority search" where "Browse by Subject or Author" was .

Signed-off-by: Mason James <mtj@kohaaloha.com>
Amended patch: change strings in opac-authorities-home.tt

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
8 years agoMerge branch 'bug_9683' into 3.12-master
Jared Camins-Esakov [Wed, 3 Apr 2013 11:03:52 +0000 (07:03 -0400)]
Merge branch 'bug_9683' into 3.12-master

8 years agoBug 9683: Allow disable rewrite apache mod
Fridolyn SOMERS [Thu, 21 Feb 2013 14:26:32 +0000 (15:26 +0100)]
Bug 9683: Allow disable rewrite apache mod

In Apache config koha-httpd.conf, URL-rewriting is enabled and does not
allow to disable mod_rewrite. Also, first rewriting rule
"RewriteRule (.+) $1?%1%2 [N,R,NE]" is enabled by default. This rule
rewrites nearly every URL. I propose to comment it in sources so that is
must be intentionally enabled.

This patch sets rewriting options into a conditional tag.

Test plan :
Test OPAC and intranet with and without mod_rewrite activated.

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Mason James <mtj@kohaaloha.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
The new Apache configuration seems to work fine (or at least as "fine"
as Apache gets) both with and without mod_rewrite enabled.

8 years agoMerge branch 'bug_9877' into 3.12-master
Jared Camins-Esakov [Wed, 3 Apr 2013 10:16:29 +0000 (06:16 -0400)]
Merge branch 'bug_9877' into 3.12-master

8 years agoBug 9877: Followup: FIX if the table is empty.
Jonathan Druart [Wed, 27 Mar 2013 15:02:36 +0000 (16:02 +0100)]
Bug 9877: Followup: FIX if the table is empty.

If there is no data, we don't display the table.

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>