koha.git
9 years agoMerge branch 'bug_4266' into 3.12-master
Jared Camins-Esakov [Fri, 15 Mar 2013 22:54:07 +0000 (18:54 -0400)]
Merge branch 'bug_4266' into 3.12-master

9 years agoBug 4266: Hide Encumbrance and Expenditure in aqbudgets.tt
Mathieu Saby [Fri, 22 Feb 2013 11:33:48 +0000 (12:33 +0100)]
Bug 4266: Hide Encumbrance and Expenditure in aqbudgets.tt

Encumbrance and Expenditure fields are not taken into account by Koha,
but the data are saved in database.
This patch hide these fields in aqbudgets.tt
To test : check if the 2 fields are hidden when creating a new fund.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
This could certainly be done in a few different ways both with CSS and
JS, but this is a simple change and can be easily overridden:

$("#budget_encumb,#budget_expend").closest("li").show();

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
9 years agoMerge branch 'bug_9711' into 3.12-master
Jared Camins-Esakov [Fri, 15 Mar 2013 22:50:58 +0000 (18:50 -0400)]
Merge branch 'bug_9711' into 3.12-master

9 years agoBug 9711: Add css style for OPACPopupAuthorsSearch
Jonathan Druart [Tue, 26 Feb 2013 09:51:20 +0000 (10:51 +0100)]
Bug 9711: Add css style for OPACPopupAuthorsSearch

Bug 5888 introduces a new syspref OPACPopupAuthorsSearch. If enabled, a
popup is displayed on the OPAC detail page.
This development does not add the css for the ccsr theme.

Test plan:
Enable the OPACPopupAuthorsSearch.
Check that the appearance is the same of prog and ccsr themes.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Tested on several authorities (authors, subjects, etc)
works as expected

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Test plan:
1) Switch to CCSR theme
2) Turn off XSLT views (leaving prefs empty)
3) Turn on OPACPopupAuthorsSearch
> Confirm layout is ok/broken in OPAC
4) Switch back to prog theme
> Confirm layout is ok/broken in OPAC
5) Switch off OPACPopupAuthorsSearch
> Confirm layout is ok/broken in OPAC
6) Switch back to CCSR
> Confirm layout is ok/broken in OPAC

Done.

Note: Feature only works with normal view (no XSLT)
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
9 years agoMerge branch 'bug_9458' into 3.12-master
Jared Camins-Esakov [Wed, 13 Mar 2013 13:07:22 +0000 (09:07 -0400)]
Merge branch 'bug_9458' into 3.12-master

9 years agoBug 9458 - Add sorting to lists - QA Followup 4
Kyle M Hall [Thu, 7 Mar 2013 18:30:27 +0000 (13:30 -0500)]
Bug 9458 - Add sorting to lists - QA Followup 4

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
9 years agoBug 9458 - Add sorting to lists - QA Followup 3
Kyle M Hall [Tue, 5 Mar 2013 17:46:45 +0000 (12:46 -0500)]
Bug 9458 - Add sorting to lists - QA Followup 3

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
9 years agoBug 9458 - Add sorting to lists - QA Followup 2
Kyle M Hall [Tue, 26 Feb 2013 15:34:20 +0000 (10:34 -0500)]
Bug 9458 - Add sorting to lists - QA Followup 2

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
9 years agoBug 9458 - Add sorting to lists - QA Followup
Kyle M Hall [Tue, 19 Feb 2013 13:42:11 +0000 (08:42 -0500)]
Bug 9458 - Add sorting to lists - QA Followup

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
9 years agoBug 9458 - Add sorting to lists
Kyle M Hall [Wed, 23 Jan 2013 14:05:20 +0000 (09:05 -0500)]
Bug 9458 - Add sorting to lists

Test Plan:
1) Apply patch
2) View list in staff interface, try sorting by title, then author
3) Repeat 2 with same list in OPAC

Signed-off-by: Delaye Stephane <stephane.delaye@biblibre.com>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
9 years agoMerge branch 'bug_9647' into 3.12-master
Jared Camins-Esakov [Wed, 13 Mar 2013 13:01:51 +0000 (09:01 -0400)]
Merge branch 'bug_9647' into 3.12-master

9 years agoMerge branch 'bug_9760' into 3.12-master
Jared Camins-Esakov [Wed, 13 Mar 2013 12:56:41 +0000 (08:56 -0400)]
Merge branch 'bug_9760' into 3.12-master

9 years agoBug 9760: Simplify local use preferences
Marcel de Rooy [Thu, 7 Mar 2013 12:13:27 +0000 (13:13 +0100)]
Bug 9760: Simplify local use preferences

Removes a lot of code that was needed to handle prefs the old way.

Test plan:
Goto Local use preferences. Do you see some local preferences?
Add a new pref, edit and delete it.
Modify the url to systempreferences.pl?tab=OPAC or tab=log. You should only see
a short message.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Amended patch: Remove the $sth->finish statements
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
9 years agoMerge branch 'bug_9035' into 3.12-master
Jared Camins-Esakov [Wed, 13 Mar 2013 12:50:11 +0000 (08:50 -0400)]
Merge branch 'bug_9035' into 3.12-master

9 years agoBug 9035 - delete bulkauthimport.pl
Robin Sheat [Fri, 8 Mar 2013 01:29:39 +0000 (14:29 +1300)]
Bug 9035 - delete bulkauthimport.pl

<dcook> Then bulkauthimport.pl?
<jcamins> bulkauthimport should not be used ever.
<eythian> it probably should be deleted
<jcamins> It should be.

Signed-off-by: David Cook <dcook@prosentient.com.au>
I've poked around in bulkmarcimport.pl and it certainly seems to have the functionality that Mason (and Jared and Robin) mention.

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
9 years agoMerge branch 'bug_9784' into 3.12-master
Jared Camins-Esakov [Wed, 13 Mar 2013 12:46:40 +0000 (08:46 -0400)]
Merge branch 'bug_9784' into 3.12-master

9 years agobug 9784: add koha-shell to the koha-common man page
Liz Rea [Tue, 12 Mar 2013 03:49:31 +0000 (16:49 +1300)]
bug 9784: add koha-shell to the koha-common man page

To test:

Build a package from a git checkout with this patch included
once installed, run man koha-common - koha-shell should appear near the bottom.

Signed-off-by: Robin Sheat <robin@catalyst.net.nz>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
9 years agoMerge branch 'bug_9695' into 3.12-master
Jared Camins-Esakov [Wed, 13 Mar 2013 12:43:45 +0000 (08:43 -0400)]
Merge branch 'bug_9695' into 3.12-master

9 years agoBug 9695 - Use alphabet system preference on page used to browse patrons for patron...
Owen Leonard [Tue, 5 Mar 2013 21:10:19 +0000 (16:10 -0500)]
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>
9 years agoMerge branch 'bug_6898' into 3.12-master
Jared Camins-Esakov [Wed, 13 Mar 2013 12:15:24 +0000 (08:15 -0400)]
Merge branch 'bug_6898' into 3.12-master

9 years agoBug 6898: Increment version number
Jared Camins-Esakov [Wed, 13 Mar 2013 12:15:09 +0000 (08:15 -0400)]
Bug 6898: Increment version number

Database update for bug 6898 has been given version 3.11.00.027

9 years agoBug 6898 - circulation librarians can't run overdues without reports permissions...
Fridolyn SOMERS [Thu, 7 Mar 2013 17:17:33 +0000 (12:17 -0500)]
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>
9 years agoBug 6898 - circulation librarians can't run overdues without reports permissions
Kyle M Hall [Fri, 10 Feb 2012 15:43:29 +0000 (10:43 -0500)]
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>
9 years agoMerge branch 'bug_8853' into 3.12-master
Jared Camins-Esakov [Wed, 13 Mar 2013 12:02:37 +0000 (08:02 -0400)]
Merge branch 'bug_8853' into 3.12-master

9 years agoBug 8853: Suppress links in basketgroups list
Mathieu Saby [Sat, 9 Mar 2013 15:15:19 +0000 (16:15 +0100)]
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>
9 years agoMerge branch 'bug_9293' into 3.12-master
Jared Camins-Esakov [Mon, 11 Mar 2013 21:59:29 +0000 (17:59 -0400)]
Merge branch 'bug_9293' into 3.12-master

9 years agoBug 9293 - action_logs not tracking payments
Kyle M Hall [Thu, 7 Feb 2013 14:18:34 +0000 (09:18 -0500)]
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>
9 years agoMerge branch 'bug_9207' into 3.12-master
Jared Camins-Esakov [Mon, 11 Mar 2013 12:57:19 +0000 (08:57 -0400)]
Merge branch 'bug_9207' into 3.12-master

9 years agoBug 9207: Increment version number
Jared Camins-Esakov [Mon, 11 Mar 2013 12:56:08 +0000 (08:56 -0400)]
Bug 9207: Increment version number

Database update for bug 9207 has been given version 3.11.00.026

9 years agoBug 9207 - Improve z39.50 speed slowdowns for sites with many records
Kyle M Hall [Tue, 4 Dec 2012 13:52:21 +0000 (08:52 -0500)]
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>
9 years agoRevert "Merge branch 'bug_9446' into 3.12-master"
Jared Camins-Esakov [Mon, 11 Mar 2013 12:52:17 +0000 (08:52 -0400)]
Revert "Merge branch 'bug_9446' into 3.12-master"

This reverts commit 5b8f7e43fdcd383f914af17f9b994773d9547a93, reversing
changes made to af7f49d198657ccbc11ae6bbc0b7c1adb421d91a.

9 years agoMerge branch 'bug_9431' into 3.12-master
Jared Camins-Esakov [Mon, 11 Mar 2013 12:46:59 +0000 (08:46 -0400)]
Merge branch 'bug_9431' into 3.12-master

9 years agoBug 9431 [Revised] Use DataTables on Patron Category Administration page
Owen Leonard [Fri, 18 Jan 2013 20:55:47 +0000 (15:55 -0500)]
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>
9 years agoMerge branch 'bug_8054' into 3.12-master
Jared Camins-Esakov [Mon, 11 Mar 2013 12:14:24 +0000 (08:14 -0400)]
Merge branch 'bug_8054' into 3.12-master

9 years agoBug 8054 - double clicking can cause duplicate payments/fines
Liz Rea [Thu, 27 Dec 2012 03:10:26 +0000 (16:10 +1300)]
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>
9 years agoMerge branch 'bug_9377' into 3.12-master
Jared Camins-Esakov [Mon, 11 Mar 2013 12:08:55 +0000 (08:08 -0400)]
Merge branch 'bug_9377' into 3.12-master

9 years agoBug 9377 - itemtype in duplicate biblio search
Fridolyn SOMERS [Thu, 7 Mar 2013 16:37:16 +0000 (17:37 +0100)]
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>
9 years agoMerge branch 'bug_9555' into 3.12-master
Jared Camins-Esakov [Mon, 11 Mar 2013 11:40:50 +0000 (07:40 -0400)]
Merge branch 'bug_9555' into 3.12-master

9 years agoBug 9555: Another template contains single quotes in a js string
Chris Cormack [Fri, 8 Mar 2013 05:41:54 +0000 (18:41 +1300)]
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>
9 years agoMerge branch 'bug_9734' into 3.12-master
Jared Camins-Esakov [Mon, 11 Mar 2013 11:33:33 +0000 (07:33 -0400)]
Merge branch 'bug_9734' into 3.12-master

9 years agoBug 9734 - String::Random is marked as optional, but C4::Members requires it
MJ Ray [Thu, 28 Feb 2013 15:47:27 +0000 (15:47 +0000)]
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>
9 years agoMerge branch 'bug_9767' into 3.12-master
Jared Camins-Esakov [Fri, 8 Mar 2013 12:00:37 +0000 (07:00 -0500)]
Merge branch 'bug_9767' into 3.12-master

9 years agoBug 9767: Fix for updatedatabase.pl (mixed version numbers)
Marcel de Rooy [Fri, 8 Mar 2013 07:53:52 +0000 (08:53 +0100)]
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>
9 years agoMerge branch 'bug_8917' into 3.12-master
Jared Camins-Esakov [Thu, 7 Mar 2013 16:16:51 +0000 (11:16 -0500)]
Merge branch 'bug_8917' into 3.12-master

9 years agoBug 8917: Increment version number
Jared Camins-Esakov [Thu, 7 Mar 2013 16:16:43 +0000 (11:16 -0500)]
Bug 8917: Increment version number

Database update for bug 8917 has been given version 3.11.00.025

9 years agoBug 8917: replaces tab with spaces
Jonathan Druart [Mon, 4 Mar 2013 15:43:38 +0000 (16:43 +0100)]
Bug 8917: replaces tab with spaces

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
9 years agoBug 8917 : [ Sign followup ] Track clicks to links external to Koha
Bernardo Gonzalez Kriegel [Fri, 1 Mar 2013 22:54:37 +0000 (19:54 -0300)]
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>
9 years agoBug 8917 : Follow up fixing bad behaviour that existed prior to this feature
Chris Cormack [Fri, 1 Mar 2013 21:09:22 +0000 (10:09 +1300)]
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>
9 years agoBug 8917 : Shifting db dependent code to a module
Chris Cormack [Fri, 1 Mar 2013 20:50:07 +0000 (09:50 +1300)]
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>
9 years agoBug 8917 : Fixing a bug bgkriegel spotted and removing tabs
Chris Cormack [Tue, 26 Feb 2013 20:32:24 +0000 (09:32 +1300)]
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>
9 years agoBug 8917 : Link tracking, changes to XSLT
Chris Cormack [Mon, 15 Oct 2012 02:39:08 +0000 (15:39 +1300)]
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>
9 years agoBug 8917 : Script to log link clicks
Chris Cormack [Mon, 15 Oct 2012 00:16:17 +0000 (13:16 +1300)]
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>
9 years agoBug 8917 : Adding link tracking to the opac detail page, without xslt
Chris Cormack [Sun, 14 Oct 2012 22:55:51 +0000 (11:55 +1300)]
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>
9 years agoBug 8917 : Creating tables and system pref, no functional changes at all
Chris Cormack [Sun, 14 Oct 2012 22:29:55 +0000 (11:29 +1300)]
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>
9 years agoMerge branch 'bug_5079' into 3.12-master
Jared Camins-Esakov [Thu, 7 Mar 2013 16:05:45 +0000 (11:05 -0500)]
Merge branch 'bug_5079' into 3.12-master

9 years agoBug 5079: Increment version number
Jared Camins-Esakov [Thu, 7 Mar 2013 16:05:35 +0000 (11:05 -0500)]
Bug 5079: Increment version number

Database update for bug 5079 has been given version 3.11.00.024

9 years agoBug 5079 - Make display of shelving location and call number in XSLT results controll...
Kyle M Hall [Tue, 18 Sep 2012 15:50:44 +0000 (11:50 -0400)]
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>
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>