Commit graph

16968 commits

Author SHA1 Message Date
Bart Jorgensen
4930852cca Bug 5327 : Added a few more lines of code to the ItemType.t unit test
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
2012-09-07 14:31:51 +02:00
Jared Camins-Esakov
3752cd4304 Bug 5327 follow-up: add DBD::Mock dependency
In order for the awesome new t/ItemType.t test to work, we need
DBD::Mock.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
2012-09-07 14:31:49 +02:00
ea5c5bf3b4 Bug 6617 - Wrong first indicator value in test
Testing the first indicator value=2 should be used for labeling 'Partial content'.

Sponsored-by: Universidad Nacional de Córdoba
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-09-05 15:57:08 +02:00
Jared Camins-Esakov
4a8e71ea93 Bug 6617: Improve MARC21 enhanced contents display (intranet)
The display of "Enhanced" 505 (contents) fields in the MARC21
XSLT is very poor, resulting in large, unreadable blocks of text,
and -- for some series -- so much unnecessary duplication in the
Notes tab that important information is entirely obscured. This
patch reformats "enhanced" contents fields (MARC21 505 fields with
$t and $r) so as to be more readable by breaking up entries on
separate lines and making titles bold (to make them stand out more).

This patch does not address duplication of information in the Notes
tab, per discussion on the #koha IRC channel.

To test:
1) View record with enhanced 505 field before applying patch. Observe
it is very unfriendly.
2) Apply patch.
3) View same record, note that display is much improved.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Display in staff and OPAC is consistent and improved after
applying the patch.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-09-05 15:56:38 +02:00
Jared Camins-Esakov
0f13ce8380 Bug 6617: Improve MARC21 enhanced contents display
The display of "Enhanced" 505 (contents) fields in the MARC21
XSLT is very poor, resulting in large, unreadable blocks of text,
and -- for some series -- so much unnecessary duplication in the
Notes tab that important information is entirely obscured. This
patch reformats "enhanced" contents fields (MARC21 505 fields with
$t and $r) so as to be more readable by breaking up entries on
separate lines and making titles bold (to make them stand out more).

This patch does not address duplication of information in the Notes
tab, per discussion on the #koha IRC channel.

To test:
1) View record with enhanced 505 field before applying patch. Observe
   it is very unfriendly.
2) Apply patch.
3) View same record, note that display is much improved.

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

This first patch works as advertised. It formats the table of
contents on the opac detail display in a cleaner format.

I recommend that future follow ups fix the staff client to match
and update the title notes tabs on the opac and staff client
to also match the cleaner format for table of contents.
2012-09-05 15:56:35 +02:00
Paul Poulain
2d3bb6e1d4 Merge remote-tracking branch 'origin/new/bug_8550' 2012-09-05 15:54:23 +02:00
Jared Camins-Esakov
9024db88ad Bug 8550: restore ISSN field to Z39.50 search
Sometime in 2009 or so, the ISSN field was removed from the Z39.50 search
page, and the ISBN field replaced with a combined ISBN/ISSN field. Since
this breaks ISBN search for most Z39.50 targets (due to the
differing treatment of ISBN vs. ISSN), this is a bug not a feature.

A future enhancement would be to use Business::ISBN to search for both
ISBN10 and ISBN13.

To test:
1) Apply patch.
2) Do a search for an ISBN using the ISBN field.
3) Do a search for an ISSN using the ISSN field.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-09-05 15:53:46 +02:00
Nicole C. Engard
e2ca4842af Bug 8696: Update Export bibs on Tool Menu
The tool for exporting bibs is now 'Export data'
this patch changes the label on the menu to reflect
that.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-09-05 15:52:18 +02:00
Fridolyn SOMERS
ddcb48c5cb Bug 8261: Cannot search system preferences from Local Use tab
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-09-05 15:46:38 +02:00
909953c507 Bug 8706 - Private lists can be accessed by anyone
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>

Confirmed private lists can be accessed directly before patch is
applied. After applying patch, I can no longer access the list
via the same url.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-09-05 15:29:51 +02:00
43fb058fcd Bug 8704 - Typo in etc/koha-conf.xml
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-09-05 15:27:12 +02:00
5fa6ea6f36 Bug 7784 - Improve clarity of batch modification operations
- Improve clarity of hint about checkboxes
- Inicate that leaving fields blank will make no change
- Add a hint when checking checkboxes stating that the field will
  be deleted.
- Block deletion of required subfields
- Add "required" style to required subfields (matching additem.pl)

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

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-09-05 15:24:08 +02:00
Colin Campbell
6c10d685a7 Bug 8514 Restore Patron Name Display Order
Bug 6303 introduced an include file governing patron name display
unfortunately that changed patron display in search result lists and
on the circ screen header. This adds a parameter restroring the
original surname, firstname order, whose absence was perceived
as a loss of functionality

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-09-05 15:04:52 +02:00
Paul Poulain
0d4acbba5c Merge remote-tracking branch 'origin/new/bug_7613' 2012-09-05 14:54:33 +02:00
D Ruth Bavousett
fafd3e87f5 Bug 7613: OCLC Connexion web service and desktop client, followup patch
Prior patches to this bug had lots of comments like "I don't have a way to test this, so..."

In the OCLC Connexion web, when you choose the option to export to MARC, it'll *send* it, and
say, "Record Exported," but the web client does nothing whatever to confirm that the record
actually landed in Koha.  That's a flaw in their software, but can be easily checked by
looking in Koha to see if an import batch got created.  The desktop client is a little
smarter about this, but needed much more testing, also.

With this patch, both the client and web will actually work.  With a config file and set up as
previously described, The record will be staged and/or imported, and the desktop client returns
a useful message about what happened, *and* the staff client URL to the record.

Oodles of gobs of bunches of thanks to Virginia Military Institute, for loaning me their OCLC
authorization credentials so this could be tested, as well as for great suggestions of cosmetic
improvements to the mechanism and output.
2012-09-05 14:53:13 +02:00
Paul Poulain
ccb4517b1c Merge remote-tracking branch 'origin/new/bug_8293' 2012-09-05 14:39:16 +02:00
Chris Cormack
c5ca865b54 Bug 8293 : Fixing POD to match actuality.
Signed-off-by: Fridolyn SOMERS <fridolyn.somers@biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-09-05 14:37:34 +02:00
Paul Poulain
078c898e72 Bug 7621 follow-up DBRev number 2012-09-05 14:35:28 +02:00
Marc Veron
01a7188d6a BUG 7621 [ENH] Circulation: Match age restriction of title with borrower's age without using categories
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>

New version implementing Paul's advice.
See Wiki http://wiki.koha-community.org/wiki/Age_restrictiotion

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

New fix updatedatabase.pl to apply to current master by Marc Veron veron@veron.ch
...and fixed missing curly bracket after merging updatedatabase.pl

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-09-05 14:32:53 +02:00
christophe croullebois
b6433ee60a SIGNED-OFF] bug 8382: It is not possible to cancel an order on a filtered page in parcel.pl
Because in parcel.pl page the filter (on the left) makes a table using jscript and
a very different workflow, the "cancel" link does nothing just asking for cancelling.
Principaly due to the use of the "filter" js function that call the parcel.pl page
and does all the job in a separate block with a separate perl function
(SearchOrder) that sends all to js, that constructs html to finally append it to table.
So I have decided to rebuild entirely the filter.
I have choosen to overload the function "GetPendingOrders" to enable it to accept new arguments.
To test : when you are in "parcel.pl" ready to receive orders, simply select a filter on the left
and on the filtered page try to cancel a line.
You'll have the warning message but no more, the line will be not canceled.

Signed-off-by: wajasu <matted-34813@mypacks.net>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-09-05 13:31:37 +02:00
Jared Camins-Esakov
4e8bd6b9a6 Bug 8623: Move YUI out of prog
This patch moves the YUI assets from koha-tmpl/opac-tmpl/prog/en/lib/yui
to koha-tmpl/opac-tmpl/lib/yui.

NOTE: This was tested on Chrome, FF, and Safari on a Mac, and IE and FF
on Windows.

To test:
1) View a smattering of pages on the OPAC and intranet. If the move
   did not work flawlessly, layout will be way off.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-09-05 12:04:13 +02:00
Jared Camins-Esakov
765bbe1dad Bug 8623: Do not accept "lib" as a valid theme
Since we are going to be storing third-party Javascript libraries in
koha-tmpl/opac-tmpl/lib and koha-tmpl/intranet-tmpl/lib, we want to make
sure that "lib" is not picked up as a theme in the system preferences
editor.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
2012-09-05 12:04:12 +02:00
Jared Camins-Esakov
33113e69c0 Bug 8622: Fix theme fallback
This patch does the following:
1) Enables fallback for includes between different themes and different
   languages (with the exact same precedence as for .tt files)
2) Enable fallback for XSLT files between different themes and different
   languages (again, same precedence)
3) Change the semantics of the TT [% themelang %] variable so that it always
   refers to the preferred theme and language, rather than the fallback
   theme/language. As a result, all themes must include all javascript,
   css and image resources they use.

Note that these changes actually have no impact whatsoever on an
installation where the default (prog) themes are in use.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Mason James <mtj@kohaaloha.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-09-05 11:39:14 +02:00
Mark Tompsett
01309211e9 Bug 8478 - Update Ubuntu related files Updated installation instructions, cleaned up ubuntu-pkg-check.sh, renamed ubuntu*.packages files more consistently, updated files to include missing libraries, corrected incorrect libraries (yaz3->yaz4, mysqlclient v16 to v18, dropped the dev version of the client).
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-09-05 11:01:04 +02:00
Chris Cormack
4d9f131736 Bug 6886 Follow up for NORMARC
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-09-05 10:32:03 +02:00
Chris Cormack
69341f71b6 Bug 6886 - Follow up for UNIMARC
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2012-09-05 10:32:02 +02:00
Chris Cormack
cf7f5ecbea Bug 6886 - OPAC XSLT respecting single branch mode
This is only for the MARC21 XSLT at this stage, follow up patch for
UNIMARC will come

Conflicts:

	C4/XSLT.pm
	koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref

Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2012-09-05 10:32:00 +02:00
Robin Sheat
2341bd876a Bug 8594 - prevent the report system from breaking some subqueries
If you had a report query that had a subquery in the fields list, and
that subquery had a LIMIT specifier, then it would be removed which
could break your query. This patch prevents this case from breaking by
ensuring that only a LIMIT that follows the last WHERE in the query is
removed.

If you don't have a WHERE, then it will behave like it always
did, removing all the cases of LIMIT (which would still break a subquery
but this is a) more rare, and b) would require more intelligent parsing
to deal with.

Also adds test cases and function documentation.

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

Tested with this report:

select biblionumber, (select itemnumber from items where items.biblionumber=biblio.biblionumber LIMIT 1) from biblio where biblionumber<1000;

and it worked like a charm

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-09-05 10:12:06 +02:00
5434882791 Bug 8549 - DataTables upgrade broke display of next/previous buttons in table controls
When the DataTables plugin was upgraded the DataTables CSS
was not updated at the same time, causing problems in the
display due to changes in how the plugin works.

The DataTables upgrade added text lables to the image-only
buttons in order to improve accessibility. This patch
revises the CSS and the four_button pager modification
to conform with the upgrade.

To test, please view tables which use each of three types of
pagers: default two-button (ex: circ/pendingreserves),
custom four-button (ex: members/readingrec.pl) and full
(ex: tools/quotes.pl).

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-09-04 18:32:03 +02:00
491c02f2e1 Bug 2553 [Serials report] alphabetize dropdown menus
Rebase of a patch originally submitted by gcollum@gmail.com
Original commit message:

Improvement on the previous patch through the use of GetBranchesLoop.
Added code so that the logged in location will be the location that
is selected by default.

Fixed a couple of minor xhtml errors.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-09-04 18:28:59 +02:00
Colin Campbell
8cef238d3a Bug 8675 Add hours and mins to renewal due date
If user supplies renewal with a new due date it should add
a time using the same logic as dateduespec in circulation.pl
rather than defaulting to 00:00

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-09-04 18:22:32 +02:00
Nicole C. Engard
dcc5f6f938 update 'onloan' in items and deleteditems
This field said it was a 1 or 0 value, but it's
a date field.

http://bugs.koha-community.org/show_bug.cgi?id=6716
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-09-04 18:21:25 +02:00
Julian Maurice
98447dbcc9 Bug 8666: Hide 'New basket' link if supplier is inactive
Signed-off-by: Koha Team Lyon 3 <koha@univ-lyon3.fr>

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-09-04 18:02:15 +02:00
Kathryn Tyree
316da59f40 Bug 7368: fixed subsribe typo
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Corrects typo.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-09-03 17:54:04 +02:00
Paul Poulain
b1e2fa8fca Merge remote-tracking branch 'origin/new/bug_8440' 2012-09-03 17:52:33 +02:00
Fridolyn SOMERS
4cf4b18343 Bug 8440: Dates does not appear in suggestions management
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-09-03 17:52:18 +02:00
Julian Maurice
04539f5cb8 Bug 7168: Add basket group search field in histsearch.pl
Allow to search orders by basket group name

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

Displays search field for baketgroup as expected.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-09-03 17:49:21 +02:00
Paul Poulain
839c97ab30 Merge remote-tracking branch 'origin/new/bug_7241' 2012-09-03 17:40:17 +02:00
Paul Poulain
ce52db9e81 Revert "Bug 7241: fix for the CIRC logs -> itemnumber stored correctly"
This reverts commit a659d02dbe.
2012-09-03 17:34:03 +02:00
Paul Poulain
1cdcad02c0 Merge remote-tracking branch 'origin/new/bug_7241' 2012-09-03 17:26:18 +02:00
Adrien Saurat
a659d02dbe Bug 7241: fix for the CIRC logs -> itemnumber stored correctly
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-09-03 17:26:04 +02:00
Paul Poulain
c709786efa Bug 7412 follow-up
* DBRev number
  * removing useless `` in table name

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-09-03 17:25:33 +02:00
Paul Poulain
2fc8360bb7 Bug 7412 follow-up
* DBRev number
  * removing useless `` in table name
2012-09-03 17:03:09 +02:00
Matthias Meusburger
245d6634fe Bug 7412: Pre-filling items in cataloguing
Pre-filling of items: remember what was in the previous item filled, to be able to create multiple items quickly.

By default, all subfields are prefilled when the PrefillItem syspref is on, unless you specify which fields
you want to prefill in the SubfieldsToUseWhenPrefill syspref.
With a value of "f u v", only the $f, $u and $v will be prefilled, for example.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Rebased and QAed.
2012-09-03 17:01:58 +02:00
7e6690f6e3 Bug 6494 - opacmysummaryhtml on reading history
This patch re-uses code and markup from opac-user.tt & .pl
to place the contents of the opacmysummaryhtml preference
on the circulation history page in exactly the same way
it appears on the "my summary" page.

The wording of the system preference description has
been modified to reflect this addition.

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

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-09-03 16:27:43 +02:00
Paul Poulain
31a0ed0a43 Merge remote-tracking branch 'origin/new/bug_7805' 2012-09-03 15:58:45 +02:00
8a1fa3cf29 Bug 7805 Followup for perlcritic messages
Signed-off-by: Owen Leonard <oleonard@myacpl.org>

Tested by going to Lists and doubleclicking a list to see
its contents (in opac or staff). It works. No warnings
in the log. I am ready to sign off.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-09-03 15:57:13 +02:00
D Ruth Bavousett
7d55969329 Bug 8569: Paying for lost item overwrites nonpublic notes.
This patch modifies C4::Circulation::ReturnLostItem to append the Paid-for note
to existing data, rather than overwriting it.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
2012-09-03 15:49:10 +02:00
Mark Tompsett
15b7782234 Bug 4064 - Uninitialized variable errors in opac-search.pl Merely optimized two if statements, already fixed in master.
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-09-03 15:46:49 +02:00
Robin Sheat
3dc7b530c4 Bug 8391: prevent error when viewing circ history with bad dates
Sometime the circ history will contain "0000-00-00" as a returndate when
an item was lost rather than returned. This currently causes an error
when attempting to parse the dates, this patch causes an empty string to
be returned instead.

Note: a future enhancement should distinguish between "no date provided"
and "invalid date provided" to allow distinctions to be made.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-09-03 15:38:38 +02:00