Commit graph

4584 commits

Author SHA1 Message Date
Paul Poulain
8a53d28490 Merge remote-tracking branch 'origin/new/bug_7986' 2012-10-19 18:03:02 +02:00
Nicole C. Engard
f03712d37b Bug 7986 Follow Up: Fix ExportRemoveFields
This preference was in the code as a choice but should be a list
of fields to exclude. This patch makes that change and updates
the description to fit more with the standard set by other
preferences.

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-19 17:54:25 +02:00
Nicole C. Engard
3a4129e6a3 Bug 7986 Follow Up: Update ExportWithCsvProfile
The ExportWithCsvProfile preference was on its own file
(tools.pref) when in reality it belonged on the circulation
tab. This patch removes the tools.pref file and moves the
ExportWithCsvProfile preference and updates the text
around it to make it clearer.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
2012-10-19 17:54:23 +02:00
Mirko Tietgen
4ccf4181bb Bug 4177 opaccloud missing from the system preferences interface
There is no option to toggle the (existing) syspref OpacCloud. This patch adds one.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Inserted tags manually, enabled system preference, tag subject cloud displays nicely.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-19 17:52:37 +02:00
Paul Poulain
5cea05831a Merge remote-tracking branch 'origin/new/bug_8585' 2012-10-17 17:31:09 +02:00
Nicole C. Engard
9ca17830d8 Follow up to Bug 8585: add missing word to preference
The preference added in this bug is missing the word
'day(s)'. This patch adds it in.

http://bugs.koha-community.org/show_bug.cgi?id=4118
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-17 17:30:44 +02:00
Paul Poulain
a327747c10 Bug 7143 follow-up replace tabs by 4 spaces 2012-10-16 18:18:13 +02:00
Chris Cormack
9fd6082ca9 Bug 7143 : New committer to history 2012-10-16 18:17:26 +02:00
Chris Cormack
971c872419 Bug 7143: Adding new developers to the history file
Signed-off-by: Melia Meggs <melia@test.bywatersolutions.com>
2012-10-16 18:17:25 +02:00
Paul Poulain
23de370b2d Merge remote-tracking branch 'origin/new/bug_7751' 2012-10-16 18:13:51 +02:00
Nicole C. Engard
7d2dc13db0 :x
The preference used to read 'loan period by' but it's
actually reducing the checkout period 'to' the number
of days entered in the preference.  This patch changes
'by' to 'to'.

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

Tiny patch, text change only, text apears as expected.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-16 18:13:16 +02:00
Magnus Enger
8ec52a8e23 Bug 8793 - Fix materialTypeCode/typeOf008 icons for NORMARC XSLT
This patch fixes some issues with icons related to materialtypes in NORMARC:

Remove references to opac-tmpl in the *intranet* NORMARC XSLT files.

Add two new icons to koha-tmpl/intranet-tmpl/prog/img/famfamfam/ and
koha-tmpl/opac-tmpl/lib/famfamfam/
GR.png - Graphical materials
TD.png - Three dimentional objects

Copy PR.png from koha-tmpl/intranet-tmpl/prog/img/famfamfam/ to
koha-tmpl/opac-tmpl/lib/famfamfam/

Rename the XSLT variable materialTypeCode to typeOf008 for increased consistency
between stylesheets.

Make sure the XSLT uses icons that are actually available.

To test:
- No use testing all the different permutations of leader pos. 06 and 019b, I think.
- Set marcflavour = NORMARC and turn on default XSLT for OPAC and Intranet, details
  and results.
- Make sure you have a record with something relevant in leader position 6, like
  g for movies or c for music
- Check that the icon turns up in results and details, in the OPAC and Intranet
- Toggle DisplayOPACiconsXSLT and check that the results in the OPAC are as expected

Signed-off-by: Mirko Tietgen <mirko@abunchofthings.net>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-12 22:28:16 +02:00
80f8c46dc6 Bug 8862 - merge.pl contains untranslatable strings
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>

It works: (1) merging's still effective, and (2) two new error messages appear
in staff .po file after update it.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-12 21:52:25 +02:00
782e1845f3 Bug 8869 - Duplicate member check doesn't disable submit button on bottom.
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>

I confirm that after applying this patch, the submit button is removed from
patron edit page, avoiding accidentaly clicking on it, without responding to
the question about possible duplicate patron?

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-12 21:43:23 +02:00
Fridolyn SOMERS
5a38631838 Bug 8863: When clearing a patron attribute, they are all cleared
Signed-off-by: Marc Veron <veron@veron.ch>

Tested with a set of 2 additional patron attributes. Cleard both before applying the patch.
Cleared as expected after applying the patch.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-12 21:39:53 +02:00
8308e2055a Bug 8851 - strange blue bar above serials results
Bug 5357 (Subscription search and displays) added an advanced
search form which adds a new interface featured: a collapsible
fieldset with the search form inside. Bug 8851 was filed
because it is not immediately obvious that the search form
is hidden and can be shown by clicking the fieldset's legend.

I contend that this new behavior is unnecessary: In many other
places we put a similar search form in the left-hand sidebar.

This patch amends the template to show the search form in the
main body of the page if no search has been performed. After
searching the form is moved to the sidebar. This keeps the page
consistent with other interfaces and eliminates the confusion
about the collapsed form.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-12 21:34:12 +02:00
63145eb3d2 Bug 8718 - Normal catalogue detail view in staff client doesn't show missing serials or subscription history note
Adds librariannote (staff subscription history note) and missing list to the normal catalogue detail view in staff client.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-12 16:35:58 +02:00
Paul Poulain
65be03846d Merge remote-tracking branch 'origin/new/bug_7412' 2012-10-12 12:28:54 +02:00
Nicole C. Engard
884005db08 Bug 7412: Follow up: Update preference to sentence
This patch updates the preference question to a sentence
to follow the standard set with previous preferences.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-12 12:28:27 +02:00
Paul Poulain
7886297f05 Merge remote-tracking branch 'origin/new/bug_7751' 2012-10-12 12:23:08 +02:00
Nicole C. Engard
65accc367b Bug 7751: Decrease loan length with many holds
This patch merges the three preferences in to one sentence
to make it clear that they are all linked together and to
eliminate confusion that can come by having them as
individual preferences.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
2012-10-12 12:21:17 +02:00
Marc Veron
802dd7baf5 Bug 8812 - Staff Client: Patron search should display branch name instead of branch code in results table
Patch to display branchname instead of branch code.

Signed-off-by: Delaye Stephane <stephane.delaye@biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-11 11:17:06 +02:00
Nicole C. Engard
0c75d667d5 Bug 8831: relabel gstrate with Tax rate
This patch changes gstrate to Tax rate to match the standard set
on all other acq pages.

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

Small text change. Label displays as expected.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-10 18:00:02 +02:00
d51f822a5b Bug 8820 - Don't show orders table if there are no orders
This page removes the "basket empty" message in favor of
hiding the orders table altogether when a basket has no
orders. This patch also moves the "Show all details"
checkbox under the "Orders" heading to associate it more
closely with the area it affects.

Other textual changes:

- Correcting capitalization according to coding guidelines
- Correcting terminology (basket group instead of basketgroup)
- Replacing the "Order Details" heading with the more
  succinct "Orders"

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-10 17:51:06 +02:00
Julian Maurice
39ad9abb74 Bug 8801: Add menu entry to delete items in batch
In catalogue/detail.pl you can now select "Delete items in batch" in
"Edit" menu. You are redirected to batchMod.pl for chosing which items
have to be deleted.
You need to have 'tools.items_batchdel' permission to see this menu
entry.

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

Works as expected.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-10 17:07:44 +02:00
Frédérick
9d38ff1e5f Bug 8570 - Add pagination to the Z39.50 results page
Add paginations to the Z39.50 search results.

http://bugs.koha-community.org/show_bug.cgi?id=8570
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-09 16:23:23 +02:00
94eae1df00 Bug 2930 [REVISED] Put other name on checkout screen
This patch adds other name to the include which is used
to display patron names and adds this include in several
places where it can be used in place of direct output.

The patron-title include has been modified to handle the
two possible variable scopes throughout patron-related
templates. This is a hack similar to having both
circ-menu.tt and circ-menu.inc, but keeping both in the
same file.

Changes to some scripts were necessary to make the
othernames variable available to the include.

This patch also corrects some <title> tags and fixes
some incorrect capitalization (see Bug 2780).

To test, view each of the pages affected by these
template changes and confirm that the patron's name
displays correctly, including their "other name."

Signed-off-by: Marc Veron <veron@veron.ch>
Followed instructions above, works as expected.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-09 12:23:39 +02:00
Joseph Alway
b769a3cda0 Bug 8680 Z39.50 ISBN Search is problematic and there is a missing ISSN field.
The changes here are duplicate fixes.
The cataloguing directory had the same bugs as the acqui directory.
The bugs in the cataloguing files of the same name were fixed in Bug 8550.
The bugs in the acqui files had not been fixed.
This will fix Bug 8680 which is in the Acquisitions Module.

Changes to the z3950_search.pl file:
Rather than treating ISBN and ISSN as the same, this patch breaks
them out into separate parts of the query, as well as changing
the truncation attribute to enable right truncation (the correct
behavior for the ISBN field in MARC21, and valid behavior in
UNIMARC).

Changes to the z3950_search.tt file:
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.

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

Works as expected.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-08 17:56:36 +02:00
17298c2042 Bug 6037 [Follow-up] Invalid markup, missing breadcrumbs on Keyword to MARC Mapping page
Extra </div> returned. Killing it again.

After applying the patch the validator should only warn of
invalid "autocomplete" attribute.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
2012-10-08 17:11:12 +02:00
Marc Veron
510a7d7347 Bug 8796 - patron cards not starting on designated card
Better wording for the meaning of 'Position' to prevent mistakes on behaviour.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-05 17:16:01 +02:00
Jonathan Druart
96e1c5d80b Bug 8370: Change term issues (smart-rules)
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-05 16:12:41 +02:00
Paul Poulain
e5a24bbbdd Merge remote-tracking branch 'origin/new/bug_7621' 2012-10-05 11:58:28 +02:00
Nicole C. Engard
337fbb5e98 Bug 7621: Follow up to clarify preference language
This patch changes strings only, not functionality. It will
clarify the meaning of the  AgeRestrictionMarker preference.

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

Better wording of preference instructions. No code echange involved.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-05 11:58:12 +02:00
Paul Poulain
81ee945a58 Merge remote-tracking branch 'origin/new/bug_8382' 2012-10-05 11:56:39 +02:00
d30a8ae220 Bug 8382 [Follow-up] It is not possible to cancel an order when receiving on a filtered page in parcel.pl
In order to be valid XHTML ampersands must be encoded ("&amp;").

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-05 11:56:24 +02:00
f7055bb901 Bug 8449 - Improve wording and styling for "cancelled holds" on Holds Awaiting Pickup screen
Return library name to message about hold requiring transfer.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-05 10:44:51 +02:00
e500433c3f Bug 8449 - Improve wording and styling for "cancelled holds" on Holds Awaiting Pickup screen
This patch re-implements and adapts the changes dcook@prosentient.com.au
submitted in a patch which no longer applies. I have changed the
"alert" style messages to "message" style to match the style
which is applied to "hold found" messages elsewhere.

I have also revised the language in a way that I think is more
clear and accurate.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
2012-10-05 10:44:49 +02:00
Paul Poulain
a8c5497b8d Merge remote-tracking branch 'origin/new/bug_7986' 2012-10-04 18:12:14 +02:00
Jonathan Druart
db4fddd31d Bug 7986: Followup: Hide the export link unless sysprefs are set
If at least one of both sysprefs (ExportRemoveFields and
ExportWithCsvProfile) is filled, the export link is displayed

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

Tested with both sysprefs filled/not filled, patch behaves as expected.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-04 18:09:00 +02:00
Paul Poulain
529bb9c2a4 Bug 8585 follow-up Passing syspref to template
Passing the syspref HoldsToPullStartDate to get the number of days displayed on the screen
(instead of "two" that was hardcoded)

Also s/tab/4 spaces/g
2012-10-03 15:28:43 +02:00
762ce7abe6 Bug 8585 : Add System Preference to specify Holds to Pull List Start Date
Currently, Koha creates a default value of 2 days ago (-2) for the start date of the Holds to pull List. This system preference allows users to specify their own default start date for this list, since users might not want to have to manually change the date all the time when they already know the set date period they want to view.

The system preference value is specified as a positive integer, which is then passed as a negative integer in the handler script. This saves users from having to include a qualifer to the sys pref value.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
2012-10-03 15:18:40 +02:00
50be765eae Bug 8711 - alternating colors messed up on reports
Patch adds the "zebra-striping" option to the
table sorter initialization and changes the row
color CSS to match the tablesorter's to prevent
conflicts.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-02 18:04:21 +02:00
Frédérick Capovilla
77c2a02c8c Add a warning if a Z39.50 search is started from biblio edition page.
Warn the user that the current biblio record might be overwritten by
this action.

http://bugs.koha-community.org/show_bug.cgi?id=8583
Signed-off-by: Marc Veron <veron@veron.ch>

Woks as expected. I prefer this solution with an explicit warning,
since several times I acidentally changed a record  :-)

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-02 18:00:54 +02:00
Lyon3 Team
2f875daa60 Bug_7913-Follow-up, hide button for subs with items
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-01 17:50:16 +02:00
Lyon3 Team
cd2fae07ae Receiving serials in a loop
generate the number of issues entered from a message box and apply
'arrived' status.

http://bugs.koha-community.org/show_bug.cgi?id=7913
Signed-off-by: Delaye Stephane <stephane.delaye@biblibre.com>
2012-10-01 17:50:12 +02:00
7a7e018ed3 Bug 3387 - WITHDRAWN items shouldn't check in
Adds a system preference BlockReturnOfWithdrawnItems to control
whether or not Koha should allow a withdrawn item to be returned
or not.

Also fixes the behavior where Koha will attempt to use a withdrawn
item to fill a hold.

Test Plan:
1) Set BlockReturnOfWithdrawnItems to "Block" ( this is the default )
2) Check an item out to a patron
3) Mark item as withdrawn
4) Attempt to return the item, you should still see the item on the
   borrower's record
5) Set BlockReturnOfWithdrawnItems to "Don't Block"
6) Attempt to return the item, you should see the item is no longer
   on the borrower's record.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
2012-10-01 17:07:53 +02:00
Jared Camins-Esakov
5bf01284e3 Bug 8581: don't display parentheses when we don't have a type
Prior to this patch, see also references in certain authority records
(most notably GND records) were being followed by empty parentheses in
the search results display. This patch resolves that problem.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-01 16:34:04 +02:00
Jonathan Druart
b5659f6425 Bug 8726: Followup FIX save didyoumean syspref
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-09-28 17:14:17 +02:00
Jared Camins-Esakov
52f54eec1d Bug 8726 follow-up: fix QA issues
Fixes several perlcritic complaints, and some overflow in the
configuration page. Also notes that Did You Mean is not yet
enabled on the staff client.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Sorry about the problematic last attempt at uploading. I missed a
patch when squashing. It is now included.
2012-09-28 17:14:15 +02:00
Jared Camins-Esakov
ef87bb0a81 Bug 8726: ExplodedTerms suggestion plugin (jQueryUI)
When working with hierarchical subject headings, it is sometimes helpful
to do a search for all records with a specific subject, plus
broader/narrower/related subjects. This patch adds a suggestion plugin for
these "exploded" subject searches to Koha. Note that this patch depends on
both bug 8211 AND bug 8209.

To test (NOTE: this test plan covers both 8211 and 8726):
1) Make sure you have a bunch of hierarchical subjects. I created
   geographical subjects for "Arizona," "United States," and "Phoenix,"
   and linked them together using 551s, and made sure I had a half
   dozen records linking to each (but not all to all three).
2) Do a search for su-br:Arizona (or choose "Subject and broader terms"
   on the advanced search screen with "more options" displayed), and
   check that you get the records with the subject "Arizona" and the
   records with the subject "United States"
3) Do a search for su-na:Arizona (or choose "Subject and narrower terms"
   on the advanced search screen with "more options" displayed), and
   check that you get the records with the subject "Arizona" and the
   records with the subject "Phoenix"
4) Do a search for su-rl:Arizona (or choose "Subject and related terms"
   on the advanced search screen with "more options" displayed), and
   check that you get the records with the subject "Arizona," the
   records with the subject "United States," and the records with the
   subject "Phoenix"
5) Ensure that other searches still work (keyword, subject, ccl,
   whatever)
6) Use "Did you mean?" page in admin section to enable ExplodedTerms
   plugin
7) Do a keyword search on the OPAC, confirm that searching for exploded
   terms is suggested.
8) Do a subject search on the OPAC, confirm that searching for exploded
   terms is suggested.
9) Do a non-keyword, non-subject search on the OPAC, confirm that
   searching for exploded terms is NOT suggested.
10) Disable ExplodedTerms plugin and enable AuthorityFile plugin.
11) Do search on OPAC, confirm suggestions are made from authority file.
12) Sign off

Signed-off-by: wajasu <matted-34813@mypacks.net>

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Split into two patches. This patch includes only the jQueryUI upgrade
2012-09-28 17:14:13 +02:00