Commit graph

16276 commits

Author SHA1 Message Date
Stéphane Delaune
90928e1404 Bug 7794:redefine the field id as PRIMARY KEY of sessions
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-05-28 11:46:47 +02:00
3da0f42653 Bug 8014 - On the patron entry form hide "restricted until" field if "Restricted: No" is checked
This patch adds JavaScript to automatically hide the "Restricted
unil" form field on the patron entry form if "Restricted: No" is
selected. If "Restricted: Yes" is chosen the "Until:" field
is shown and focus is given to it.

The patch also adds a note, "(optional)" after the "Until:" field
to make it clearer that a date is not required.

To test, open a patron record and try moving the selection
between "Restricted: No" and "Restricted: Yes." Confirm that
the "Until:" field is shown and hidden as expected. Confirm
that the restricted flag is correctly set or unset upon save,
including setting the flag with or without a date.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-05-28 11:31:25 +02:00
Paul Poulain
57ecf1a332 Welcome to the 182th commiter ! 2012-05-28 11:29:28 +02:00
Simon Story
ffac4924b8 Bug 6684: Fixes to koha-remove
Fixes bugs 6684 6997 4880:
6684 koha-remove should check the number of arguments it gets
6997 koha-remove leaves system in inconsistent state if there is an error
4880 koha-remove sometimes fails because user is logged in

Amended by chrisc@catalyst.net.nz
Trying to resolve conflicts.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Rebased on top of bug 7924.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-05-28 11:14:27 +02:00
1a20f3005b ug 8078 [REVISED] my summary showing contents of incorrect tab
This patch moves the holdings tab content to the correct
position sequentially with regard to the order of the
tabs themselves. My guess is that the jQuery upgrade has
something to do with this change but I'm not sure why
(probably something in our aging tabs plugin which works
differently with the new jQuery version).

Making the sequence of the tab contents match the sequence
of the tabs seems to fix the problem.

Revised to correct the error in placement of the tags markup
in the staff client.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-05-28 10:36:27 +02:00
Dobrica Pavlinusic
5baa35ad3b Bug 7846 - get_batch_summary massive speedup
current code is using DISTINCT and another SQL query which can be replaced with GROUP BY
for massive speedup. In our case, generating Manage Batches screen DBI time decreased
from 24.762 s to 0.147 s

Aside from correct usage of relational database, this change also cleans up code nicely.

This change removed semi-columns from SQL query which broke Manage Patron batches.

Test scenario:

1. open Manage Batches screen and take note of time needed to generate it
2. apply this patch
3. reload page and check page genration time

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-05-25 17:47:14 +02:00
Katrin Fischer
2f837bafee Bug 7926: Acq search results show empty () for orders without basket group
To test:
- search for orders by title or vendor
- make sure some results are attached to a basket group, while others are not
- make sure correct information shows in the basket group column of search results

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>

- Fixed merge conflict

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-05-25 17:44:43 +02:00
ddfb28876c Bug 7980: [SIGNED-OFF] Group search results tag input with other actions
This patch hides the tag input form in OPAC search results when
TagsInputOnList is turned on. An "Add tag" is added to the
"Actions" line. Clicking the link un-hides the tag input form.
A "Cancel" link hides it again.

The patch also moves the display of ratings to the bottom of
the list so that existing tags are grouped with the other
title details which are prefixed with a label ("Type:",
"Availability", etc.).

To test, enable the TagsInputOnList system preference. Do a search
and try adding tags from the search results list.

signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-05-25 17:34:18 +02:00
cfae2c6a61 Bug 8080 - login and password is pre-filled by the browser when creating a new patron
When creating a new patron, if you have chosen to let your browser remember your
login and password for you, the login and password fields will be pre-filled with
them, leading to a systematic error "the passwords entered do not match" since
the second password field was not filled. These fields should be blank.

Add the directive autocomplete="off" to the memberentry form tags.

Signed-off-by: Liz Rea <wizzyrea@gmail.com>
passes t xt
enhances usability of password forms, gets my signoff.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-05-25 17:32:56 +02:00
fe823735a5 Bug 8107 - Disabled buttons not distinguishable from enabled buttons
Add a "greyed-out" style for disabled buttons.

Having looked through the templates for examples of usage of this
I'm not convinced that we should really be showing disabled buttons.
I think in general it would be better to hide or show a button
based on whether the action is available.

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>

I agree, I think hiding or showing is better, but this patch is
harmless enough, until we want to go fixing our usage

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-05-25 17:30:50 +02:00
Jonathan Druart
1b08f100ba Bug 5345: DataTables integration in acquisition module [4]
basket.tt
'Modify' and 'Delete' columns become unsortable

http://bugs.koha-community.org/show_bug.cgi?id=8109
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-05-25 17:28:55 +02:00
Jonathan Druart
a90d58e518 Bug 5345: DataTables integration in acquisition module [4]
basket.tt

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Columns for 'Modify' and 'Delete' are sortable, which doesn't hurt but could be removed.

http://bugs.koha-community.org/show_bug.cgi?id=8109
2012-05-25 17:28:53 +02:00
Jonathan Druart
9a1550bf53 Bug 8009: Followup Item descriptive data not populated on pay.pl
Separation of title from the description.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-05-25 17:26:04 +02:00
D Ruth Bavousett
b023de813b Bug 8009: Item descriptive data not populated on pay.pl
GetBorNotifyAcctRecord was not populating the {title} element of the
hash, which pay.tt will use.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-05-25 17:26:02 +02:00
b4a1662889 Bug 7889 [Acquisitions] Use standard style for errors and messages
Correcting style of the warning on the Acquisitions home page
which appears if no budgets have been defined.

Also correcting the logic by which the warning appears, as a
change to the script inadvertently prevented it.

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-05-24 18:11:59 +02:00
ed1382a87a Bug 7889 [Search errors] Use standard style for errors and messages
There are two instances in the templates where markup is defined
for displaying search errors. I've never seen these appear and I
have no idea what kind of error might trigger it, but now it will
display correctly.

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
2012-05-24 18:11:58 +02:00
723734513b Bug 7889 [Authorities duplicates] Use standard style for errors and messages
The warning shown in the authorities editor when there is
a possible duplicate is styled incorrectly. In addition the
design of the warning is inconsistent with that shown in the
bibliographic record editor.

This patch revises the style and layout of the duplicate error
box. It also corrects a problem which appears in the biblio
and authority editors where a non-existent JS window function
was called. I have added the function to the default JS include
and revised the editor pages to use it.

To test:

- Create a record in both the cataloging and authorities
  editors which will trigger a duplicate warning.
- Click the link to the existing record. A separate window
  should pop up.
- In both editors try each option:
   - Confirm the duplicate and go to the existing record.
   - Deny that the record is duplicate and continue to save.

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
2012-05-24 18:11:55 +02:00
102de83746 Bug 7889 - Use standard style for errors and messages
Styling subscription renew message according to standard style.
Also:
 - Adding direct link to renew from message suggesting renew.
 - Adding output of expiration date to message.

To test open a subscription with an impending expiration. You
should see a dialog-styled message, "Subscription will expire XX/XX/XXXX.
Renew this subscription."

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
2012-05-24 18:11:54 +02:00
Stéphane Delaune
55b83c79e6 Bug 8040: bad name in acquisitions-menu
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-05-24 18:09:46 +02:00
Paul Poulain
a6b3dcb301 Bug 5795 follow-up, DBRev number 2012-05-24 18:08:36 +02:00
Amit Gupta
b920b61799 Bug 5795 Update the database as follow-up If sys pref
ReservesControlBranch has null then update the table to
insert a PatronLibrary as value

To Test:
1) Go to mysql use koha database
2) select * from systempreferences where variable = 'ReservesControlBranch'; Check if value set to ItemHomeLibrary.
+-----------------------+-----------------+-------------------------------+-------------------------------------------------+--------+
| variable              | value           | options                       | explanation                                     | type   |
+-----------------------+-----------------+-------------------------------+-------------------------------------------------+--------+
| ReservesControlBranch | PatronLibrary   | ItemHomeLibrary|PatronLibrary | Branch checked for members reservations rights. | Choice |
+-----------------------+-----------------+-------------------------------+-------------------------------------------------+--------+

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-05-24 18:06:01 +02:00
Katrin Fischer
2d5655cdd4 Bug 5795 [SIGNED-OFF] - Missing ReservesControlBranch system pref in database installer
sysprefs.sql file was missing ReservesControlBranch.

To test:
1) Create a new installation and check sysprefs.sql loads correctly.
2) Check ReservesControlBranch shows up correctly in the sys pref editor.
3) Check sys pref can be edited and new value saves correctly.

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

- Line is added at the end of installer/data/mysql/sysprefs.sql
- Tested Line diretly in MySQL with a systempreferences table where variable 'ReservesControlBranch' was missing. Data inserted correctly.
- Syspref shows up in Staff client

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>

- Fixed merge conflict
2012-05-24 18:05:58 +02:00
cf91dc45cf Bug 8124 - Hide option to download results of items with no checkouts report
We should not show disabled controls for features which don't work.

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-05-24 17:58:12 +02:00
285f06e394 Bug 7112 - Having two prices in 020$c causes basket creation to fail from staged marc import
The root problem here is that the price is being pulled from the MARC record
and is then run through Number::Format::unformat_number. This routine is
really being misused, and should only be used to reverse the effects of
Number::Format on a number string. We are apparently using it to strip
out currency characters and the like.

Number::Format::unformat_number will choke if there is more than one period (.)
in the price field. MARC standards do not limit this field to a single period,
so unless there is only one period, we should skip number unformatting.
Examples of that break unformat_number include '18.95 (U.S.)', and
'$5.99 ($7.75 CAN)', both of which are perfectly valid.

This commit adds the function MungeMarcPrice that will better handle
find a real price value in a given price field. It does a very good
job at finding a price in any currency format, and attempts to find
a price in whichever currency is active before falling back to
the first valid price it can find.

The variable $price may fail to have an actual price, in which case
the price then defaults to '0.00', which would be rarely if ever the
correct price. To combat this, I have added highlighting to any
price in the Order Details table that begins with 0 ( i.e. '0.00' ).

Also, fixed the incomplete table footer, adding a new td with a
span of 3 to fill in the nonexistant cells.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-05-24 15:59:21 +02:00
e9c0f206ac Bug 8135 : Fix installer to copy services/ dir
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>

http://bugs.koha-community.org/show_bug.cgi?id=7318
2012-05-24 15:53:49 +02:00
6cb7dadc59 Bug 8128 - [SIGNED-OFF]Followup - Change default value for cache_expiry
Change default value for cache_expiry from 0 to 300.

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-05-24 15:48:42 +02:00
65129084ef Bug 8128 - can't seem to run new sql reports
Reports cannot be saved because saved_sql.cache_expiry cannot be null.
Fixed by setting default to 0 if a cache_expiry value is not
passed into the function.

Signed-off-by: Liz Rea <wizzyrea@gmail.com>
passes t xt

Verified original bug, patch resolves issue.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-05-24 15:48:37 +02:00
Paul Poulain
4533ff7dd3 Bug 7398 follow-up DBRev number 2012-05-24 15:47:37 +02:00
Srdjan
c80fe2be2d bug_7398: Replaced OPACDisplayRequestPriority syspref with OPACShowHoldQueueDetails
New syspref is Choice, options being:
- None
- Priority only
- Holds number only
- Holds number and priority

Show holds count on OPAC detail

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-05-24 15:32:19 +02:00
Paul Poulain
66350848b6 Merge remote-tracking branch 'origin/new/bug_7178' 2012-05-24 15:02:21 +02:00
Julian Maurice
5a29c39c9f Bug 7178 follow-up: Do not fill items table with "(undefined)"
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-05-24 14:56:03 +02:00
Julian Maurice
f3aa919c50 Bug 7178 follow-up: Fix check_additem when UniqueItemFields is empty
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-05-24 14:55:44 +02:00
Paul Poulain
0754c2f7cf Bug 7977 follow-up DBRev number 2012-05-24 14:33:30 +02:00
Paul Poulain
28d3693adc Bug 7977 follow-up, fixing UC breaking coding guidelines 2012-05-24 14:33:19 +02:00
9959cf45e7 add edit_quotes to es-ES/mandatory/userpermissions.sql
Signed-off-by: Mason James <mtj@kohaaloha.com>

http://bugs.koha-community.org/show_bug.cgi?id=7977
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-05-24 14:15:21 +02:00
Chris Nighswonger
9a867b176c Fixing a typo in the quotes-upload help file and hardcoded css
http://bugs.koha-community.org/show_bug.cgi?id=7977
Signed-off-by: Mason James <mtj@kohaaloha.com>
2012-05-24 14:15:17 +02:00
Chris Nighswonger
d42e35ef49 Making source a text field rather than a varchar to avoid potential length limitations
http://bugs.koha-community.org/show_bug.cgi?id=7977
Signed-off-by: Mason James <mtj@kohaaloha.com>
2012-05-24 14:15:15 +02:00
Chris Nighswonger
02a8557a3e Bug 7977: Improving upload result message display
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Mason James <mtj@kohaaloha.com>
2012-05-24 14:15:09 +02:00
Chris Nighswonger
f328a32402 Bug 7977: Fixing a bug which results in quote fields being incorrectly offset when saving uploaded quotes
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Mason James <mtj@kohaaloha.com>
2012-05-24 14:15:05 +02:00
Chris Nighswonger
5c6129687b Bug 7977: Removing unused code from quotes_ajax.pl
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Mason James <mtj@kohaaloha.com>
2012-05-24 14:14:59 +02:00
Chris Nighswonger
d78641e7c0 Bug 7977: Followup patch addressing items pointed out by Jonathan Druart
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Mason James <mtj@kohaaloha.com>
2012-05-24 14:14:53 +02:00
Chris Nighswonger
fe09f2f6bd Bug 7977: Adding Koha standard help files for QOTD feature
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Mason James <mtj@kohaaloha.com>
2012-05-24 14:14:51 +02:00
Chris Nighswonger
ef064dca6d Bug 7977: Adding Daily Quotes Tests to Koha.t test suite; also fixing sort order on quote selection SQL
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Mason James <mtj@kohaaloha.com>
2012-05-24 14:14:45 +02:00
Chris Nighswonger
73c5061379 Bug 7977: Fixing quote sample data timestamps
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Mason James <mtj@kohaaloha.com>
2012-05-24 14:14:23 +02:00
Chris Nighswonger
b3726f28cf Bug 7977: Fixing captialization on the tools main page
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Mason James <mtj@kohaaloha.com>
2012-05-24 14:14:21 +02:00
Chris Nighswonger
a459da2c13 Bug 7977: Further UI work on the QOTD editor
This patch implements more of oleonard's suggestions as well as other
improvments:

--Adds instructions for using the QOTD editor
--Moves inline css to quotes.css, etc.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Mason James <mtj@kohaaloha.com>
2012-05-24 14:14:17 +02:00
Chris Nighswonger
0a9f8f86aa Bug 7977: Further UI work on the QOTD uploader
This patch addresses another of oleonard's points as well as
some general cleanup:

--Adds instructions to each stage of the uploader
--Consolidates quote tool css into quotes.css

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Mason James <mtj@kohaaloha.com>
2012-05-24 14:14:15 +02:00
Chris Nighswonger
12cb095bac Bug 7977: QOTD uploader to enable uploading csv files containing quotes
This series will add a DataTable's based upload/editor with which
to upload csv files containing quotes to be used by the QOTD
feature.

The file should be formatted thusly:

"source","text-of-quote"
"source","text-of-quote"
...

Note: This work serves as a good example of potential improvements
in all other "editor" and file upload areas of Koha.

This patch is a squash of the following work:

--Adding code to parse CSV file contents and push it into a DataTable
--Adding in jEditable to enable table editing
--Adding ajax to post data back to the server to be saved
--Fixing edit and adding delete functionality
--Adding some missing css as well as server feedback on save
--Fixing a bug which limited the number of quotes which could be uploaded
--Also fixing a minor bug with fnCSVToArray and doing some style cleanup.
--Adding sanity checks to verify file type and size
--Implements YUI button widget/toolbar
--Improved handling of hiding uploader UI
--Adds row selectability
--Adds multi-delete capability
--Adds YUI button/toolbar widget
--Fixing capitalization in quote uploader
--Implements improvments suggested by jcamins and oleonard

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Mason James <mtj@kohaaloha.com>
2012-05-24 14:14:09 +02:00
Chris Nighswonger
eb7e930eea Bug 7977: Quote-of-the-day (QOTD) Feature for OPAC
This feature will add the option of displaying a select quote
for the day on the OPAC homepage. It will include the addition
of a QOTD editor in the tools section of the staff interface
which will allow the addition, editing, and deletion of quotes.
A single system preference will enable/disable the display of
the QOTD on the OPAC homepage. A new granular permission will
also be added to conrol user access to the QOTD editor tool.

Possible extentions to this would be code to allow alternate
quote selection algorithms to be added to vary how the currently
displayed quote is selected from the table of quotes.

This patch is a squash of the following work:

--Adding quotes table to kohastructure.sql and updatedatabase.pl

Note: This patch is intended for a MySQL based installation only.
That means that it includes backticks because that is what is required
at this point in history to install Koha correctly on a MySQL based
installation.

Feel free to port this over to the Pg stuff in the data/Pg directory.

--Adding system preference to control display of QOTD on OPAC main page
--Adding sample quote data

These quotes are taken from various US presidents. I'm not sure these
are applicable to the rest of the world, so I'm leaving it to translators
and others to add sample quote data for other languages.

--Adding edit_quotes user permissions
--Squash with other db related patches in this series
--Adding quotes editor pages to tools
--Adding QOTD editor link to tools homepage
--Integration of DataTables into QOTD Editor
--Impleminting jEditable into the quote editor
--Adding delete and add option to editor
--Fixing OPAC display so the QOTD div does not show if no quote is returned
--Also removing useless code from tools/quotes.pl
--Adding spans around QOTD foo in opac-main.tt
--Also fixing quote selection logic to accomodate the possibility of
    a single quote in the db a litte better.
--Changing timestamp column header to a more user-friendly 'Last Displayed'
--Fixing bug in quote selection logic. This bug caused a situation where
    when the table had only a single quote with an id greater than 1 in it,
    no quote would be selected.
--Fixing up sorting in the quote editor table. --jcamins
--Adding span element to quote separator --jcamins
--Overriding the default empty table message supplied by datatables-strings.inc
--Adds missing page heading
--Adds beginning of click-for-help elements.
--Refactors delete functionality to allow selecting of quotes to delete,
    enabling multi-delete.
--Refactors saving added quote functionality so that striking <Enter>
    saves the new quote.
--Refactors canceling aded quote functionality so that striking <Esc>
    cancels the new quote.
--Removing debug console.log statements
--Implementng the YUI button widget/toolbar used on other pages.
--Adds a 5px radius to all YUI buttons to bring them into
    conformity with the general trend toward rounded corners
--Fixes capitalization in quote editor
--Implements improvements suggested by jcamins and oleonard
--Adds DataTables Plugin dataTables.fnReloadAjax.js

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Mason James <mtj@kohaaloha.com>
2012-05-24 14:14:05 +02:00
Chris Nighswonger
4953b57fcd Bug 7977: Adding DateTime::Format::MySQL as a core dependency
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Mason James <mtj@kohaaloha.com>
2012-05-24 14:14:03 +02:00