koha.git
9 years agoMerge branch 'bug_7387' into 3.12-master
Jared Camins-Esakov [Thu, 7 Mar 2013 15:59:16 +0000 (10:59 -0500)]
Merge branch 'bug_7387' into 3.12-master

9 years agoFollow-up Bug 7387 - Add Template::Toolkit plugin to allow caching of includes
Bernardo Gonzalez Kriegel [Tue, 19 Feb 2013 01:24:29 +0000 (22:24 -0300)]
Follow-up Bug 7387 - Add Template::Toolkit plugin to allow caching of includes

Fixes tabulations.

Signed-off-by: Elliott Davis <elliott@bywatersolions.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
9 years agoBug 7387 : Adding a caching plugin for Template::Toolkit
Chris Cormack [Thu, 29 Dec 2011 20:25:29 +0000 (09:25 +1300)]
Bug 7387 : Adding a caching plugin for Template::Toolkit

To use this you need to do something like

-[% INCLUDE 'doc-head-open.inc' %]
+[% USE cache = Cache %]
+[% cache.inc(
+    'template' => 'doc-head-open.inc',
+    'keys' => {'dochead' => 'dochead'},
+    'ttl' => 360
+    )
+%]

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Comment: Works. Tested modifying as described opac-main.tt
Follow up to fix tabulations.

Signed-off-by: Elliott Davis <elliott@bywatersolions.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
9 years agoMerge branch 'bug_9435' into 3.12-master
Jared Camins-Esakov [Thu, 7 Mar 2013 15:56:13 +0000 (10:56 -0500)]
Merge branch 'bug_9435' into 3.12-master

9 years agoBug 9435 [Revised] Use DataTables on libraries and groups administration page
Owen Leonard [Sun, 20 Jan 2013 00:00:34 +0000 (19:00 -0500)]
Bug 9435 [Revised] Use DataTables on libraries and groups administration page

Replace the tablesorter plugin with the DataTables plugin on the
libraries and groups administration page.

To test, open the libraries and groups administration page (Administration
-> Libraries and groups). Confirm that table sorting works correctly.

Revision corrects template path to datatables assets.

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Comment: Sort works. No errors.
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Amended patch: Add the aLengthMenu key for DataTables + delete an unused
div block (used for pager)
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
9 years agoMerge branch 'bug_9428' into 3.12-master
Jared Camins-Esakov [Thu, 7 Mar 2013 15:54:40 +0000 (10:54 -0500)]
Merge branch 'bug_9428' into 3.12-master

9 years agoBug 9428 [Revised] Use DataTables in Authority MARC frameworks page
Owen Leonard [Fri, 18 Jan 2013 18:00:49 +0000 (13:00 -0500)]
Bug 9428 [Revised] Use DataTables in Authority MARC frameworks page

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

To test, open the Authority MARC frameworks page (Authority types ->
MARC structure). Confirm that table sorting works correctly.

Revision corrects template path to datatables assets.

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Comment: Work as described. No errors.
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Amended patch: Add the aLengthMenu key for DataTables
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
9 years agoMerge branch 'bug_9429' into 3.12-master
Jared Camins-Esakov [Thu, 7 Mar 2013 15:52:17 +0000 (10:52 -0500)]
Merge branch 'bug_9429' into 3.12-master

9 years agoBug 9429 [Revised] Use DataTables on Authorized Values page
Owen Leonard [Fri, 18 Jan 2013 19:28:36 +0000 (14:28 -0500)]
Bug 9429 [Revised] Use DataTables on Authorized Values page

Replace the tablesorter plugin with the DataTables plugin on the
Authorized Values page.

To test, open the Authorized Values page (Administration -> Authorized
values). Confirm that table sorting works correctly.

Revision corrects template path to datatables assets.

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Comment: Work as described. No errors.
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Amended patch: Add the aLengthMenu key for DataTables
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
9 years agoMerge branch 'bug_9430' into 3.12-master
Jared Camins-Esakov [Thu, 7 Mar 2013 15:50:21 +0000 (10:50 -0500)]
Merge branch 'bug_9430' into 3.12-master

9 years agoBug 9430 [Revised] Use DataTables on library transfer limits page
Owen Leonard [Fri, 18 Jan 2013 19:55:59 +0000 (14:55 -0500)]
Bug 9430 [Revised] Use DataTables on library transfer limits page

Replace the tablesorter plugin with the DataTables plugin on the
library transfer limits page.

Also made minor changes to "check/uncheck all" function to prevent page
from jumping on click, and removed unused function.

To test, open the library transfer limits page (Administration ->
Library transfer limits). Confirm that table sorting works correctly for
all tables.

Test that the "check all/uncheck all" links still work correctly.

Revision corrects template path to datatables assets.

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Comment: Work as described. No errors.
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Amended patch: Add the aLengthMenu key for DataTables + delete an unused
div block (used for pager)
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
9 years agoMerge branch 'bug_9437' into 3.12-master
Jared Camins-Esakov [Thu, 7 Mar 2013 15:45:54 +0000 (10:45 -0500)]
Merge branch 'bug_9437' into 3.12-master

9 years agoBug 9437 [Revised] Use DataTables on itemtypes administration page
Owen Leonard [Sun, 20 Jan 2013 01:13:33 +0000 (20:13 -0500)]
Bug 9437 [Revised] Use DataTables on itemtypes administration page

Replace the tablesorter plugin with the DataTables plugin on the
itemtypes administration page.

To test, open the itemtypes administration page (Administration
-> Item types). Confirm that table sorting works correctly.

Revision corrects template path to datatables assets.

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Comment: Sorting works. No errors.
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Amended patch: Delete an unused div block (used for pager).
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
9 years agoMerge branch 'bug_9444' into 3.12-master
Jared Camins-Esakov [Thu, 7 Mar 2013 15:43:21 +0000 (10:43 -0500)]
Merge branch 'bug_9444' into 3.12-master

9 years agoBug 9444 [Revised] Use DataTables in system preferences editor
Owen Leonard [Tue, 22 Jan 2013 17:17:55 +0000 (12:17 -0500)]
Bug 9444 [Revised] Use DataTables in system preferences editor

Replace the tablesorter plugin with the DataTables plugin in the
"new" system preferences editor.

To test, open the system preferences editor on any tab other than Local
Use. Confirm that table sorting works correctly within each section. In
this configuration there should be no pager and no results filtering.

Revision corrects template path to datatables assets.
Further revision fixes section-collapse JS

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Comment: Work as described. Collapsing restored. No errors.
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
9 years agoMerge branch 'bug_9446' into 3.12-master
Jared Camins-Esakov [Thu, 7 Mar 2013 15:41:44 +0000 (10:41 -0500)]
Merge branch 'bug_9446' into 3.12-master

9 years agoBug 9446 [Revised] Use DataTables on Z39.50 servers administration page
Owen Leonard [Tue, 22 Jan 2013 17:57:28 +0000 (12:57 -0500)]
Bug 9446 [Revised] Use DataTables on Z39.50 servers administration page

Replace the tablesorter plugin with the DataTables plugin on the
Z39.50 servers administration page. Structural changes were made to
deal with a DataTables bug which prevents it from properly parsing a
<th> with a colspan.

This patch also moves embedding of the toolbar and table-sorting JS from
within the body of the page to the <head> for sake of consistency.

To test, open the Z39.50 servers administration page (Administration ->
Z39.50 client targets). Confirm that table sorting works
correctly.

Revision corrects template path to datatables assets.

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Comment: Table sorting works. No errors.
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Amended patch: Add the aLengthMenu key for DataTables
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
9 years agoMerge branch 'bug_9450' into 3.12-master
Jared Camins-Esakov [Thu, 7 Mar 2013 15:38:29 +0000 (10:38 -0500)]
Merge branch 'bug_9450' into 3.12-master

9 years agoBug 9450 [Revised] Use DataTables in cataloging Z39.50 search results
Owen Leonard [Tue, 22 Jan 2013 20:08:41 +0000 (15:08 -0500)]
Bug 9450 [Revised] Use DataTables in cataloging Z39.50 search results

Replace the tablesorter plugin with the DataTables plugin in cataloging
Z39.50 search results.

Structural changes were made to the table markup to deal with a
DataTables bug which prevents it from properly parsing a <th> with a
colspan.

To test, go to cataloging and perform a Z39.50 search. Confirm that
table sorting works correctly. In this configuration there
should be no pager and no results filtering.

Revision corrects template path to datatables assets.

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Comment: Sorting works. No errors.
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
9 years agoMerge branch 'bug_9649' into 3.12-master
Jared Camins-Esakov [Thu, 7 Mar 2013 15:28:51 +0000 (10:28 -0500)]
Merge branch 'bug_9649' into 3.12-master

9 years agoBug 9649 - Replace YUI buttons on cataloging home page with Bootstrap
Owen Leonard [Tue, 19 Feb 2013 21:14:52 +0000 (16:14 -0500)]
Bug 9649 - Replace YUI buttons on cataloging home page with Bootstrap

This patch converts the buttons on the cataloging home page to
Bootstrap, replacing the YUI button and menu code with Bootstrap markup.

This patch moves the functionality of cataloging-toolbar.inc
into addbooks.tt since it is the only place where the include
was used. cataloging-toolbar.inc is removed.

To test, view the cataloging home page. Buttons and menus should look
correct and work correctly.

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

Please sign Bug 3549

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works nicely, no problems found.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
9 years agoMerge branch 'bug_9672' into 3.12-master
Jared Camins-Esakov [Thu, 7 Mar 2013 15:25:18 +0000 (10:25 -0500)]
Merge branch 'bug_9672' into 3.12-master

9 years agoBug 9672 - Replace YUI buttons on MARC editor page with Bootstrap
Owen Leonard [Wed, 20 Feb 2013 13:38:20 +0000 (08:38 -0500)]
Bug 9672 - Replace YUI buttons on MARC editor page with Bootstrap

This patch converts the buttons on the MARC editor page to Bootstrap,
replacing YUI button and menu code with Bootstrap markup.

Various workflows must be tested to confirm that functionality
remains unchanged:

- Edit existing record. Clicking the "save" button should redirect
  you to the default "view" page for that record.
- Create a new record. Clicking the "save" button should redirect you to
  the add/edit items screen.
- When creating or editing a record, test the dropdown menu attached to
  the "save" button. Each function should work correctly.
- Test using a user who does not have "edit items" permission. There
  should be no menu attached to the "save" button.
- Test using fast cataloging through circulation. A single save button
  should appear, redirecting to items.

In all cases validation should proceed before saving. Leave a required
field empty to test.

Testers should also confirm that Z39.50 button works as expected and
changing frameworks still works as usual.

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Comment: All workflows tested, with resticted and super user.
All buttons worked as expected. No errors.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works nicely, no problems found.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
9 years agoMerge branch 'bug_9676' into 3.12-master
Jared Camins-Esakov [Thu, 7 Mar 2013 15:20:41 +0000 (10:20 -0500)]
Merge branch 'bug_9676' into 3.12-master

9 years agoBug 9676 - Replace YUI buttons on authorities editor page with Bootstrap
Owen Leonard [Wed, 20 Feb 2013 20:52:24 +0000 (15:52 -0500)]
Bug 9676 - Replace YUI buttons on authorities editor page with Bootstrap

This patch converts the "Save" button on the authorities editor page to
Bootstrap, replacing YUI button code with Bootstrap markup.

This patch also adds the float effect to the toolbar to match that on
the MARC editor page.

To test, create a new authority or load an existing one. The "Save"
button should look correct and work correctly. When you scroll the page
down, the toolbar should "stick" to the top of the browser window so
that the "Save" button stays visible.

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Comment: Button works and looks good. The toolbart sticks when scrolling,
but I see a gap between the box of the save button, and the top of
the window (tested with chrome, opera, firefox).

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works nicely.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
9 years agoMerge branch 'bug_9688' into 3.12-master
Jared Camins-Esakov [Thu, 7 Mar 2013 15:18:20 +0000 (10:18 -0500)]
Merge branch 'bug_9688' into 3.12-master

9 years agoBug 9688 - Replace YUI button on Authority MARC framework toolbar with Bootstrap
Owen Leonard [Thu, 21 Feb 2013 20:46:48 +0000 (15:46 -0500)]
Bug 9688 - Replace YUI button on Authority MARC framework toolbar with Bootstrap

This patch converts the toolbar used on the Authority MARC framework
toolbar to Bootstrap, replacing YUI button code with Bootstrap markup.

To test, view auth_tag_structure.pl for any authority framework. Confirm
that the 'New tag' button looks correct and works correctly.

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Comment: Works and looks correctly. No errors.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works nicely, no problems found.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
9 years agoMerge branch 'bug_9689' into 3.12-master
Jared Camins-Esakov [Thu, 7 Mar 2013 15:16:39 +0000 (10:16 -0500)]
Merge branch 'bug_9689' into 3.12-master

9 years agoBug 9689 - Replace YUI buttons on the OAI sets administration page with Bootstrap
Owen Leonard [Thu, 21 Feb 2013 21:12:22 +0000 (16:12 -0500)]
Bug 9689 - Replace YUI buttons on the OAI sets administration page with Bootstrap

This patch converts the toolbar on the OAI sets administration page to
Bootstrap, replacing YUI button code with Bootstrap markup.

To test, view the OAI sets administration page and confirm that the "New
set" button looks correct and works correctly.

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Comment: Works and looks nice. No errors.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works nicely, no problems found.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
9 years agoMerge branch 'bug_9693' into 3.12-master
Jared Camins-Esakov [Thu, 7 Mar 2013 15:03:48 +0000 (10:03 -0500)]
Merge branch 'bug_9693' into 3.12-master

9 years agoBug 9693 - Remove YUI styling from buttons on the patron card creator's image manage...
Owen Leonard [Fri, 22 Feb 2013 13:59:43 +0000 (08:59 -0500)]
Bug 9693 - Remove YUI styling from buttons on the patron card creator's image manage page

Buttons on the patron card creator's image manage page are styled using
YUI. They can be classified as submit buttons rather than toolbar
buttons, so they should have default submit button styles.

This patch removes YUI styling and related JavaScript. Other minor
changes: Markup corrections for validity.

To test, view the patron card creator's image manage page. "Upload" and
"Delete" buttons should look correct and work correctly. Upload and
delete operations should function normally.

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

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works nicely and is more consistent.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
9 years agoMerge branch 'bug_9694' into 3.12-master
Jared Camins-Esakov [Thu, 7 Mar 2013 14:57:38 +0000 (09:57 -0500)]
Merge branch 'bug_9694' into 3.12-master

9 years agoBug 9694 - Remove YUI styling from buttons on the patron card creator manage pages
Owen Leonard [Fri, 22 Feb 2013 14:26:01 +0000 (09:26 -0500)]
Bug 9694 - Remove YUI styling from buttons on the patron card creator manage pages

Buttons on the patron card creator's manage pages (manage templates,
manage profiles, etc) are styled using YUI. They can be classified as
submit buttons rather than toolbar buttons, so they should have default
submit button styles.

This patch removes YUI styling and related JavaScript. Other minor
changes: Escaping strings in JavaScript for translation.

To test, view the patron card creator's manage page for layouts,
templates, profiles, and batches. "Edit," "Delete," and "Export" buttons
should look correct and work correctly.

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Comment: Work as described. On errors.
Tested all manage pages, edit, delete, and export buttons.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works nicely, improves consistency.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
9 years agoMerge branch 'bug_9696' into 3.12-master
Jared Camins-Esakov [Thu, 7 Mar 2013 14:55:24 +0000 (09:55 -0500)]
Merge branch 'bug_9696' into 3.12-master

9 years agoBug 9696 - Remove YUI styling from buttons on patron card creator edit pages
Owen Leonard [Fri, 22 Feb 2013 14:52:10 +0000 (09:52 -0500)]
Bug 9696 - Remove YUI styling from buttons on patron card creator edit pages

Submit and cancel buttons on patron card creator edit pages should not
be styled differently than other submit and cancel controls.

This patch removes YUI styling of these controls and makes them
consistent with controls on other Koha pages. The "Cancel" button has
been removed altogether from the batch edit page since there is not a
corresponding submit button.

To test, got to the patron card creator and edit a batch, a layout, a
profile, and a template. Submit and cancel controls should look correct
and work correctly.

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

Note: It's true that edit batch has not a submit button, but
on the other managed pages (layout, profile, template) cancel
aborts editing and takes you to a list of objects (layout, etc.)
Now if we selected the wrong batch, we need to click on left menu o
back button (yay). Are we loosing a consistent interface?
Just thinking.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works as described, more consistent with Koha's general interface
patterns.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
9 years agoMerge branch 'bug_9698' into 3.12-master
Jared Camins-Esakov [Thu, 7 Mar 2013 14:52:22 +0000 (09:52 -0500)]
Merge branch 'bug_9698' into 3.12-master

9 years agoBug 9698 - Replace YUI buttons on patron card creator manage toolbar with Bootstrap
Owen Leonard [Fri, 22 Feb 2013 15:50:23 +0000 (10:50 -0500)]
Bug 9698 - Replace YUI buttons on patron card creator manage toolbar with Bootstrap

This patch converts the toolbar include file used by the patron card
creator home and manage pages to Bootstrap, replacing YUI button and
menu code with Bootstrap markup.

This patch converts the previous menu buttons to plain buttons,
removing the redundant links to the manage pages, which are in the
left-hand sidebar. This keeps toolbar buttons within the general
category of "action" (as opposed to "view").

To test, view the patron card creator home page and any manage page
("Manage layouts," "Manage profiles," etc). Buttons should look correct
and work correctly.

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Comment: Work as described. No errors.
No "plus" sign for this buttons?

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
No plus signs? :)
Works nicely and didn't have the plus before, so it's ok.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
9 years agoMerge branch 'bug_9586' into 3.12-master
Jared Camins-Esakov [Thu, 7 Mar 2013 14:50:04 +0000 (09:50 -0500)]
Merge branch 'bug_9586' into 3.12-master

9 years agoBug 9586 - Remove $ENV{DEBUG} info from Member Template
David Cook [Mon, 11 Feb 2013 05:42:56 +0000 (16:42 +1100)]
Bug 9586 - Remove $ENV{DEBUG} info from Member Template

Currently, if $ENV{DEBUG} is set (for example to 1), the debug level
will be printed on the Add/Edit Patron pages (memberentrygen.tt) in the
form of: "Debug is on (level 1)".

While many if not most folks might not set $ENV{DEBUG} on a production
system, there is no reason to have this information printing on the
member template(s).

No where else in Koha is there a template that prints $ENV{DEBUG}
information, with the exception of calendar.inc, although that doesn't
activate until at least debug level 2 or 5, so it might be worth holding
on to. It is certainly more complicated than simply printing the debug
level. I don't do development on the calendars, so I'm not going to
address that one.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Elliott Davis <elliott@bywatersolions.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
9 years agoMerge branch 'bug_9267' into 3.12-master
Jared Camins-Esakov [Thu, 7 Mar 2013 14:47:26 +0000 (09:47 -0500)]
Merge branch 'bug_9267' into 3.12-master

9 years agoBug 9267 - Ubuntu 12.04 install docs broken
Tomas Cohen Arazi [Tue, 11 Dec 2012 20:14:28 +0000 (17:14 -0300)]
Bug 9267 - Ubuntu 12.04 install docs broken

Current install instructions are broken in the (1.6) step. On amd64
architectures it breaks the whole dependency tree, pulling i386 packages.

This patch replaces the 'dpkg --set-selections' combo and replacess some spaces
for tabs in one line.

This should be cherry-picked for other releases that have 12.04 install instructions
as the problem is related to multiarch.

Regards
To+

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Elliott Davis <elliott@bywatersolions.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
9 years agoMerge branch 'bug_9570' into 3.12-master
Jared Camins-Esakov [Thu, 7 Mar 2013 14:34:00 +0000 (09:34 -0500)]
Merge branch 'bug_9570' into 3.12-master

9 years agoBug 9570 - view plain not working in ccsr
Owen Leonard [Tue, 12 Feb 2013 16:05:07 +0000 (11:05 -0500)]
Bug 9570 - view plain not working in ccsr

The code in opac-showmarc.pl isn't smart enough to find the xsl files in
the "default" (prog) theme if the ccsr theme is enabled, so the "view
plain" option on opac-MARCdetail.pl fails ever time.

This patch copies some path-handling code from XSLT.pm to improve xsl
file path handling when dealing with a "sub-theme."

To test, view the MARC view in the OPAC and click the "view plain" link.
This should work correctly in prog and ccsr themes and with different
languages enabled (keeping in mind the ccsr theme will fail in general
for languages other than en).

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Checked plain view works in both prog and ccsr themes now.
All tests and QA script pass.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
9 years agoMerge branch 'bug_9620' into 3.12-master
Jared Camins-Esakov [Thu, 7 Mar 2013 14:31:29 +0000 (09:31 -0500)]
Merge branch 'bug_9620' into 3.12-master

9 years agoBug 9620: IncludeSeeFromInSearches and data in $9 subfields can break indexing
Katrin Fischer [Fri, 15 Feb 2013 16:55:38 +0000 (17:55 +0100)]
Bug 9620: IncludeSeeFromInSearches and data in $9 subfields can break indexing

In Germany 020$9 is used to store the ISBN with hyphens. In rare cases this
can break indexing in combination with IncludeSeeFromInSearches.

To reproduce:
1) Change your frameworks:
  * Make sure 084 $a is visible
  * Create a 084 $9 that you link to PERSO_NAME authorities.
2) Create a record or edit an existing one:
  * Use the plugin on 084 to link the record to an authority.
  * Make sure 400 is filled in your authority record.

Preparations all done, now test indexing:

3) Make sure IncludeSeeFromInSearches is OFF
  * Reindexing should work without any problems.

4) Activate IncludeSeeFromInSearches
  * Reindexing should throw an error and stop:
    201.Subfields are only for data fields (generally,
    just tags >= 010 at /home/koha/Koha/Filter/MARC/EmbedSee
    FromHeadings.pm line 94

5) Apply patch and reindex.
  * No error should occur.
  * Test 4xx fields from other tags were properly indexed.

What causes the problem is the fact, that Koha tries to store
the date from the 400 in the bibliographic record for indexing.
For this it calculates a tag in the bibliographic record from the
tag it found the authority link in and the 4xx tags used in the
authority record. If you have an authority linked to a 0xx field
and the matching authority has a 4xx where xx < 10, the calculated
tag will be a control field. The attempt to add subfields to this
control field, is causing the error and breaks the indexing process.

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Comment: Work as described, and is a long description :)
Test:
1) Enabled 084 (all subfields visible), added 084_9 (missing from
default framework) linked to PERSO_NAME
2) Edited authority record and added some data to 400
3) Edited bib record, linked 084 to previous auth record
4) With IncludeSeeFromInSearches OFF, re-index without problem
5) With IncludeSeeFromInSearches ON, re-index problems!!!
====================
exporting biblio
====================
1...Subfields are only for data fields (generally, just tags >= 010) at...
Abort
6) Applied patch
7) With IncludeSeeFromInSearches ON, re-index without problem
...
====================
5001....................................................................................................
Records exported: 5060
====================
...
====================
2001....................................................................................................
Records exported: 2024
====================
CLEANING
====================
Good!

*) That's "works as described", don't know if other tests are needed.

No errors from koha-qa

Signed-off-by: Elliott Davis <elliott@bywatersolions.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
9 years agoMerge branch 'bug_9653' into 3.12-master
Jared Camins-Esakov [Thu, 7 Mar 2013 14:28:55 +0000 (09:28 -0500)]
Merge branch 'bug_9653' into 3.12-master

9 years agoBug 9653: FIX collapse class is used by already Bootstrap
Jonathan Druart [Tue, 19 Feb 2013 15:58:50 +0000 (16:58 +0100)]
Bug 9653: FIX collapse class is used by already Bootstrap

Quick, simple and dirty fix.

Test plan:
Apply this patch and check that filters are present on the suggestion
management page.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Filters are back on the page, regression fixed.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
9 years agoMerge branch 'bug_9656' into 3.12-master
Jared Camins-Esakov [Thu, 7 Mar 2013 14:27:06 +0000 (09:27 -0500)]
Merge branch 'bug_9656' into 3.12-master

9 years agoBug 9656: Followup Make logging to a file optional (for fines)
Jonathan Druart [Thu, 28 Feb 2013 13:09:24 +0000 (14:09 +0100)]
Bug 9656: Followup Make logging to a file optional (for fines)

The -log option become optional if the -output_dir is given.

Test plan:
call the script with
1/ no one parameter : no log file
2/ -l : log file will be created in /tmp
3/ -o=/home/koha/var/log : log file with be created in the specified
4/ -o=/home/koha/var/log -l: Same as 3/

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Comment: All combination of options tested. Works well. No errors.
Signed-off-by: Elliott Davis <elliott@bywatersolions.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
9 years agoBug 9656: Make logging to a file optional (for fines)
Chris Cormack [Thu, 21 Feb 2013 09:10:48 +0000 (22:10 +1300)]
Bug 9656: Make logging to a file optional (for fines)

To test:
1/ Before the patch run misc/cronjobs/fines.pl
   Notice that a file has been written to /tmp

2/ rm the file

3/ Apply the patch and run the script again
   Notice the file is not created

4/ run the script with -l
   Notice the file is created again

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Comment: Now it work as described. No errors.
Signed-off-by: Elliott Davis <elliott@bywatersolions.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
9 years agoMerge branch 'bug_8620' into 3.12-master
Jared Camins-Esakov [Thu, 7 Mar 2013 14:19:46 +0000 (09:19 -0500)]
Merge branch 'bug_8620' into 3.12-master

9 years agoBug 8620: Any index in DOM mode sensitive to -x flag of rebuild_zebra.pl
Jared Camins-Esakov [Mon, 4 Mar 2013 21:10:34 +0000 (16:10 -0500)]
Bug 8620: Any index in DOM mode sensitive to -x flag of rebuild_zebra.pl

The definition of the Any index was sensitive to whether
spaces were present between (say) subfield elements in the
MARCXML representation of the bib being indexed.  When using
the -x option to rebuild_zebra.pl, spaces would be present
because of how MARC::File::XML emits MARCXML.

When not using the -x option, spaces would not be present
and the contents of a field would be run together, potentially
as one big token.

The visible behavior was that doing a keyword search by
item barcode would sometimes not work.

To test:
0) Make sure Zebra is using DOM mode
1) Create an item record.
2) Reindex using rebuild_zebra.pl -b -z, *without* -x
3) Do a keyword search by the barcode of the item just
   added; the search shouldn't work
4) Apply patch.
5) Update the following two files:
    etc/zebradb/marc_defs/marc21/biblios/biblio-zebra-indexdefs.xsl
    etc/zebradb/xsl/koha-indexdefs-to-zebra.xsl
6) Reindex
7) Do a search that was previously failing.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Fixes the problem for me - formerly not working callnumbers
and barcodes are now found in keyword (any) searches.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(revised commit description to better explain why it fixes the problem)

Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Passes all my tests, happy to sign off
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
9 years agoMerge branch 'bug_9574' into 3.12-master
Jared Camins-Esakov [Thu, 7 Mar 2013 14:17:53 +0000 (09:17 -0500)]
Merge branch 'bug_9574' into 3.12-master

9 years agoBug 9574: Plack fixes for serials/subscription-add.pl
Jared Camins-Esakov [Sun, 10 Feb 2013 18:25:44 +0000 (13:25 -0500)]
Bug 9574: Plack fixes for serials/subscription-add.pl

This patch fixes the following warnings under Plack:
* Use of uninitialized value $firstissuedate in string eq at \
    /home/jcamins/kohaclone/serials/subscription-add.pl line 92.
* Use of uninitialized value $firstissuedate in substr at \
    /home/jcamins/kohaclone/serials/subscription-add.pl line 105.
* Use of qw(...) as parentheses is deprecated at \
    /home/jcamins/kohaclone/serials/subscription-add.pl line 95.
* Variable "$firstissuedate" is not available at \
    /home/jcamins/kohaclone/serials/subscription-add.pl line 338.

To test:
1) Create a subscription. Ensure that setting the first issue's
   publication date works.
2) Edit a subscription. Ensure that the first issue's publication
   date shows up.
3) Sign off.

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
No regressions found, all tests and QA script pass.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
9 years agoMerge branch 'bug_9445' into 3.12-master
Jared Camins-Esakov [Sat, 2 Mar 2013 17:25:33 +0000 (12:25 -0500)]
Merge branch 'bug_9445' into 3.12-master

9 years agoBug 9445 [Revised] Use DataTables in local use system preferences editor
Owen Leonard [Tue, 22 Jan 2013 17:37:08 +0000 (12:37 -0500)]
Bug 9445 [Revised] Use DataTables in local use system preferences editor

Replace the tablesorter plugin with the DataTables plugin in the
local use system preferences editor.

This patch moves embedding of the toolbar and table-sorting JS from
within the body of the page to the <head> for sake of consistency.

To test, open the system preferences editor to the Local Use tab.
Confirm that table sorting works correctly. In this configuration there
should be no pager and no results filtering.

Revision corrects template path to datatables assets.

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Comment: Tab sorting works. No errors.
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Further revision removes old tablesorter code
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
9 years agoMerge branch 'bug_9674' into 3.12-master
Jared Camins-Esakov [Sat, 2 Mar 2013 17:22:10 +0000 (12:22 -0500)]
Merge branch 'bug_9674' into 3.12-master

9 years agoBug 9674 - Replace YUI buttons and menu on acquisitions pages with Bootstrap
Owen Leonard [Wed, 20 Feb 2013 17:58:46 +0000 (12:58 -0500)]
Bug 9674 - Replace YUI buttons and menu on acquisitions pages with Bootstrap

This patch converts the toolbar on acquisitions pages to Bootstrap,
replacing YUI button code with Bootstrap markup.

To test, view acquisitions pages and confirm that buttons look correct
and work correctly:

- acqui-home.pl (Acquisitions home page)
- booksellers.pl (Acquisitions -> Vendor search)
- supplier.pl (Acquisitions -> Vendor search -> Vendor)
- aqcontract.pl (Acquisitions -> Vendor search -> Vendor -> Contracts)
- uncertainprice.pl (Aquisitions -> Vendor search -> Vendor -> Uncertain
  prices)

View these pages for vendors with and without orders.

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Comment: Buttons works. No errors.
Tested vendors with and without orders (delete button in last case)

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works nicely, changes are consistent.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
9 years agoMerge branch 'bug_9675' into 3.12-master
Jared Camins-Esakov [Sat, 2 Mar 2013 17:20:12 +0000 (12:20 -0500)]
Merge branch 'bug_9675' into 3.12-master

9 years agoBug 9675 - Replace YUI buttons on authorities home page with Bootstrap
Owen Leonard [Thu, 21 Feb 2013 19:37:18 +0000 (14:37 -0500)]
Bug 9675 - Replace YUI buttons on authorities home page with Bootstrap

This patch converts the toolbar include file used by the
authorities home page and authority view page
(authorities-home.pl and authorities/detail.pl) replacing YUI button
and menu code with Bootstrap.

To test:

- View the authorities home page and confirm that the "New
  authority" button looks correct and works correctly.
- Search for an existing authority and click the "Details" link to view.
  "Edit," "Delete," "Save," and "New authority" buttons should look
  correct and work correctly. The "Delete" button should only appear for
  authorities which are unused.

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Comment: Now it works. New and all operations on existing auth works.
No errors.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works nicely, no problems found.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
9 years agoMerge branch 'bug_9397' into 3.12-master
Jared Camins-Esakov [Sat, 2 Mar 2013 17:18:19 +0000 (12:18 -0500)]
Merge branch 'bug_9397' into 3.12-master

9 years agobug 9397 - Error Messages hard to find for Visually Impaired Users (Accessibility...
Corey Fuimaono [Tue, 15 Jan 2013 21:48:03 +0000 (10:48 +1300)]
bug 9397 - Error Messages hard to find for Visually Impaired Users (Accessibility) [Returning Items] {REVISION 1.1}

testing procedure:
1. Check in Invalid Item
2. See that new header has been added. "Can't Check in"

Signed-off-by: Liz Rea <liz@catalyst.net.nz>
A followup may come that makes this text invisible, but this helps accessibility a great dea, and passes validation.

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Amended patch: replace "Can't Check in" with "Cannot check in" and
delete a h3 element with the same text in order to avoid duplicated
messages.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
9 years agoMerge branch 'bug_9520' into 3.12-master
Jared Camins-Esakov [Sat, 2 Mar 2013 17:12:28 +0000 (12:12 -0500)]
Merge branch 'bug_9520' into 3.12-master

9 years agoBug 9520: Increment version number
Jared Camins-Esakov [Sat, 2 Mar 2013 17:09:26 +0000 (12:09 -0500)]
Bug 9520: Increment version number

Database update for bug 9520 has been given version 3.11.00.023

9 years agoBug 9520 -[Revised] - Update default LOC Z39.50 target
Bernardo Gonzalez Kriegel [Thu, 31 Jan 2013 19:11:01 +0000 (16:11 -0300)]
Bug 9520 -[Revised] - Update default LOC Z39.50 target

This patch updates (if present) target settings
of Library of Congress Z39.50 server.

Revision: Was trying to update wrong column 'type',
now correct column 'syntax'.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Amended patch: add the SetVersion call
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
9 years agoMerge branch 'bug_9617' into 3.12-master
Jared Camins-Esakov [Sat, 2 Mar 2013 17:07:06 +0000 (12:07 -0500)]
Merge branch 'bug_9617' into 3.12-master

9 years agoMerge branch 'bug_9617' into 3.12-master
Jared Camins-Esakov [Sat, 2 Mar 2013 16:58:50 +0000 (11:58 -0500)]
Merge branch 'bug_9617' into 3.12-master

9 years agoBug 9617 - Replace YUI menu on catalog pages with Bootstrap
Owen Leonard [Wed, 30 Jan 2013 17:25:21 +0000 (12:25 -0500)]
Bug 9617 - Replace YUI menu on catalog pages with Bootstrap

This patch converts the toolbar include file used by catalog detail
pages (detail.pl, MARCdetail.pl, etc.) replacing YUI button and menu
code with Bootstrap.

Minor change to staff client CSS fixes issue with language footer.
Minor change to doc-head-close.inc corrects error in logic for handling
cart and lists js discovered in testing.

To test, view any page which uses cat-toolbar.inc. Buttons and menus
should look correct and work correctly. Functions to test include:

New record
New item
New subscription
New child record

Edit record
Edit items
Edit items in a batch
Delete items in a batch
Attach item
Edit as new (duplicate)
Replace record via Z39.50
Delete record
Delete all items

Save (various formats)

Add to cart
Add to list

Print

Place hold (including with search-to-hold active).

Testing should be done by users with varying permissions including with
and without:

CAN_user_serials_create_subscription
CAN_user_editcatalogue_edit_catalogue
CAN_user_editcatalogue_edit_items
CAN_user_tools_items_batchmod
CAN_user_tools_items_batchdel

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Comment: All buttons tested. Works as described. No Errors.
Looks good.

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
9 years agoMerge branch 'bug_3549' into 3.12-master
Jared Camins-Esakov [Fri, 1 Mar 2013 00:30:36 +0000 (19:30 -0500)]
Merge branch 'bug_3549' into 3.12-master

9 years agoBug 3549 -[Revised]- Framework sorting in addbook
Bernardo Gonzalez Kriegel [Thu, 21 Feb 2013 17:37:07 +0000 (14:37 -0300)]
Bug 3549 -[Revised]- Framework sorting in addbook

Reviewing Bug 9649, this bug comes up.

This patch correctly sort frameworks by description.

To test:
1) Go to Cataloguing home, button 'New record' shows
unordered list of frameworks
2) Apply the patch
3) refresh, the list must be correctly sorted.

Revised to sort using uppercase.

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>
9 years agoMerge branch 'bug_9555' into 3.12-master
Jared Camins-Esakov [Fri, 1 Mar 2013 00:16:04 +0000 (19:16 -0500)]
Merge branch 'bug_9555' into 3.12-master

9 years agoBug 9555: Template files contain single quote strings
Jonathan Druart [Wed, 6 Feb 2013 15:34:34 +0000 (16:34 +0100)]
Bug 9555: Template files contain single quote strings

Test plan:
- launch the test xt/single_quotes.t, there are 3 occurrences
- apply this patch
- launch the test. It will pass with success
- Check that there is no regression on the 2 modified intranet files and
  the calendar still works at the OPAC.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
All tests pass, also checked calendar still works.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
9 years agoMerge branch 'bug_9669' into 3.12-master
Jared Camins-Esakov [Fri, 1 Mar 2013 00:14:49 +0000 (19:14 -0500)]
Merge branch 'bug_9669' into 3.12-master

9 years agoBug 9669 - Replace YUI buttons on staff client cart toolbar
Owen Leonard [Tue, 19 Feb 2013 20:18:27 +0000 (15:18 -0500)]
Bug 9669 - Replace YUI buttons on staff client cart toolbar

This patch converts the toolbar on the staff client cart
page to Bootstrap, replacing YUI button code with Bootstrap markup.

To test, view the staff client cart and confirm that all buttons look
correct and work correctly. Functions to test include:

Full/brief display
Send
Download (various options)
Print
Empty and close
Hide window

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Comment: Tested all buttons, works very well. No errors
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
9 years agoMerge branch 'bug_5333' into 3.12-master
Jared Camins-Esakov [Fri, 1 Mar 2013 00:11:27 +0000 (19:11 -0500)]
Merge branch 'bug_5333' into 3.12-master

9 years agoBug 5333 - z3950 normalization should apply only on UNIMARC
Tomas Cohen Arazi [Wed, 27 Feb 2013 13:47:13 +0000 (10:47 -0300)]
Bug 5333 - z3950 normalization should apply only on UNIMARC

It's been a while since this bug is around. This normalization is only
used for UNIMARC and yields a fatal error when those variables are set
on (at least) MARC21 setups.

Regards
To+

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Amended patch: update comment
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
9 years agoMerge branch 'bug_9663' into 3.12-master
Jared Camins-Esakov [Fri, 1 Mar 2013 00:07:59 +0000 (19:07 -0500)]
Merge branch 'bug_9663' into 3.12-master

9 years agoBug 9663 - Individual bibliographic record "Save" option requires export permission
Owen Leonard [Tue, 19 Feb 2013 17:10:40 +0000 (12:10 -0500)]
Bug 9663 - Individual bibliographic record "Save" option requires export permission

This patch corrects permission on the export option available on
catalogue pages in the staff client (detail.pl, MARCdetail.pl, etc) so
that users no longer require "export_catalogue" permission.
"export_catalogue" permission is required only for tools/export.pl.

This patch also corrects some crazy nearby indentation. Sorry, couldn't
resist.

To test, visit a page like detail.pl with and without "export_catalogue"
permission. It should be possible to save the record as MODS, MARCXML,
MARC, etc. without error.

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>
9 years agoMerge branch 'bug_8942' into 3.12-master
Jared Camins-Esakov [Sun, 24 Feb 2013 15:29:01 +0000 (10:29 -0500)]
Merge branch 'bug_8942' into 3.12-master

9 years agoBug 8942 : Adding a test to make sure we don't use single quotes for js
Chris Cormack [Sat, 2 Feb 2013 06:59:42 +0000 (19:59 +1300)]
Bug 8942 : Adding a test to make sure we don't use single quotes for js

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Tested by adding single quotes to a translation-escaped string.
Test correctly failed it.
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
9 years agoMerge branch 'bug_9587' into 3.12-master
Jared Camins-Esakov [Sun, 24 Feb 2013 15:18:54 +0000 (10:18 -0500)]
Merge branch 'bug_9587' into 3.12-master

9 years agoBug 9587: Increment version number
Jared Camins-Esakov [Sun, 24 Feb 2013 15:18:43 +0000 (10:18 -0500)]
Bug 9587: Increment version number

Database update for bug 9587 has been given version 3.11.00.022

9 years agoBug 9587 : Handling mismatched emails better
Chris Cormack [Wed, 20 Feb 2013 22:34:41 +0000 (11:34 +1300)]
Bug 9587 : Handling mismatched emails better

To test:

Sign in to Koha via persona using an email that doesn't exist in Koha

Before the patch you will get into an infinite redirect loop

After the patch it will give you an error message

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Comment: Work as described. No errors.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
9 years agoBug 9587 : QA follow up - fix one tabulation character
Katrin Fischer [Sun, 17 Feb 2013 15:20:48 +0000 (16:20 +0100)]
Bug 9587 : QA follow up - fix one tabulation character

Makes QA script happy.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
9 years agoBug 9587 Follow up to fix the problem Katrin identified
Chris Cormack [Sun, 17 Feb 2013 09:44:01 +0000 (22:44 +1300)]
Bug 9587 Follow up to fix the problem Katrin identified

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Comment: Solve that problem, but now koha-qa complains about tabs
in C4/Context.pm.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Tests done:
1) System preference 'Persona' added correctly.
2) Persona off, normal login still possible
3) Persona on, Persona login works
4) Persona logout works
5) normal login still possible
6) normal logout still possible

Persona is off by default and uses the primary email address
from the patron account.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
9 years agoBug 9587 : Followup removing a commented out warn that was annoying the qa tools
Chris Cormack [Tue, 12 Feb 2013 01:16:35 +0000 (14:16 +1300)]
Bug 9587 : Followup removing a commented out warn that was annoying the qa tools

Not introduced by this work but no reason not to clean it

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Comment: no more complains from koha-qa

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
9 years agoBug 9587 : Follow up, fixing tabs in C4/Auth.pm
Chris Cormack [Mon, 11 Feb 2013 18:35:07 +0000 (07:35 +1300)]
Bug 9587 : Follow up, fixing tabs in C4/Auth.pm

And translation problem in masthead.inc

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>
9 years agoBug 9587 : Mozilla Persona login
Chris Cormack [Mon, 11 Feb 2013 09:34:20 +0000 (22:34 +1300)]
Bug 9587 : Mozilla Persona login

    Working on Mozilla Persona support (browser id)

    This will let a user log into Koha using browser id, if their email
    address used matches the email address inside Koha.

    Once an assertion is received, we simply need to find the user that
    matches that email address, and create a session for them.

    opac/svc/login handles this part.

    The nice thing about it is, the user doesn't have to do anything, like
    linking their account. As long as the email address they are using to
    identify themselves in browserid is the same as the one in Koha it
    will just work.

    This is covered by a systempreference, to allow people to do it, and
    is of course totally opt in, it works alongside normal Koha (or any
    other method) of login. So only those choosing to use it, need use it

Test Plan

1/ Make sure OPACBaseURL is set correctly
2/ Switch on the Persona syspref
3/ Make a borrower (or edit one) to have the email you plan to use as
the primary email
4/ Click sign in with email, make or use a persona account
5/ Logout
6/ Check you can still login and logout the normal way

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Comment: Works great.
It's not browser dependent, but tested with chrome, firefox, opera and safari.
Old an new login system works.
Minor errors, addresed in follow-up.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
9 years agoMerge branch 'bug_8682' into 3.12-master
Jared Camins-Esakov [Sun, 24 Feb 2013 15:10:32 +0000 (10:10 -0500)]
Merge branch 'bug_8682' into 3.12-master

9 years agoBug 8682 - Renewals do not appear on quick slips
Liz Rea [Thu, 31 Jan 2013 01:53:29 +0000 (14:53 +1300)]
Bug 8682 - Renewals do not appear on quick slips

To test:
Issue two books to a patron.
Do a renewal on one of them.
update the issuedate on the item that has been renewed to something before today (renewals on the same day will work even without this patch)
I did: select * from issues;
update issues set issuedate="2013-01-25 14:00:00" where itemnumber = 948; (itemnumber is variable depending on your test data.)

Print a quick slip before the patch - the renewal will not show up as one of today's issues.
Print a quick slip after the patch - the renewal will show up as one of today's issues.

If you need reasoning as to why a renewal should show up on the quick slip, think of it as a record of everything
a borrower did today, without the hassle of overdues.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
9 years agoMerge branch 'bug_9356' into 3.12-master
Jared Camins-Esakov [Sun, 24 Feb 2013 15:00:57 +0000 (10:00 -0500)]
Merge branch 'bug_9356' into 3.12-master

9 years agoBug 9356: Show Dissertation note (MARC21 502) in XSLT
Katrin Fischer [Tue, 8 Jan 2013 09:17:40 +0000 (10:17 +0100)]
Bug 9356: Show Dissertation note (MARC21 502) in XSLT

Shows dissertation note in OPAC and intranet detail pages.

To test:
1) Look at records with and without 502 in intranet and OPAC
2) Verify display is correct and consistent

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
All tests pass in staff and opac
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
9 years agoBug 9356: Follow-up - fix capitalization in MARC21 XSLT detail pages
Katrin Fischer [Tue, 8 Jan 2013 09:44:11 +0000 (10:44 +0100)]
Bug 9356: Follow-up - fix capitalization in MARC21 XSLT detail pages

Fixes spelling to follow capitalization rules in OPAC and intranet MARC21
detail pages.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Changes all look good.
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
9 years agoMerge branch 'bug_9363' into 3.12-master
Jared Camins-Esakov [Sun, 24 Feb 2013 14:58:05 +0000 (09:58 -0500)]
Merge branch 'bug_9363' into 3.12-master

9 years agoBug 9363: Show Patent control information and report number (MARC21, XSLT, detail...
Katrin Fischer [Tue, 8 Jan 2013 12:18:49 +0000 (13:18 +0100)]
Bug 9363: Show Patent control information and report number (MARC21, XSLT, detail pages)

Adds 088 $a and 013 $a,c,d,e,f to OPAC and intranet detail pages for MARC21 and XSLT.

To test:
 1) Check records with single and multiple 013 and 088 fields with different subfields catalogued.
 2) Check records with no 088 or 013 present.
 3) Verify display is ok and consistent.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Verified in opac and staff client by following all tests.
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
9 years agoMerge branch 'bug_9662' into 3.12-master
Jared Camins-Esakov [Wed, 20 Feb 2013 14:56:00 +0000 (09:56 -0500)]
Merge branch 'bug_9662' into 3.12-master

9 years agoBug 9662: Followup for acquisition
Marcel de Rooy [Wed, 20 Feb 2013 12:37:16 +0000 (13:37 +0100)]
Bug 9662: Followup for acquisition

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Trivial change corresponding with Dobrica's patch at cataloging side.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
9 years agoBug 9662 - ISSN search field not passed to Z3950Search
Dobrica Pavlinusic [Tue, 19 Feb 2013 14:58:35 +0000 (15:58 +0100)]
Bug 9662 - ISSN search field not passed to Z3950Search

Seems like simple omission when passing $pars hash to
Z3950Search function.

Test scenario:

1. select any Z39.50 search form and enter valid ISSN
2. verify that you don't get any results from remote servers
3. apply this patch and re-check that results are now availble
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
9 years agoMerge branch 'bug_5888' into 3.12-master
Jared Camins-Esakov [Wed, 20 Feb 2013 14:52:35 +0000 (09:52 -0500)]
Merge branch 'bug_5888' into 3.12-master

9 years agoBug 5888: Increment version number
Jared Camins-Esakov [Wed, 20 Feb 2013 14:52:27 +0000 (09:52 -0500)]
Bug 5888: Increment version number

Database update for bug 5888 has been given version 3.11.00.021