Commit graph

18435 commits

Author SHA1 Message Date
Jared Camins-Esakov
af89f98a7a Merge branch 'bug_8089' into 3.12-master 2013-03-21 19:15:34 -04:00
Jared Camins-Esakov
f2c8262fae Bug 8089: Cache sysprefs with Koha::Cache::Object
This patch replaces the %sysprefs hash variable with a
Koha::Cache::Object-tied hash that allows the user to cache sysprefs
in memcached, fastmmap, or memory.

To test:
1) Enable the cache as described on bug 9434.
2) Try viewing some pages in the OPAC and staff client. If the syspref
   caching isn't working, you'll be redirected to the web installer
   (in the staff client) or be shown the maintenance page (in the OPAC).
3) Disable the cache by unsetting the CACHING_SYSTEM environment
   variable.
4) Try viewing some pages in the OPAC and staff client. If the syspref
   caching isn't working, you'll be redirected to the web installer
   (in the staff client) or be shown the maintenance page (in the OPAC).

Note that this will not improve performance. It does, however, eliminate
the problem of sysprefs not getting updated in all threads in
multi-threaded environments.

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-03-21 19:15:31 -04:00
Jared Camins-Esakov
cc49dc70fb Merge branch 'bug_8509' into 3.12-master 2013-03-21 18:58:26 -04:00
Adrien Saurat
04054653f3 Bug 8509: allows the Expected status to be chosen back
If a serial has been marked as received by mistake, it's now
possible to set it as an "Expected" serial again.

Signed-off-by: Melia Meggs <melia@test.bywatersolutions.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Passes all tests and QA script.

I did varoius tests on a subscription switching between the
different status (expected, arrived, late) and couldn't find
a bad side effect of this patch.

Note: The date arrived/date expected is not automatically reset,
but you can enter the date manually in the template, so I think
this could be handled in a separate bug.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-03-21 18:58:21 -04:00
Jared Camins-Esakov
7928a05201 Merge branch 'bug_9117' into 3.12-master 2013-03-21 18:54:37 -04:00
Julian Maurice
8eae0c2a67 Bug 9117: Add imageurl to the list of parameters of AddAuthorisedValue
and add unit test in t/db_dependant/Koha.t

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-03-21 18:54:10 -04:00
Julian Maurice
d00f21833a Bug 9117 [Follow-up] Translatable string should be in double quotes
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
All tests and QA script pass.

Tests done:
- Created several reports fresh and using the new duplicate feature.
- Verified authorized values were created correctly and can be
  viewed from Administration > authorized values.
- Checked tabs and limiting on subgroups works correctly.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-03-21 18:54:10 -04:00
Julian Maurice
4fad5a7a6b Bug 9117 [Follow-up] Fix group and subgroup filtering
When a group code is contained in another group code (e.g. 'COD' and
'CODE'), filtering on the longest ('CODE') include reports of the
smallest ('COD').
Same problem for the subgroups.
This patch fixes this.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-03-21 18:54:09 -04:00
Julian Maurice
fc4cbe6884 Bug 9117 [Follow-up] Reports hierarchies management improvements
This patch avoid javascript bugs when user hasn't 'create_reports'
permission (last column is hidden in this case but <th> remains)
+ fix a typo 'selelcted' > 'selected'

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-03-21 18:54:09 -04:00
38082bfd38 Bug 9117 [Follow-up] Reports hierarchies management improvements
This patch corrects serveral markup errors in the template
introduced by this bug as well as previous patches: unescaped
ampersands, missing closing tags, typos.

To test, view various stages of the process of viewing or
creating guided reports and check the source for validity.

Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-03-21 18:54:09 -04:00
Julian Maurice
1e92b9c15e Bug 9117: Reports hierarchies management improvements
- Filter by groups using tabs
- Filter by subgroups using a dropdown list under each tab
- Allow to create new group and subgroups when building a new report or
  editing an existing report (no need to go through admin AV interface)

+ Possibility to duplicate a report (new link in the table)

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-03-21 18:54:09 -04:00
Jared Camins-Esakov
bfdf00b657 Merge branch 'bug_9880' into 3.12-master 2013-03-21 18:39:47 -04:00
Robin Sheat
844bf3f187 Bug 9880 - Updated control file for new dependencies
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-03-21 18:39:39 -04:00
Jared Camins-Esakov
f4eacc2da2 Merge branch 'bug_7368' into 3.12-master 2013-03-21 18:33:47 -04:00
7575a8eb8f Bug 7368: POD doc in VirtualShelves.pm
Only moving/adding some documentation in VirtualShelves.pm.
Related to earlier changes in connection with report 7310.
Adding my own signoff, nothing to test here. Does Koha still work? :)

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Passed-QA-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-03-21 18:33:28 -04:00
Jared Camins-Esakov
22415bc733 Merge branch 'bug_9879' into 3.12-master 2013-03-21 18:30:12 -04:00
57d6b530ad Bug 9879 - Use DataTables on suggestions management page
Replace the tablesorter plugin with the DataTables plugin on the
suggestions management page. Table sorting has been coverted from using
multiple specific IDs to a more efficient class-based selector.

Unrelated change: Prevent page-jumping when checkbox links are clicked.

To test, open the suggestions management page (Acquisitions ->
Suggestions). Confirm that table sorting, paging, and searching works
correctly.

Signed-off-by: Frederic Durand <frederic.durand@unilim.fr>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-03-21 18:30:09 -04:00
Jared Camins-Esakov
c9e4c68d27 Merge branch 'bug_9403' into 3.12-master 2013-03-21 12:02:26 -04:00
Jared Camins-Esakov
8f7189678d Bug 9403: Increment version number
Database update for bug 9403 has been given version 3.11.00.109
2013-03-21 12:02:15 -04:00
Paul Poulain
e636bed728 bug 9403 tiny follow-up to validate podchecker
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-03-21 12:00:41 -04:00
88c0c4934c Bug 9403: Follow-up: Move "Type" in XSLT result list to match OPAC result list
Moves the line starting with "Type:" upwards to show below the author line
like it is in the OPAC XSLT result list.

To test:
1) Make sure XSLTResultsDisplay and DisplayIconsXSLT are turned on.
2) Check that the line starting with "Type" is showing up below the title and 'by' lines.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-03-21 12:00:41 -04:00
2618c05568 Bug 9403: Material type icons not showing for XSLT default view in intranet
Implements the material type icons shown in the MARC21 XSLT result list
of the OPAC for the intrant result list.

Also adds the system preference DisplayIconsXSLT as an intranet analogue
for the OPAC system preference DisplayOPACiconsXSLT and corrects the
descriptions of both preferences in the syspref editor.

To test:
0) Run database update to add new system preference
1) Activate default XSLTResultsDisplay
2) Check the new system preference DisplayIconsXSLT shows up correctly
  and is activated by default. Compare descriptions between DisplayIconsXSLT
  and DisplayOPACiconsXSLT.
3) Check the intranet result list for icons showing up after 'Type:' and
  before the corresponding description. Detail pages should be showing
  the 'Type:' as before.
4) Turn off DisplayIconsXSLT.
5) Check the line containing 'Type:', format and audience information is now
  hidden from the result list.
6) Check that the 'Type:'line is also hidden from the detail page.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-03-21 12:00:38 -04:00
Jared Camins-Esakov
6807d7e338 Merge branch 'bug_7241' into 3.12-master 2013-03-21 11:44:15 -04:00
Jared Camins-Esakov
7f8369dc2f Bug 7241: Increment version number
Database update for bug 7241 has been given version 3.11.00.108
2013-03-21 11:44:08 -04:00
Adrien Saurat
520a82a754 Bug 7241, follow-up: viewlog link for circulation
Fixes a few things about the CIRC link in viewlogs:
- "itemnumber=" instead of "item="
- anchor #item was filled with the wrong field
- tooltip now indicates "item" instead of "biblio"

Signed-off-by: Adrien Saurat <adrien.saurat@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-03-21 11:43:53 -04:00
Adrien Saurat
a252e417fb Bug 7241 follow-up: DB changes
Reset timestamp modification on update after patch application.
Give more information about the log history fix.

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-03-21 11:43:15 -04:00
Adrien Saurat
7ceb9988e9 Bug 7241: circulation action logs record biblionumber instead of item number
Issue log and and circulation logs are incorrectly recording biblionumber instead of item number, creating incorrect logs.
This patch corrects this, and modifies the action_logs table in two ways:
- the timestamp is not updated anymore with UPDATES (but still automatically filled when INSERTing)
- to partially correct the broken logs, the log history is filled with the first found item for each biblio

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-21 11:42:56 -04:00
Jared Camins-Esakov
c1f4866312 Merge branch 'bug_9014' into 3.12-master 2013-03-21 11:08:38 -04:00
Jared Camins-Esakov
c7643737d5 Bug 9014: Increment version number
Database update for bug 9014 has been given version 3.11.00.107
2013-03-21 11:08:08 -04:00
b900f5f056 Bug 9014 - Add time due to slips
This patch modifies Koha::DateUtils::output_pref to support the new system preference TimeFormat, which defines the visual format for a time as either the 24 hour format ( default ), or the 12 hour format (HH:MM AM/PM).

The patch also modifies C4::Members::IssueSlip to use output_pref rather than format_date.

Test Plan:
1) Apply patch
2) Run updatedatabase.pl
3) Issue an item to a patron, verify the times are in 24 hour format.
4) Switch TimeFormat to the 12 hour format.
5) Revisit the patron record you issued an item to, times should now be in a 12 hour format.
6) Print a slip for this patron, you should now see the time as well as the date.

Katrin Fischer <Katrin.Fischer.83@web.de>
Passes all tests after fixing the test count in t/DateUtils.t.
Fixed conflicts in syspref.sql and updatedatabase.pl.

Signed-off-by: Cedric Vita <cedric.vita@dracenie.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
As we have another sign-off on this now I gave it a quick
run through and it works as expected.
All tests and QA script pass.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-03-21 11:07:42 -04:00
Jared Camins-Esakov
f26135d5b8 Merge branch 'bug_9045' into 3.12-master 2013-03-21 10:47:47 -04:00
Sophie Meynieux
e8b470ede4 Bug 9045 - Adding some parameters to export_borrowers.pl
Followup : Adding test if results has some records and usage example for
--where clause

Signed-off-by: Owen Leonard <oleonard@myacpl.org>

I infer from the bug comments that a proper test for this patch is to
check how the script reacts if it returns no results with a --where
clause, and to verify that there is a good usage example for the --where
option. These are both true, so I think this passes.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
All tests and QA script pass.

Tests done:
- tested -s option with \;
- tested -f surname -f borrowernumber to have multiple fields specified
- tested -w with "borrowernumber > 100" and similar with and without
  results - if no results a message is shown
- tested -h shows documentation for new options
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-03-21 10:47:42 -04:00
Sophie Meynieux
74090b8d39 Bug 9045 : Adding --where parameter to filter what kind of borrowers to export and --separator to choose a specific caracter for patron export
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Tested, works as advertised. Note, to use tab character as a separater,
do this: -s $'\t'

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Comments on second patch.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-03-21 10:47:42 -04:00
Jared Camins-Esakov
58067fcc98 Merge branch 'bug_9769' into 3.12-master 2013-03-21 10:11:18 -04:00
Jared Camins-Esakov
b3c81bd0a8 Merge branch 'bug_9718' into 3.12-master 2013-03-21 09:57:23 -04:00
271bfff521 Bug 9718 - Add POD and comments for Check_Userid and Generate_Userid subs
Add plain English explanations in POD blocks for how the Check_Userid and Generate_Userid subs work.

Also add a comment explaining how the do loop works with the while condition in Generate_Userid, since the condition is worded awkwardly.

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
String patch adding documentation.
POD test and other tests pass.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-03-21 09:57:21 -04:00
Jared Camins-Esakov
6a0157408a Merge branch 'bug_9764' into 3.12-master 2013-03-21 09:55:20 -04:00
f6dae54fc2 Bug 9764 - Replace YUI buttons on authority search popup with Bootstrap
The authority search popup styles several buttons with YUI. Bootstrap
should be used instead.

This patch removes YUI styling from two buttons ("Submit" and "Cancel")
in favor of default styling for consistency's sake. The other buttons
("Clear field" and "Create new") have been moved to a standard toolbar
div and styled with Bootstrap.

Some inline JavaScript has been moved to the <script> tag in order to
eliminate undesirable javascript: pseudo-protocol links.

To test, open a bibliographic record for editing and click the authority
edit link next to a field with authority-linked data in it.
- Confirm that buttons in the popup window look correct.
- Confirm that the "Clear field" button clears the field in the MARC
  editor.
- Confirm that the "Create new authority" button launches a blank
  authority editor.

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

Comment: Work as described. No errors.
All buttons works: look correct, clear works, create works.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
All tests and QA script pass.
Tests done according to test plan.

http://bugs.koha-community.org/show_bug.cgi?id=9765
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-03-21 09:55:18 -04:00
250467eb41 Bug 9769 [Revised] Replace YUI buttons on acquisitions basket page with Bootstrap
Toolbar buttons on the acquisitions basket page are constructed by YUI.
They should use Bootstrap instead.

Other minor changes: Fixes for invalid markup.

To test, view baskets in various states: Empty, open closed. View
baskets in groups and not in groups. Buttons should look correct and
work correctly:

- Edit
- Delete
- Close
- Reopen
- Export

Revision corrects check for 'skip_confirm_reopen' variable when
reopening baskets. Please test with BasketConfirmations both on and off.

Signed-off-by: Brendan <brendan@bywatersolutions.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Tested all options, some notes about behaviour:
- closing a basket is only possible, when there are no uncertain prices
  (no button close basket)
- reopening a basket requires, that you first remove the basket from
  any basket group (no button to reopen basket)
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-03-21 09:52:24 -04:00
Jared Camins-Esakov
186d97ff2b Merge branch 'bug_9771' into 3.12-master 2013-03-21 09:47:08 -04:00
3dae345428 Bug 9771 [Revised] Replace YUI buttons on acquisitions basket groups page with Bootstrap
The acquisitions basket group page has a toolbar with YUI-generated
buttons and menus. It should use Bootstrap instead.

This patch removes the YUI menu buttons altogether, replacing that
functionality with the sidebar menu now included on other acquisitions
pages (See Bug 8913). The "New basket group" button is now styled by
Bootstrap.

Other minor changes: Corrections of invalid markup, improvement to
breadcrumbs.

To test, view the basket group page and confirm that the toolbar button
looks correct and works correctly. Confirm that navigation works and
that functionality of the basket group edit page is not affected.

Revision adds an explicit width to the basket-grouping form columns
so that they don't stretch too wide (and far from each other) when
the browser window is very wide. This better replicates the layout
of the previous version.

Signed-off-by: Mathieu Saby <mathieu.saby@univ-rennes2.fr>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
All tests and QA script happy.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-03-21 09:47:07 -04:00
Jared Camins-Esakov
fcefbff02b Merge branch 'bug_9438' into 3.12-master 2013-03-21 09:42:13 -04:00
Bernardo Gonzalez Kriegel
b874caed6c Follow-up Bug 9438 - Biblio notes displayed when ordering
This patch re-enables displying Notes when select
Modify order from basket view.

To Test:
1) After applying first patch, Notes are empty when select Modify order
2) Apply patch
3) Now Notes are visible again, unless the order is new.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-03-21 09:42:06 -04:00
Adrien Saurat
12b050a83f Bug 9438: biblio notes displayed when adding order
The biblio notes should not appear in the "Notes" textarea
of the "New order" page, in Acquisitions.

TEST PLAN
1) Find a biblio with a note (for example 300$a in UNIMARC, 500$a
in USMARC), or add a note to a biblio.

2) In a basket, create a new order for that title. Before the patch,
the "Notes" textarea contains the note from the biblio. After the patch
the textarea is empty.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-03-21 09:42:05 -04:00
Jared Camins-Esakov
12d4456db8 Merge branch 'bug_9884' into 3.12-master 2013-03-21 07:49:11 -04:00
d95f04313d Bug 9884 - Plugin permissions not added to translations
Test Plan:
1) Run xt/permissions.t, note the errors
2) Apply patch
3) Re-run xt/permissions.t, note the errors are gone

Signed-off-by: Claire Hernandez <claire.hernandez@biblibre.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
All tests and QA script pass.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-03-21 07:49:04 -04:00
Jared Camins-Esakov
c8eb5eab63 Merge branch 'bug_9434' into 3.12-master 2013-03-20 15:54:23 -04:00
Jared Camins-Esakov
a20f737893 Bug 9434 follow-up: fix number of tests skipped when cache is disabled 2013-03-20 15:50:37 -04:00
Jared Camins-Esakov
144cd1e6ec Merge branch 'bug_9457' into 3.12-master 2013-03-20 15:36:45 -04:00
Bernardo Gonzalez Kriegel
3209941f3f Bug 9457 - Followup - Ordering branches should be case independent (2)
This follow up reinstates or add check for undef returned
by C4::Context->userenv, only where previous patch touch
code.

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-03-20 15:36:19 -04:00