Commit graph

5672 commits

Author SHA1 Message Date
Jared Camins-Esakov
02a6d2b1d0 Bug 7249: Syspref to control number of rows in web service results
The original patches for bug 7249 had a hardcoded limit of ten rows in the
results returned by the web service. This patch adds a SvcMaxReportRows syspref
which allows the librarian to choose how many rows should be returned by the
web service.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-05-11 10:26:33 +02:00
Chris Hall
24213703d5 Bug 7249 : Allow reports to be called through a restful interface
Hands back JSON, and supports caching

Squashed commit of the following:

commit 5c93506079738b9a13139417d3a0734289a4b007
Author: Chris Hall <chrish@catalyst.net.nz>
Date:   Mon Nov 21 15:41:14 2011 +1300

    Fixed bugs when creating reports, added more user friendly input and
    feedback

commit c62430bb358ee4af6ee5331b4d3a2ed67f723032
Author: Chris Hall <chrish@catalyst.net.nz>
Date:   Mon Nov 21 12:00:27 2011 +1300

    Added caching to intranet report webservices, added cache expiry and public
    options to reports

commit 2d89f0777d95b26bf08635782070b6367d0698f3
Author: Chris Cormack <chris@bigballofwax.co.nz>
Date:   Wed Nov 9 20:29:26 2011 +1300

    Working on caching for services

commit e0511f180cebd81747858ad776433fe3a1cf6854
Author: Chris Cormack <chris@bigballofwax.co.nz>
Date:   Wed Nov 9 08:28:26 2011 +1300

    Starting work on webservices

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Patch includes database update adding 2 new fields to the saved_sql table.

1) Checked that adding/deleting/editing of sql reports still works and new
fields are correctly saved to the database.

2) The saved reports page now lists the new fields correctly.

3) Checking URLs with JSON output
- if report is not public http://localhost/cgi-bin/koha/svc/report?id=2 fails,
but http://localhost:8080/cgi-bin/koha/svc/report?id=2 works
- if report is public, both links work

4) Checking results are cached
Created a report listing my borrowers, setting caching to 60 seconds and
added new borrowers before doing following tests.
- URL doesn't show new borrower immediately - correct
- Turning off the usecache system preference updates data - correct
- Restarting memcached updates data '/etc/init.d/memcached restart' - correct
- Waiting until cache time runs out updates data - correct

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

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Retested the feature and renewing my sign-off.

There are some things that should be noted:
- currently there is a hardcoded limit of 10 results for the reports webservice
- reports with runtime parameters are currently not supported
2012-05-11 10:26:29 +02:00
Paul Poulain
a8c8cc3ca5 Bug 7903 follow-up, wrong capital cases
Also fixing a tiny indentation problem
2012-05-07 23:26:16 +02:00
Lyon3 Team
7a1b608472 Add ordernumber column in orders history table
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>

There was a conflict (whitespace changes causing a conflict)

http://bugs.koha-community.org/show_bug.cgi?id=7903
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-05-07 23:21:34 +02:00
Gaetan Boisson
09cdcad460 Bug 7949 - a different favicon for the staff client
different favicon proposal

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-05-07 23:19:56 +02:00
Stéphane Delaune
ab602f9b76 bug 7990 - styl= in aqplan.tt
Signed-off-by: Mason James <mtj@kohaaloha.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-05-07 23:17:33 +02:00
Srdjan
b9f4a8cac6 bug 6372: moved background-job.inc to background-job-progressbar.js
Check for div 0 when calculating percentage

Signed-off-by: Liz Rea <wizzyrea@gmail.com>
div0 no longer appears on 0 size jobs.
Passes t xt

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-05-07 23:00:34 +02:00
Colin Campbell
d78c28db7b Bug 7987 [SIGNED-OFF] Fix typo in circulation template
li was not properly closed after loss of a character

Signed-off-by: Marc Veron <veron@veron.ch>

- Checked koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt before / after applying patch
- Line is changed as expected, ends now with </li>

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-05-07 22:49:54 +02:00
Katrin Fischer
22b6705b4f Bug 3413: Checkboxes for new subfields not saving correctly
The bug was in the numbering of the fields and subfields in the form.
The form elements for the 'new subfield' got the same numbered names and ids as
the form elements for the second subfield. (example: repeatable1)
The patch fixes the numbering to continue to the new subfield.

To test:
- Create some new subfields and check all checkbox fields save correctly
  (mandatory, repeatable, is url)
- Check that other subfields' checkboxes are not changed
- Check existing subfields and newly created subfields can be edited

Signed-off-by: mveron <veron@veron.ch>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-05-07 22:23:49 +02:00
Paul Poulain
3b41bd09ed Merge remote-tracking branch 'origin/new/bug_3969' 2012-05-07 21:49:42 +02:00
Katrin Fischer
39e5477f56 Bug 3969: Budget search in acquisition doesn't work (string changes)
String changes:
- Correcting tab name from "Search budgets" to "Seach funds"
- Changing search option from "Name" to "Fund code"

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Strings look a-ok.
2012-05-07 21:42:34 +02:00
Paul Poulain
cd9812c928 Bug 7979 tiny follow-up for translatability (string freeze)
A few tiny string changes have been introduced, that I revert with this patch as we're string freeze
* Advanced search had been changed to Advanced Search (useless capital S). this is a mistake, I've reverted
* same thing for Koha administration
* the suggestions/comment/tags links have had a <span> and : added, the translator tool consider them as being changed. Switching back to the previous display.

The suggestion/comment/tags change can probably be reintroduced later
2012-04-23 11:41:31 +02:00
Paul Poulain
5c4f4730b0 [PATCH] Bug 7979 [FOLLOW-UP] New design for staff interface, rights fix
Fixes display of pending links (with necessary permissions being
enforced).

(patch made by Adrien Saurat, does not apply on my computer for an unknown reason)
2012-04-23 11:01:12 +02:00
d09260c58b Bug 7979 [FOLLOW-UP] New design for staff interface
This follow-up changes the structure of the page
so that it uses a standard YUI grid structure. This
helps keep the page flexible while preventing the
buttons from wrapping below the news block. The buttons
have been given a percentage width and a max-width value.

The benefit to flexibility is countered by the less-
strict spacing of the buttons. The columns of buttons
don't form a strict grid at higher screen widths.

There is probably a middle ground between this and
the previous design but I think we need to make it a
priority for the design not to break at 1024x768.

Another minor change: A tweak to the position and
padding of the icons.
2012-04-20 18:24:41 +02:00
Adrien Saurat
d830925be8 Bug 7979: New design for staff interface + fixes + css call moved
Many modifications, see bugzilla for more informations.
Moved the CSS call to allow override with intranetusercss.
2012-04-20 18:24:38 +02:00
4916080bc2 Bug 7950 - Typo for preference intranetuserjs
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-04-19 11:30:28 +02:00
Gaetan Boisson
5cb92abdcd Bug 7693 - clear screen button misaligned
This patch removes firefox specific lines in the css which were breaking the display

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

This fixes the layout problem in current versions of Firefox. I think
the CSS which is removed by this patch might be necessary for older
versions of Firefox, but if this turns out to be a problem we can
follow up.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-04-19 11:29:45 +02:00
096447f086 Bug 7828 - On circulation home page, URL to offline circulation Firefox addon should be a hyperlink
Along with making the URL a hyperlink I removed the language
part of the URL ("/fr/"). The link correctly redirects to 'en'
for me. I'm curious whether it will for other languages.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>

Link works and redirects to my language (english).

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>

(Redirects to fr if your browser is FR)
2012-04-19 11:22:11 +02:00
Katrin Fischer
b42a9c46ca Bug 7371: Add 'cardnumber' as option for AutoEmailPrimaryAddress
The systempref.sql file had one more option 'cardnumber' that was not
visible from the system preference editor. This patch adds the setting.

To test:
- Check new setting cardnumber is available for AutoEmailPrimaryAddress
- Use setting with a patron that has an email address as cardnumber and
verify email is sent out correctly.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-04-19 11:20:02 +02:00
Katrin Fischer
36b7239f40 Bug 7733 - HidePatronName not working on moredetail
Patch implements HidePatronName system preference for 'Checkout status'
on moredetail (tab items from staff detail page).

Also adds some new 'if' statements, so 'Serial enumeration' and 'Paid for?' are
only shown when they are not empty.

Silences warns in the logs.

To test:
- Toggle system preference for an issued item and check name/cardnumber
are displayed correctly.
- Check serial enumeration and Paid for? show when not empty.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-04-19 11:05:09 +02:00
Katrin Fischer
b302e4a525 Bug 7833 - unique holiday link broken
As Nicole stated on the bug the branchcode was missing from the links.

To test:
- add unique holidays to calendar for different branches
- click on link and check that the date is opened in the right calendar

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>

Clicked links for unique holidays and exceptions for
multiple branches and everything works perfectly.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-04-19 10:54:00 +02:00
Katrin Fischer
d8aa557fc9 Bug 7845: Multiple 260s don't display properly in search results
Corrects display for multiple 260 fields in intranet and OPAC.
In intranet the order of fields was wrong on the detail page.
In OPAC and intranet punctuation for multiple 260 fields in the
result list was not displaying properly.

Example after correction:
Publisher: Jena : Elsevier, 1907 ; Stuttgart : Franckh, 1907-1992 ; Jena : Urban & Fischer, 1993-2003

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2012-04-19 10:51:33 +02:00
mveron
51b21b1b57 Bug 7528 - amount subtracting 1 cent
Rounding issue with JavaScript and float numbers, JavaScript changed to do no calculation if discount is 0

Signed-off-by: Ian Walls <koha.sekjal@gmail.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-04-18 17:30:14 +02:00
Nicole C. Engard
3827973408 Bug 7936: Reports Help Files for 3.8
This updates the existing help files and adds a new
help file for the holds stats report.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-04-13 16:12:39 +02:00
Nicole C. Engard
4a99852ccf Bug 7936: Patron Help Files 2012-04-13 16:12:38 +02:00
Nicole C. Engard
671e85cc52 Bug 7936: Catalogue Help Files
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2012-04-13 16:12:37 +02:00
Nicole C. Engard
ae36d24ab3 Bug 7936: Patron Card Help Files
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2012-04-13 16:12:35 +02:00
Nicole C. Engard
21d39dad96 Bug 7936: Label Help Files
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2012-04-13 16:12:35 +02:00
Nicole C. Engard
e8c21311b4 Bug 7936: Circ Help Files
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2012-04-13 16:12:34 +02:00
Nicole C. Engard
96830bcd5e Bug 7936: Holds Help File for 3.8
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2012-04-13 16:12:33 +02:00
Nicole C. Engard
99c3506073 Bug 7936: Comments Moderation Help File
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2012-04-13 16:12:31 +02:00
Nicole C. Engard
6961c3880f Bug 7936: Suggestion help file
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2012-04-13 16:12:30 +02:00
Nicole C. Engard
2fd001b8f5 Bug 7936: Authorities Help Files
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2012-04-13 16:12:29 +02:00
Nicole C. Engard
daf1343ba3 Bug 7936: Marc Export Help File
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2012-04-13 16:12:28 +02:00
Nicole C. Engard
b8dba5b81f Bug 7936: Tags help file
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2012-04-13 16:12:27 +02:00
Nicole C. Engard
8e0fa49184 Bug 7936: Tools Help for 3.8
This updates the tools help files and adds a new
help file for the new upload cover images tool.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2012-04-13 16:12:26 +02:00
Nicole C. Engard
72f91afd9c Bug 7936: Cataloging Help Files
These are the updated help files for cataloging

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2012-04-13 16:12:25 +02:00
Nicole C. Engard
3d06358f84 Bug 7936: Help file for Lists
This is the 3.8 help file for lists.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2012-04-13 16:12:24 +02:00
Nicole C. Engard
62a23201c3 Bug 7936: 3.8 Help Files
These are the three help files that do not belong in any
specific directory. Links updated to the 3.8 manual.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2012-04-13 16:12:23 +02:00
468995e4b3 Bug 5345 [FOLLOW-UP] DataTables in Koha
Adding missing images: The "disabled" version of the next,
previous, first, and last buttons.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-04-13 15:44:24 +02:00
Katrin Fischer
3e82127fb8 Bug 2034: Removing unused scripts billig.pl/billing.tt
- Scripts are currently not linked from anywhere in the templates
- Functionality can also be achieved with a custom report
- There are unresolved problems with the sql in the existig scripts

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-04-12 18:09:54 +02:00
430f0ea6ba Bug 7940 - Placing a hold on a single item from the staff cart causes errors
This is caused by the javascript function placeHold() in basket.pl
The cause of this error is thus: when a staff member uses the cart
to place holds on multiple items at once, the cart redirects to
reserver/request.pl with the params 'biblionumbers' ( a string of
biblionumbers separated by slashes ( e.g. '5/4/3/' ) and the param
multi_hold with a value of 1.

When multi_hold is enabled, request.pl splits the string 'biblionumbers'
on those slashes and works on that list.

In placeHold(), when only one item is checked, the system passes
the param biblionumbers with a single biblionumber ( e.g. '5/' )
and does *not* pass the multi_hold param. This causes request.pl
to not parse the biblionumbers param, and thus reserve.pl has
no biblionumber to work on ( hence our error here ).

There are two options to resolve this:
A) Add the multi_hold param even for a single hold from the cart.
B) In the event of a single hold being placed from the cart,
   switch to the standard single hold url ( i.e. request.pl?biblionumber=234 )

This commit resolves the situation using option B, as it seems more
logical than using the multi-holds system for a single hold.

Signed-off-by: Liz Rea <wizzyrea@gmail.com>
passes tests, works as advertised. Good catch!

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-04-12 17:58:49 +02:00
Katrin Fischer
d55cde8ae5 Bug 7834: order search at the top of acq does nothing
Entering a search term for 'title' or 'vendor' at the top search
form in acq (tab 'Orders search') did redirect to the advanced
search form, but didn't start the search.

After applying the patch the search will bring back results immediately
or redirect to the form, when there are no results.

To test:
- Check all searches still work as expected by searching for title,
vendor, order name and invoice number
- Check advanced search still has the search terms prepopulated
- Check searches with and without results are ok

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-04-12 17:14:52 +02:00
Paul Poulain
5d4d33b22d Merge remote-tracking branch 'origin/new/bug_2780' 2012-04-11 09:34:48 +02:00
93ccaaf690 Bug 2780 [FOLLOW-UP] Capitalize strings consistently
Changes to the case of some hidden input values prevented
the user from being able to save a new SQL report.

Signed-off-by: Liz Rea <wizzyrea@gmail.com>
passes tests, can now save sql reports.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-04-11 09:34:27 +02:00
Paul Poulain
61d9d098e9 Updating euskara and french translation teams 2012-04-10 16:13:37 +02:00
Katrin Fischer
47fac215af Bug 7935: Introduce sys pref to control 'browse results' in OPAC
Patch introduces a new system preference "OpacBrowseResults" to control
the feature for browsing and paging through results shown on top of the
left menu on detail pages in OPAC.

Preference is activated by default and can be deactivated using the
system preference.

To test:
 - Check database update works correctly
 - Check that browsing and paging still works with after database update
 - Deactivate the feature by setting 'OpacBrowseResults' to 'Disable'
 - Check the feature does no longer show up in OPAC
 - Check that a new installation also has the system preference with correct default

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2012-04-10 15:26:37 +02:00
Paul Poulain
d8bac226cc Bug 5668 follow-up: removing empty lines in opac.pref
Those lines where introduced by this patch
2012-04-10 14:58:32 +02:00
7eef4c8c70 Bug 5668 - Star ratings in the opac
patch applied to commit eb3dc448d2

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>

Turned on star ratings in the opac on details and results
Searched for titles - saw the stars
Clicked on a title
Clicked on the stars
Clicked on the stars to change my rating
Logged out
Tried to click on stars
Logged in as different user
Rated items that were rated already and saw average change
Changed preference to show only on detail and repeated tests
Changed preference to now show stars

All above tests passed. Signing off.

Rebased 3-19-12 by Ian Walls

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-04-10 14:40:49 +02:00
Katrin Fischer
bd52531d69 Bug 7900: Link to vendor from subscription detail is broken
To test:
- Add a serial subscription with a link to a vendor
- Check the subscription detail page for the name and link to the vendor
- Check that the link works correctly

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-04-10 11:35:18 +02:00