Commit graph

18299 commits

Author SHA1 Message Date
Jared Camins-Esakov
b4ba0d12df Merge branch 'bug_9695' into 3.12-master 2013-03-13 08:43:45 -04:00
d3663a1c38 Bug 9695 - Use alphabet system preference on page used to browse patrons for patron card batches
When adding patrons to a batch for creating patron cards, the template
shows alphabet links for browsing all patrons. This patch converts the
hard-coded alphabet links to use the new alphabet system preference.

To test, go to the patron card creator and create a new batch. Click
"Add items" to pop up the window for browsing for patrons to add to the
batch. You should see a working array of alphabet letters which link to
patron search results.

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

The patch adds consistency to the interface and works as described.
Signed-off-by: Jonathan Druarth <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-03-13 08:43:25 -04:00
Jared Camins-Esakov
2e5198ea47 Merge branch 'bug_6898' into 3.12-master 2013-03-13 08:15:24 -04:00
Jared Camins-Esakov
ffc8076d1a Bug 6898: Increment version number
Database update for bug 6898 has been given version 3.11.00.027
2013-03-13 08:15:09 -04:00
Fridolyn SOMERS
67cc4ca302 Bug 6898 - circulation librarians can't run overdues without reports permissions followup
Better update database.

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-13 08:14:18 -04:00
a0c44ab17c Bug 6898 - circulation librarians can't run overdues without reports permissions
This patch adds a new user permission overdues_report for the circulation module, and requires this permission to run the overdue items
report, rather than requiring full reports permissions.

Test plan :
With a user with permissions circulate_remaining_permissions :
- Add overdues_report permission to user
- Go to circulation home
=> you see "Overdues" link
- Clik on it
=> you are allowed to access and use this page
- Remove overdues_report permission to user
- Go to circulation home
=> you do not see "Overdues" link
- Edit URL : <server>/cgi-bin/koha/circ/overdue.pl
=> you are not allowed to access this page
- Go to main page
=> you don't have access to reports module

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Fridolyn SOMERS <fridolyn.somers@biblibre.com>

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-03-13 08:14:18 -04:00
Jared Camins-Esakov
efd78bf374 Merge branch 'bug_8853' into 3.12-master 2013-03-13 08:02:37 -04:00
Mathieu Saby
bf9815302c Bug 8853: Suppress links in basketgroups list
In the table listing all closed basketgroups, clicking the name of a
basketgroup reopen it. To edit an open basketgroup or reopen a closed
basketgroup, there are specific buttons in "Action" column. So the link
around basketgroup name is an UX problem. This patch suppress the link
around basketgroup name, in both "closed" and "open" tab.

To test :
1. create some closed and open basketgroups
2. check links are not showing anymore

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>
2013-03-13 08:02:34 -04:00
Jared Camins-Esakov
85385f2ee5 Merge branch 'bug_9293' into 3.12-master 2013-03-11 17:59:29 -04:00
7607defc71 Bug 9293 - action_logs not tracking payments
Add all fine actions to action_logs via FinesLog syspref

Test Plan:
1) Enable FinesLog
2) Apply patch
3) Try all the various fine related actions possible
4) Verify that each action creates an action_logs entry

Signed-off-by: MJ Ray <mjr@phonecoop.coop>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-03-11 17:59:17 -04:00
Jared Camins-Esakov
dcc75ed3fa Merge branch 'bug_9207' into 3.12-master 2013-03-11 08:57:19 -04:00
Jared Camins-Esakov
a971109d0c Bug 9207: Increment version number
Database update for bug 9207 has been given version 3.11.00.026
2013-03-11 08:56:08 -04:00
72f1b94a09 Bug 9207 - Improve z39.50 speed slowdowns for sites with many records
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-03-11 08:55:43 -04:00
Jared Camins-Esakov
301a07d243 Revert "Merge branch 'bug_9446' into 3.12-master"
This reverts commit 5b8f7e43fd, reversing
changes made to af7f49d198.
2013-03-11 08:52:17 -04:00
Jared Camins-Esakov
1ccbebf584 Merge branch 'bug_9431' into 3.12-master 2013-03-11 08:46:59 -04:00
baf95b1340 Bug 9431 [Revised] Use DataTables on Patron Category Administration page
Replace the tablesorter plugin with the DataTables plugin on the
patron category administration page. Structural changes were made to the
table markup for validity and to deal with a DataTables bug which
prevents it from properly parsing a <th> with a colspan.

To test, open the Patron Category Administration page (Administration ->
Patron types and categories). Confirm that table sorting works
correctly.

Revision adds a "natural sort" plugin to the main datatables
configuration JavaScript file to enable sorting of columns like those in
this table which include mixed numeric and text data. Allows correct
numeric sorting of data like "0 years, 1 years, 2 years, 18 years," etc.

Further 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-11 08:46:22 -04:00
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