Commit graph

6871 commits

Author SHA1 Message Date
Stéphane Delaune
df0a6a71d7 Bug 4032 XSLT systempreference takes a path to file rather than YesNo
Signed-off-by: Marijana Glavica <mglavica@ffzg.hr>

I am signing it off because it doesn't break anything and I will report
another bug for language issues described in my previous comment.

Removed MySQLism backquotes
2012-03-29 16:58:55 +02:00
eb3dc448d2 Bug 7835 - submit and cancel buttons on diff lines on notices
Changing markup of cancel button to match standard Koha pattern.
Also correcting some invalid markup:
 - unescaped ampersands
 - invalid form action attributes
 - improperly nested elements in <ol>
 - invalid "for" on label

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-03-29 15:19:24 +02:00
f446b3d03d Bug 7641: Suspend Reserves
Adds the ability to suspend reserves. The new system preference
AutoResumeSuspendedHolds enables the ability to set a date for
a suspended hold to automatically be resumed.

When a hold is suspended, it will continue to increase in priority
as the holds above it are fulfilled. If the first holds in line
to be filled are suspended, the first non-suspened hold in line
will be used when an item can fulfill a hold that has been placed.

http://bugs.koha-community.org/show_bug.cgi?id=7641
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>

Tested with the preference on and off:
1. placed several holds in the staff client
2. suspended some with a date
3. suspended some without a date
4. triggered hold message by checking in for hold with suspensions
5. the suspended hold was skipped as it should be
6. tested suspending holds in the OPAC w and w/out dates
7. ran the cron to clear suspensions with dates

All the above tests worked as expected. Signing off.
2012-03-29 14:37:49 +02:00
Magnus Enger
448dbe2df5 Bug 7537 - Implement TraceCompleteSubfields, TraceSubjectSubdivisions and UseICU for NORMARC XSLT
IMPORTANT! This patch relies on the patch for Bug 7092, which is now pushed to
master.

As the title says, this patch implements TraceCompleteSubfields,
TraceSubjectSubdivisions and UseICU for NORMARC XSLT, both for the OPAC
and the Intranet. This affects how clickable subject-links are constructed.

To make this work the indexing of MARC fields in the 600 range is changed
to include "Subject:p" in several new places.

To test:

Find a record with a "complex" subject, like "Internet -- Law and legislation".
MARC21 and NORMARC are very similar in how they handle subjects, so testing
on a MARC21 database should be OK. (Changes in indexing reflect changes already
made to the MARC21 indexing.)

Make sure you have these syspref settings:
- marcflavour = NORMARC
- XSLTDetailsDisplay = using XSLT stylesheets
- OPACXSLTDetailsDisplay = using XSLT stylesheets

(Ideally, testing should be done on a real NORMARC setup, but since the changes
to indexing only reflect how it's already done in MARC21, I think testing
on a MARC21 installation with marcflavour = NORMARC should be OK.)

Now try the different combinations of TraceCompleteSubfields,
TraceSubjectSubdivisions and UseICU, and check the format of the
clickable links, both in the OPAC and staff client. Here's what you should
be seeing:

1.
TraceCompleteSubfields   = Don't force
TraceSubjectSubdivisions = Don't include
UseICU = Not using
  opac-search.pl?q=su:"Internet"
UseICU = Using
  opac-search.pl?q=su:{Internet}

2.
TraceCompleteSubfields   = Force
TraceSubjectSubdivisions = Don't include
UseICU = Not using
  opac-search.pl?q=su,complete-subfield:"Internet"
UseICU = Using
  opac-search.pl?q=su,complete-subfield:{Internet}

3.
TraceCompleteSubfields   = Don't force
TraceSubjectSubdivisions = Include
UseICU = Not using
  opac-search.pl?q=(su:"Internet") AND (su:"Law and legislation.")
UseICU = Using
  opac-search.pl?q=(su:{Internet}) AND (su:{Law and legislation.})

4.
TraceCompleteSubfields   = Force
TraceSubjectSubdivisions = Include
UseICU = Not using
  opac-search.pl?q=(su,complete-subfield:"Internet") AND (su,complete-subfield:"Law and legislation.")
UseICU = Using
  opac-search.pl?q=(su,complete-subfield:{Internet}) AND (su,complete-subfield:{Law and legislation.})

UPDATE 2012-03-23
- Change the syspref TracingQuotes to UseICU, see bug 7092
- Change boolean operator from "and" to "AND", see bug 7695

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Note: UseControlnumber must be turned off.

1) Works.
2) Works.
3) Works.
4) Works.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-03-29 11:00:32 +02:00
Katrin Fischer
25f7841028 Bug 4819: Add ids to OPAC detail page
Patch adds an unique id to every item tab and
to every column in the items table on the holdings tab.

http://bugs.koha-community.org/show_bug.cgi?id=4819
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-03-29 10:42:14 +02:00
Katrin Fischer
8136a31f54 Bug 7823: [SIGNED-OFF] Ergonomy improvements: Rename button to "New patron"
"New" for adding new patrons is hard to translate and is not consistent
with the naming of similar buttons in other parts of Koha.

Patch changes "New" to "New patron".

Signed-off-by: Magnus Enger <magnus@enger.priv.no>
Patch does what it says and ii makes sense to change the wording.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-03-28 16:24:09 +02:00
Magnus Enger
c429c8d774 Bug 7695 - Change boolean operator from "and" to "AND"
When XSLTDetailsDisplay/OPACXSLTDetailsDisplay = on and
TraceSubjectSubdivisions = Include, subject sudivisions are
combined with the boolean operator "and". Currently, this word is
translated along with other occurrences of the same word, resulting
in a false "no records found" for users of non-English templates.

This patch replaces "and" with "AND" which should have no effect on
searching (since Zebra is case-insensitive in this regard) but will
make the boolean operator stand out from other uses of "and" in
translations.

TraceSubjectSubdivisions is currently only implemented in MARC21,
so UNIMARC and NORMARC is not affected.

To test:

XSLTDetailsDisplay/OPACXSLTDetailsDisplay = using XSLT
TraceSubjectSubdivisions = Include
marcflavour = MARC21

Find a record with a clickable subject that includes one or more
subdivisions and check that the subdivisions are combined with
"AND", not "and". Check that you get the expected result when
clicking on the subject.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Easy to test and works as advertised.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-03-28 16:23:26 +02:00
Magnus Enger
b9464ad66c Bug 7727 - NORMARC XSLT OPAC detail view shows double tabs
With marcflavour = NORMARC and OPACXSLTDetailsDisplay = Using XSLT,
the detail view displays a double set of tabs for Normal/MARC/ISBD
views, one above the title and one below.

To test:
marcflavour = NORMARC
OPACXSLTDetailsDisplay = Using XSLT

Since the contents of the recaords do not matter here, the patch
can be tested on MARC records of any flavour.

- Check that double tabs are shown
- Apply the patch
- Check that only the set of tabs at the top is shown

Signed-off-by: Marijana Glavica <mglavica@ffzg.hr>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-03-28 16:19:59 +02:00
Jonathan Druart
a52d3fbf9d Bug 5354: Followup. Change separator 2012-03-28 15:56:45 +02:00
Jonathan Druart
5167e8034d Bug 5354: Partial duplication of a subscription
A new syspref (SubscriptionDuplicateDroppedInput) contains the list of fields to
duplicate when duplicating a subscription. The library will be able to
define that, for example, the internal note should not be duplicated

Test plan:
On the detail subscription page, click Edit > Edit as New (Duplicate):
All the information must be copied from the original subscription.

Fill the syspref SubscriptionDuplicateDroppedInput with a list of fields
you don't want to be duplicated (e.g. location;notes;branchcode).

Repeat the duplicate action. Normally, information for these fields are
not copied.

Signed-off-by: Kristina D.C. Hoeppner <kristina@catalyst.net.nz>
2012-03-28 15:51:23 +02:00
fe03c32e22 Bug 7786 Adding More Lists-option to the Add-to combo of staff search results
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-03-28 15:48:18 +02:00
Ian Walls
378f17d7f7 Bug 7743 followup: fix use of removed formattedwaitingdate param in opac-user.tt
Replaces formattedwaitingdate with just waitingdate, since no longer create and export
that template variable

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-03-26 16:22:54 +02:00
Julian Maurice
3414c117cd Bug 7743: Update opac-readingrecord.pl to use KohaDates TT plugin
Signed-off-by: Marijana Glavica <mglavica@ffzg.hr>

fixed conflict
2012-03-26 16:22:52 +02:00
Julian Maurice
8555749fd6 Bug 7743: Update opac-showreviews.pl to use KohaDates TT plugin
Signed-off-by: Marijana Glavica <mglavica@ffzg.hr>
2012-03-26 16:22:47 +02:00
Julian Maurice
bc3f39b702 Bug 7743: Update opac-userupdate.pl to use KohaDates TT plugin
Signed-off-by: Marijana Glavica <mglavica@ffzg.hr>
2012-03-26 16:22:45 +02:00
Julian Maurice
e1148ec52a Bug 7743: Update sco/sco-main.pl to use KohaDates TT plugin
Signed-off-by: Marijana Glavica <mglavica@ffzg.hr>
2012-03-26 16:22:43 +02:00
Julian Maurice
f893f54ea1 Bug 7743: Update opac-detail.pl to use KohaDates TT plugin
Signed-off-by: Marijana Glavica <mglavica@ffzg.hr>

fixed conflict
2012-03-26 16:22:41 +02:00
Julian Maurice
80e02f01f5 Bug 7743: Update opac-user.pl to use KohaDates TT plugin
Signed-off-by: Marijana Glavica <mglavica@ffzg.hr>

fixed conflict
2012-03-26 16:22:39 +02:00
Julian Maurice
721096cd8c Bug 7743: Update opac-tags.pl to use KohaDates TT plugin
Signed-off-by: Marijana Glavica <mglavica@ffzg.hr>
2012-03-26 16:22:37 +02:00
Julian Maurice
f42176cb6d Bug 7743: Update opac-account.pl to use KohaDates TT plugin
Signed-off-by: Marijana Glavica <mglavica@ffzg.hr>
2012-03-26 16:22:35 +02:00
Paul Poulain
3de13a0f6d Merge remote-tracking branch 'origin/new/bug_7760' 2012-03-26 16:21:31 +02:00
Katrin Fischer
18149078e9 Bug 7760: More ids and classes for the staff interface
Owen pointed out that I missed 3 files - this corrects my omission.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
2012-03-26 16:21:06 +02:00
Gaetan Boisson
1c6bb07f8a Bug 7761 - cleaning up empty declarations from staff-global.css
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-03-26 16:20:09 +02:00
b421fc73bb Bug 7783: Show private shelves in opac when deleting non-empty private list from shelf view
Signed-off-by: Mathilde Formery <mathilde.formery@ville-nimes.fr>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-03-26 15:55:25 +02:00
Paul Poulain
6490c874bd Bug 7470 follow-up
(patch from Jonathan, I don't understand why it doesn't apply cleanly, so I've rewritten it)
2012-03-26 15:00:47 +02:00
Jonathan Druart
f35a1cce68 Bug 7470: Babeltheque integration
3 features:
- adds social network information in search results
- adds babeltheque data in opac-detail
- adds social network links in opac-detail too (google+, twitter, mail
  and co.)
2012-03-26 14:24:04 +02:00
Paul Poulain
1d882495c2 bug 7178 follow-up: typo fix
* words lower cased
* removed a space before :
2012-03-26 14:15:14 +02:00
Julian Maurice
eefc774e27 Bug 7178: Acquisition item creation improvement
- Display a unique item block at once

On orderreceive.pl when AcqCreateItem is 'receiving', and on
neworderempty.pl when AcqCreateItem is 'ordering' it displays an
item block with item infos to fill, and a '+' button.
When user clicks on '+', the block is hidden and a list shows up with
the items that will be received. User can then edit or delete items in
the list and click 'Save' to receive items.

- PrepareItemrecordDisplay is now used for cloning block

Previous cloning function was duplicating ids, the side effect is that
plugins didn't work when several items were displayed.
PrepareItemrecordDisplay regenerate the form with new ids

- New system preference UniqueItemFields

Contains a space-separated list of sql column names (of items table).
This syspref is used in two ways:
 - Values corresponding to fields in syspref are not duplicated when
   adding a new item (button 'Add')
 - When saving the form, a check is made on fields in syspref for
   detecting duplicate (in DB and in the form)

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
All tests done are noted on the bug report.

2012-03-23: Fixed conflict in updatedatabase.
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-03-26 11:07:23 +02:00
Juan Romay Sieira
020c095377 Bug 7263 - Determine maximum length of some fields or subfields when cataloguing a biblio or an item.
Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-03-26 10:51:22 +02:00
Paul Poulain
1474d95c10 Merge remote-tracking branch 'origin/new/bug_7548' 2012-03-23 10:24:19 +01:00
koha
c7256d3447 Bug 7548 Fix variable scoping in the template - Rebased
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-03-23 10:23:27 +01:00
Juan Romay Sieira
21b3f8a7bf Bug 6140 - Set a timeout to z3950 servers that could have network problems occasionally
Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
2012-03-22 18:22:02 +01:00
Katrin Fischer
e4c67372e4 Bug 7760 - Add ids and classes to every staff page to help with customization (reports, ...)
This is the last one - adding the classes and ids to the report module and
some template files for smaller moduls/functions.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-03-22 18:12:35 +01:00
Katrin Fischer
f8626343e2 Bug 7760 - Add ids and classes to every staff page to help with customization (patroncard, labels)
After talking to Owen we decided to use 2 classes for those modules. I decided on:

patroncard: tools, pcard
labels: tools, labels
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
2012-03-22 18:12:33 +01:00
Katrin Fischer
d8f8b95f07 Bug 7760 - Add ids and classes to every staff page to help with customization (tools)
Prefix for ids and class is 'tools'

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
2012-03-22 18:12:32 +01:00
Katrin Fischer
0f39b52048 Add ids and classes to every staff page to help with customization (serials)
http://bugs.koha-community.org/show_bug.cgi?id=7760
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
2012-03-22 18:12:31 +01:00
Katrin Fischer
1fd4a1e8af Bug 7760 - Add ids and classes to every staff page to help with customization (patrons)
Class is 'pat' and ids start with 'pat_'.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
2012-03-22 18:12:30 +01:00
Katrin Fischer
caa9ce8238 Bug 7760 - Add ids and classes to every staff page to help with customizaton (lists, suggestion, z39.50)
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
2012-03-22 18:12:29 +01:00
Katrin Fischer
9ab692693e Bug 7760 - Add ids and classes to every staff page to help with customizaton (circulation)
New id: circ_<filename>
New class: circ

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
2012-03-22 18:12:27 +01:00
Katrin Fischer
9e975aaf24 Bug 7760 - Add ids and classes to every staff page to help with customizaton (cataloguing)
New ids: cat_<filename>
New class: cat

Exceptions:
moveitem and linkitem are accessible from the catalog pages, so have
been made 'catalog' for styling.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
2012-03-22 18:12:26 +01:00
Katrin Fischer
9c1dcfa2d7 Bug 7760 - Add ids and classes to every staff page to help with customizaton (catalog)
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
2012-03-22 18:12:25 +01:00
Katrin Fischer
84839a93f5 Bug 7760: Add ids and classes to every staff page to help with customizaton (batch, error)
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
2012-03-22 18:12:24 +01:00
Katrin Fischer
25338aa17a Bug 7760: Add ids and classes to every staff page to help with customizaton (cart)
id = cart_<filename>
class = cart

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
2012-03-22 18:12:22 +01:00
Katrin Fischer
27dd804725 Bug 7760: Add unique ids and a module class to all administration pages
This is the first patch for bug 7760 and touches all pages in administration.
This adds a unique id "admin_<filename>" and a class "admin" to the body tag of
each page in administration.

Note: aqcontract can only be accessed from the acquisition module, so I made it acq
instead of admin.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
2012-03-22 18:12:18 +01:00
Katrin Fischer
7dec3d8aee Bug 7760: Add unique ids and a module class to all authorities pages
This is the first patch for bug 7760 and touches all pages in authorities.
This adds a unique id "auth_<filename>" and a class "auth" to the body tag of
each page in the authorities module.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
2012-03-22 18:12:17 +01:00
Katrin Fischer
3c419f2fe6 Bug 7760: Add unique ids and a module class to all acquisitions pages
This is the first patch for bug 7760 and touches all pages in acquisitions.
This adds a unique id "acq_<filename>" and a class "acq" to the body tag of
each page in acquisitions.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
2012-03-22 18:11:54 +01:00
b07e603560 SIGNED-OFF Bug 7590 Cataloging authorities search result page is broken
This bug occurs on UNIMARC DB with authorities linked together with TS/TG
relations. To reproduce it:

- Add a new biblio record
- On 610 field, click on the tag editor button to search an authority
- In the Authority search window, enter a large search
- On the result page, for authorities having relations with other terms, in the
  Get it! column, you get a mess of TS/TG relations and not more Choose link.

Signed-off-by: François Charbonnier <francois.charbonnier@biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-03-22 18:04:10 +01:00
Paul Poulain
d5542514d2 Merge remote-tracking branch 'catalyst/merged_5549' into new/bug_5549
Conflicts:
	installer/data/mysql/updatedatabase.pl
	members/moremember.pl
2012-03-22 17:34:26 +01:00
Adrien Saurat
31175cbdab Bug 7737: applies date filters on vendor pages
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-03-22 17:18:03 +01:00
Katrin Fischer
9809bb6cd5 Bug 5841: Routing slip not displaying publication date
To test:
Compare output of the 2 different links for  printing routing lists.

1) Links in the table of issues on the serial collection page
2) Link following the steps from editing and saving a routing list

Both previews should show the date now.

Signed-off-by: Kristina D.C. Hoeppner <kristina@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-03-22 16:19:45 +01:00