Commit graph

18633 commits

Author SHA1 Message Date
Jared Camins-Esakov
43c340c53e Merge branch 'bug_8054' into 3.12-master 2013-03-11 08:14:24 -04:00
Liz Rea
6c6fe37ced Bug 8054 - double clicking can cause duplicate payments/fines
Uses preventDoubleForSubmit() to prevent double form submissions in the fines module.

To test:

Create a manual invoice/fine
Create some manual fines, click save like mad - you should get only one fine (without, you will get several if you click madly enough)

Click Pay fines
Pay some fines, clicking save like mad on each. You should only get one payment. (without, you will get several payments)

Create a manual credit
Create a credit, click save like mad. You should only get one credit. (without you will get several if you click madly enough)

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-03-11 08:14:12 -04:00
Jared Camins-Esakov
415af04cd7 Merge branch 'bug_9377' into 3.12-master 2013-03-11 08:08:55 -04:00
Fridolyn SOMERS
fa1ee846f7 Bug 9377 - itemtype in duplicate biblio search
In C4::Search::FindDuplicate, when biblio has no ISBN, the duplicate search adds :
$query .= " and itemtype=$result->{itemtype}".
This is wrong when itemtype is defined in items.

This patch simply removes the itemtype from dublicate search.

Test plan :
- Go to a biblio details page
- Click on "Edit as new (duplicate)"
- If ISBN is defined, remove it
- Click on save
=> a duplicate is detected
- Change biblio item type and save
=> a duplicate is detected
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-03-11 08:06:50 -04:00
Jared Camins-Esakov
bc11d66aa8 Merge branch 'bug_9555' into 3.12-master 2013-03-11 07:40:50 -04:00
Chris Cormack
82337d9624 Bug 9555: Another template contains single quotes in a js string
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>
2013-03-11 07:40:42 -04:00
Jared Camins-Esakov
5bdc68837b Merge branch 'bug_9734' into 3.12-master 2013-03-11 07:33:33 -04:00
MJ Ray
36965d7df8 Bug 9734 - String::Random is marked as optional, but C4::Members requires it
jcamins confirmed on IRC it is not optional.

To test:
1) perl koha_perl_deps.pl -a |grep String::Random
2) notice the "No" in the last column - it should be Yes
3) apply patch and repeat same steps, looking for Yes.
4) prove t/Installer_PerlModules.t # which checks String::Random is required

Sponsored-by: software.coop
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>
2013-03-11 07:33:30 -04:00
Jared Camins-Esakov
0ffaa644b9 Merge branch 'bug_9767' into 3.12-master 2013-03-08 07:00:37 -05:00
3dc0f5728e Bug 9767: Fix for updatedatabase.pl (mixed version numbers)
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-03-08 07:00:09 -05:00
Jared Camins-Esakov
2bd3c85961 Merge branch 'bug_8917' into 3.12-master 2013-03-07 11:16:51 -05:00
Jared Camins-Esakov
65522e25ca Bug 8917: Increment version number
Database update for bug 8917 has been given version 3.11.00.025
2013-03-07 11:16:43 -05:00
Jonathan Druart
41929aa8ee Bug 8917: replaces tab with spaces
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
2013-03-07 11:14:26 -05:00
Bernardo Gonzalez Kriegel
7047b7eea0 Bug 8917 : [ Sign followup ] Track clicks to links external to Koha
Remove empty pod section in Koha/Linktracker.pm to
make koha-qa happy.

Add missing "\n" in installer/data/mysql/updatedatabase.pl

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
2013-03-07 11:14:25 -05:00
44861cd64d Bug 8917 : Follow up fixing bad behaviour that existed prior to this feature
But the bug only becomes visible with link tracking on
Prior to this patch it would put an empty link in the html

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>

General comment: Work as described. No errors.
Tested all preference values with and without logged in user.

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
2013-03-07 11:14:25 -05:00
673e674b75 Bug 8917 : Shifting db dependent code to a module
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
2013-03-07 11:14:25 -05:00
Chris Cormack
c50cd65704 Bug 8917 : Fixing a bug bgkriegel spotted and removing tabs
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
2013-03-07 11:14:25 -05:00
Chris Cormack
57c6b26df0 Bug 8917 : Link tracking, changes to XSLT
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
2013-03-07 11:14:22 -05:00
Chris Cormack
81de735f13 Bug 8917 : Script to log link clicks
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
2013-03-07 11:13:26 -05:00
Chris Cormack
8fa0082188 Bug 8917 : Adding link tracking to the opac detail page, without xslt
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
2013-03-07 11:13:26 -05:00
Chris Cormack
9c01d7c7a2 Bug 8917 : Creating tables and system pref, no functional changes at all
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>
2013-03-07 11:13:24 -05:00
Jared Camins-Esakov
00b0b7b5ef Merge branch 'bug_5079' into 3.12-master 2013-03-07 11:05:45 -05:00
Jared Camins-Esakov
86a0c19040 Bug 5079: Increment version number
Database update for bug 5079 has been given version 3.11.00.024
2013-03-07 11:05:35 -05:00
43c875b683 Bug 5079 - Make display of shelving location and call number in XSLT results controlled by sysprefs
* Don't show the Location line if there are no copies available, since it
  will inevitably be blank

* Also, don't show locations for Checked Out, Lost, Damaged, Withdrawn,
  On Hold or In transit items; it doesn't really make sense, since the
  items aren't actually there, and it results in repetitive listing of
  the shelving location

* Added system preference to display shelving location of an item on opac
  results. The system preference is called OpacItemLocation. I also moved
  the call number to a new line called Location along with the shelving
  location if it is enabled.

To Test:
  1) Run database update script to add syspref.
  2) Set OpacItemLocation to show locations or collection codes on the
     opac-search page.

  If it is working you should see the shelving location of the item
  before the call number. Multiple home branch shelving locations
  are seperated by a pipe character ( i.e. '|' ).

Based on code by Elliot Davis <tdavis@uttyler.edu>

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Works as advertised.

Signed-off-by: Ed Veal <ed.veal@bywatersolutions.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-03-07 11:05:00 -05:00
Jared Camins-Esakov
9aba512cee Merge branch 'bug_7387' into 3.12-master 2013-03-07 10:59:16 -05:00
Bernardo Gonzalez Kriegel
f9712ee228 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>
2013-03-07 10:58:52 -05:00
Chris Cormack
282ec272b1 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>
2013-03-07 10:58:24 -05:00
Jared Camins-Esakov
a22060a46e Merge branch 'bug_9435' into 3.12-master 2013-03-07 10:56:13 -05:00
c714c65661 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>
2013-03-07 10:56:10 -05:00
Jared Camins-Esakov
a9013bf3df Merge branch 'bug_9428' into 3.12-master 2013-03-07 10:54:40 -05:00
f6af0b4386 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>
2013-03-07 10:54:37 -05:00
Jared Camins-Esakov
b2a649cfd8 Merge branch 'bug_9429' into 3.12-master 2013-03-07 10:52:17 -05:00
9f08b5e3a5 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>
2013-03-07 10:52:15 -05:00
Jared Camins-Esakov
1441ec8d4d Merge branch 'bug_9430' into 3.12-master 2013-03-07 10:50:21 -05:00
f94c6cffa8 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>
2013-03-07 10:50:19 -05:00
Jared Camins-Esakov
bd675e8651 Merge branch 'bug_9437' into 3.12-master 2013-03-07 10:45:54 -05:00
d41d871999 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>
2013-03-07 10:45:51 -05:00
Jared Camins-Esakov
9f9130dedb Merge branch 'bug_9444' into 3.12-master 2013-03-07 10:43:21 -05:00
1e4876536f 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>
2013-03-07 10:43:19 -05:00
Jared Camins-Esakov
5b8f7e43fd Merge branch 'bug_9446' into 3.12-master 2013-03-07 10:41:44 -05:00
0e114e7bbc 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>
2013-03-07 10:41:42 -05:00
Jared Camins-Esakov
af7f49d198 Merge branch 'bug_9450' into 3.12-master 2013-03-07 10:38:29 -05:00
38e10cbb61 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>
2013-03-07 10:38:01 -05:00
Jared Camins-Esakov
0bebb0c75c Merge branch 'bug_9649' into 3.12-master 2013-03-07 10:28:51 -05:00
ba3c748181 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>
2013-03-07 10:28:46 -05:00
Jared Camins-Esakov
8854a560ae Merge branch 'bug_9672' into 3.12-master 2013-03-07 10:25:18 -05:00
7f5b305d79 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>
2013-03-07 10:25:16 -05:00
Jared Camins-Esakov
2bb2b58afb Merge branch 'bug_9676' into 3.12-master 2013-03-07 10:20:41 -05:00
aa6764f37e 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>
2013-03-07 10:20:38 -05:00
Jared Camins-Esakov
b631b16470 Merge branch 'bug_9688' into 3.12-master 2013-03-07 10:18:20 -05:00