Commit graph

39793 commits

Author SHA1 Message Date
David Nind
024bb186e6 Bug 25630: (follow-up) Fix capitalization and terminology for system preferences
Additional capitalization, punctuation, terminolgy and improvements to
text for system preferences:

- Punctuation (such as full stops at the end of sentences)
- Capitalization
- Terminology (staff interface, use of "Don't" instead of "Do not")
- Rearranged/rephrased for better readability

To test:
- Verify that the changes listed are consistent and make sense.
- Check that on the staff interface home page that the window title says
"Koha staff interface".
- Verify that in system preferences the name of the tab for Staff
interface displays correctly, and that clicking on it brings up the
staff interface preferences.
- For Patrons > CollapseFieldsPatronAddForm check that the edit and add
patron form works correctly (edit a patron, add a new patron, check that
labels display correctly).

Staff interface home page
-------------------------

- Change the page title in browser from "Koha staff client" to "Koha
staff interface".

Administration
--------------

Google OpenID Connect:
. GoogleOpenIDConnectAutoRegister: change "Don't Allow" to "Don't allow"
and change "users" to "patrons".
. GoogleOpenIDConnectDefaultBranch: move the input field to the end of
the sentence.
. GoogleOpenIDConnectDefaultCategory: move the input field to the end of
the sentence.
. GoogleOpenIDConnectDomain: reword to "Restrict Google OpenID Connect
to domain (or subdomain of this domain): ____. Leave blank for all
Google domains.".

Interface options:
. SendAllEmailsTo: add a full stop.

Share anonymous usage statistics:
. UsageStatsLibrariesInfo: change "Do not share" to "Don't share"; add a
full stop; for note "Don't share" should be "No".
. most preferences: for note "Don't share" should be "No" (don't share)
(for preferences UsageStatsCountry, UsageStatsGeolocation,
UsageStatsLibrariesInfo, UsageStatsLibraryName, UsageStatsLibraryType,
and UsageStatsLibraryUrl), various edits to make more readable and
consistent.

Authorities
-----------

General
. AuthorityControlledIndicators: change "biblio field" to "bibliographic
field".
. AutoCreateAuthorities: change "do not generate" to "don't generate".

Linker:
. CatalogModuleRelink: change "Do not" to "Don't".
. LinkerKeepStale: change "Do not" to "Don't".
. LinkerModule: change "Default" to "default".
. LinkerOptions: add a full stop.
. LinkerRelink: change "Do not" to "Don't".

Cataloguing
-----------

Display:
. MergeReportFields: change "example:" to "Example:"

Exporting:
. BibtexExportAdditionalFields and RisExportAdditionalFields: change
"Include following" to "Include the following"; add ":" at end of
sentence, change "specificy" to "specify", and add full stops at end of
complete sentences.

Interface:
. EnableAdvancedCatalogingEditor: format NOTE in bold.

Record structure:
. AlternateHoldingsField: change "(This" to "(this", change "; for
instance" to ", for example", remove full stop.
, MarcFieldForCreatorId: format NOTE in bold.
. SubfieldsToAllowForRestrictedBatchmod: change "pref" to "system
preference".

Circulation
-----------

Batch checkout:
. BatchCheckoutsValidCategories: add a full stop.

Checkin policy:
. CalculateFinesOnReturn: only bold "NOTE", not the whole sentence (x2).
. StoreLastBorrower: change "opacreadinghistory/AnonymousPatron" to "the
opacreadinghistory and AnonymousPatron".
. UpdateItemLocationOnCheckin: change note "for these locations only can
location and permanent_location differ," to "for these locations the
location and permanent_location can differ,"
. UpdateNotForLoanStatusOnCheckin: change "E.g.," to "For example,"

Checkout policy:
. AgeRestrictionMarker: change "E.g.," to ". For example,"
. AllFinesNeedOverride: change "system preference noissuescharge" to
"the noissuescharge system preference".
. AllowFineOverride: add "the" before "noissuescharge".
. AllowRenewalLimitOverride: change "with respect to" to "for".
. AutoRemoveOverduesRestrictions: change "Do not" to "Don't".
. DefaultLongOverdueChargeValue: change "user" to "patron".
. ItemsDeniedRenewal: change . "e.g.," to "For example:", format the
note the same as other notes with NOTE in bold.
. OnSiteCheckoutsForce: change "on-site" to "on-site checkout", "(Even"
to "(even", and "user" to "patron".
. RentalFeesCheckoutConfirmation: change "do not ask" to "don't ask".
. RestrictionBlockRenewing: change "If patron" to "If a patron", change
"Allow" and "Block" to "allow" and "block".
. UseTransportCostMatrix: "Transport" to "the transport".

Interface:
. AllowOfflineCirculation: change "Do not enable" to "Don't enable".
. ExportRemoveFields: add a full stop.
. ShowAllCheckins: change "Do not show" to "Don't show".
. UpdateTotalIssuesOnCirc: change "Do not" to "Don't".

Interlibrary loans:
. CirculateILL: add a full stop.
. ILLCheckAvailability: add a full stop.

Self check-in module (sci-main.pl):
. SelfCheckInModule: change "module. (available" to "module (available",
add a full stop.

Self check-out module (sco-main.pl):
. AutoSelfCheckAllowed: change "automatically login" to "automatically
log in".
. WebBasedSelfCheck: change "system. (available" to "system (available",
add a full stop.

Enhanced content
----------------

Novelist Select:
. NovelistSelectStaffView: change "staff" to "staff interface".

Babelthèque:
. Babeltheque_url_js: rewitten
   . from "______ Defined the URL for the Babeltheque javascript file
(eg. http://www.babeltheque.com/bw_XX.js)"
   . to "Use this URL for the Babelthèque javascript file: ________
(e.g. http://www.babeltheque.com/bw_XX.js)."
. Babeltheque_url_update: rewritten
   . from "______ Defined the URL for the Babeltheque update
periodically (eq. http://www.babeltheque.com/.../file.csv.bz2)."
   . to "Use this URL for the Babelthèque periodic update: _______ (e.g.
http://www.babeltheque.com/.../file.csv.bz2)."

I18N/L10N
---------

. dateformat and TimeFormat: Change "Note" to "NOTE" to be consistent
with other notes, change <b> tag to <strong> as it is more semantically
correct.

Logs
----

Debugging:
. DumpTemplateVarsIntranet: change "variable" to "variables" and "staff
intranet" to "staff interface".
. DumpTemplateVarsOpac: change "variable" to "variables".

Logging:
. AuthFailureLog: add full stop.
. AuthSuccessLog: add full stop.

OPAC
----

Appearance:
. BiblioDefaultView: change "bib" to "bibliographic".
. HighlightOwnItemsOnOPAC: change ". (Non-XSLT Only)" to " (non-XSLT
only).".
. OpacAdditionalStylesheet: change "specified" to "specific".
. OPACDisplay856uAsImage: change all options in the drop down list so
they start in lowercase.
. OpacHighlightedWords: change ";" to a full stop, add a full stop at
the end.
. OPACHoldingsDefaultSortField: add a full stop.
. OpacMaxItemsToDisplay: change "user" to "patron".
. OPACMySummaryHTML: change "user" to "patron".
. OpacSeparateHoldings: change "user's to "patron's".
. OpacStarRatings: change "user" to "patron" for the drop down option.
. OPACShowUnusedAuthorities: change "Do not show" to "Don't show".
. OPACUserSummary: change "user's to "patron's", change "fines" to
"charges".
. OPACXSLT*: change "Leave" to "leave".
. Remove empty row at bottom of appearance options.

Features:
. OpacBrowser: change "OPAC" to "the OPAC".
. OpacBrowseSearch: reword as "[Enable/Disable] interface for browsing
all holdings (Elasticsearch only)."
. OpacCloud: change "OPAC" to "the OPAC".
. OPACDetailQRCode: change "Don't enable" to "Disable".
. OPACFinesTab: change "Fines" to "charges", change "the My Accouunt" to
"their account". (Should now show as "..patrons to access the charges
tab on their account page on the OPAC."
. OpacHoldNotes: change "Do not allow" to "Don't allow", change "users"
to "patrons".
. OpacResetPassword: change "users" to "patrons", add full stop.
. SocialNetworks: change "in opac" to "on the OPAC".

Note: Also deleted lines with # in front of them for the OpacBrowser and
OpacCloud system preferences in the Policy section - these look like
duplicated entries to me (previously lines 600-611).

Policy:
. OPACFineNoRenewalsIncludeCredits: change "users" to "patrons".

Self registration and modification:
. PatronSelfRegistrationConfirmEmail: change "Do not require" to "Don't
require", change "users" to "patrons".
. PatronSelfRegistrationEmailMustBeUnique: change "Do not consider" to
"Don't consider".
. PatronSelfRegistrationPrefillForm: change "Do not display and prefill"
to "Don't display and prefill".

Patrons
-------

General:
. AllowPatronToControlAutorenewal: add full stop.

Notices and notifications:
. EnhancedMessagingPreferences: change "Staff" to "staff".
- FallbackToSMSIfNoEmail: change "Send" to "sending".

Patron forms:
. BorrowerUnwantedField: add full stop.
. CollapseFieldsPatronAddForm:
  . Dropdown list changes:
     .. "Organization/Patron identity" => "Patron identity".
     .. "OPAC/Staff login" to "OPAC/Staff interface login".
  . Requires changes to the memberentrygen.tt - check that the add and
edit form for a patron dispaly correctly:
     .. change "Contact" to "Contact information".
     .. change "Library set-up" to "Library setup".
     .. change "OPAC/Staff login" to "OPAC/Staff interface login".

Patron relationships:
. PrefillGuaranteeField: change drop down list option "Main address -
street number" to "Main address - Street number" to match with format of
other entries.

Security:
. RequireStrongPassword: change "More" to "more".

Searching
---------

Search form:
. AdvancedSearchTypes: change "staff-side" to "staff interface".
. expandedSearchOption: change "staff" to "staff interface".

Serials
-------

. makePreviousSerialAvailable: change "Do not make" to Don't make";
"syspref" to "system preference".
. PreserveSerialNotes: change "Do not" to "Don't".
. RoutingListNote: change "Include following" to "Include the following"

Staff interface
---------------

Tab label and link:
. This tab was previously labelled "Staff client".
. Change tab label on the left hand side from "Staff client" to "Staff
interface".
. Change URL when selected from "preferences.pl?tab=staff_client" to
"preferences.pl?tab=staff_interface".
. Check that the link works as expected.

Appearance:
. IntranetFavicon: change "Staff" to "staff".

Tools
-----

Reports:
. NumSavedReports: change "Saved reports page" to "saved reports page".

Web services
------------

IdRef:
. IdRef: change "allows to request" to "allows requests for".

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
2020-09-02 12:05:33 +02:00
Katrin Fischer
17a2d57794 Bug 25630: Fix capitalization and terminology for Accounting, Administration and Serials system preferences
- Punctuation (p)
- Terminology
- Capitalization (c)

To test:
- Verify:
  - AccountAutoReconcile (Do not to Don't for consistency with other prefs)
  - IndependentBranchesPatronModifications (p)
  - IndependentBranchesTransfers (p)
  - GoogleOpenIDConnect (google to Google)
  - UsageStatsLibrariesInfo (c)
  - opacSerialDefaultTab (c)
  - StaffSerialIssueDisplayCount (staff interface)
  - SubscriptionDuplicateDroppedInput (c)

Signed-off-by: David Nind <david@davidnind.com>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
2020-09-02 12:05:33 +02:00
Katrin Fischer
c3033ae17c Bug 25630: Fix capitalization and terminology for Authorities and Cataloging system preferences
- Punctuation (p)
- Terminology
- Capitalization (c)

To test:
- Verify:
  - AuthDisplayHierarchy (biblio to bibliographic)
  - MARCAuthorityControlField008 (p)
  - UNIMARCAuthorityField100 (p)
  - LinkerModule (c)
  - LinkerOptions (p)
  - SpineLabelShowPrintOnBibDetails (bib to bibliographic)
  - DefaultLanguageField008 (p)
  - DefaultCountryField008 (p)
  - SubfieldsToAllowForRestricted* (p, rephrase)
  - URLLinkText (added 'and items' - new with 20.05)
  - IntranetBiblioDefaultView (c)
  - MergeReportFields (rephrase)
  - BibtexExportAdditionalFields (marc to MARC)

Signed-off-by: David Nind <david@davidnind.com>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
2020-09-02 12:05:33 +02:00
Katrin Fischer
60f215b3b8 Bug 25630: Fix capitalization and terminology for Circulation system preferences
- (Ending) punctuation (p)
- Terminology
- Capitalization (c)

To test:
- Verify:
  - CircSidebar (c)
  - itemBarcodeInputFilter (from to form)
  - HoldsToPullStartDate (preference to system preference)
  - NoticeCSS (c)
  - UpdateTotalIssuesOnCirc (issues to checkouts)
  - ExportRemovefields (p)
  - AllowItemsOnHoldCheckoutSIP (c)
  - OnSiteCheckoutAutoCheck (onsite to on-site)
  - AllowOfflineCirculation (plugin to add-on)
  - AllowFineOverride (add 'system preference')
  - AutomaticItemReturn (returned to checked in)
  - UseTransportCostMatrix (branches to libraries)
  - AllowReturnToBranch (materials to items, return to checkin)
  - RenewalSendNotice (clarify 'messaging preference for 'Item checkout')
  - TransfersMaxDaysWarning (c)
  - noissuescharge (books to items)
  - *NoissuesCharge (add 'system preference')
  - ReturnBeforeExpiry (books to items)
  - NoticeBcc (p)
  - OverdueNoticeCalendar (c, p)
  - OverduesBlockCirc (p)
  - DefaultLongOverdueChargeValue (whitespace after :)
  - OPACFineNoRenewalsBlockAutoRenew (c)
  - RenewAccruingItemWhenPaid (p, c, syspref to system preference)
  - RenewAccruingItemInOpac (p, c, syspref to system preference)
  - HoldsSplitQueue (staff interface)
  - StaffSearchResultsDisplayBranch (staff interface, rephrase)
  - HidePersonalPatronDetailOnCirculation (rephrase)
  - StoreLastBorrower (add 'system preferences')
  - HoldsSplitQueue (& to and, staff interface)
  - HouseboundModule (p)
  - StockRotation (p)
  - ArticleRequests* (p)
  - ClaimReturnedLostValue (rephrase)

Signed-off-by: David Nind <david@davidnind.com>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
2020-09-02 12:05:33 +02:00
Katrin Fischer
5e6f889063 Bug 25630: Fix capitalization and terminology for Logs and I18N system preferences
- (Ending) punctuation (p)
- Capitalization (p)
- Terminology

To test:
- Verify:
  - alphabet (p)
  - TranslateNotics (c)
  - IllLog (p)
  - ReturnLog (returned to checked in)
  - DumpTemplateVars* (HTML)
- read correctly.

Signed-off-by: David Nind <david@davidnind.com>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
2020-09-02 12:05:33 +02:00
Katrin Fischer
cd4d732296 Bug 25630: Fix capitalization and terminology for OPAC system preferences
- Ending punctuation (p)
- Capitalization (c)
- Terminology: library instead of branch, patron instead of borrower,
  system preferences instead of syspref

To test:
- Verify:
  - OPACUserSummary (p, rephrase: mainpage)
  - HighlightOwnItemsOnOPACWhich (library)
  - OPACXSLTListsDisplay (p)
  - OPACXSLTResultsDisplay (p)
  - OPACXSLTDetailsDisplay (p)
  - OpacNoItemTypeImages (p)
  - NotHighlightedWords (p)
  - opaclayoutstylesheet (CSS)
  - OPACReportProblem (c)
  - OpacBrowser (p)
  - OpacCloud (p)
  - SocialNetworks (p)
  - QuoteOfTheDay (c,p)
  - OpacNewsLibrarySelect (library)
  - OPACFineNoRenewalsIncludeCredits (p)
  - AllowPurchaseSuggestionBranchChoice (p)
  - OpacHiddenItemsExceptions (p, patron)
  - OpacAllowPublicListCreation (p)
  - OpacAllowSharingPrivateLists (p)
  - BlockExpiredPatronOpacActions (whitespace)
  - MaxOpenSuggestions (p)
  - AnonSuggestions (p)
  - OPACPrivacy (p, whitespace)
  - AnonymousPatron (c,p)
  - TrackClicks (p)
  - RestrictedPageLocalIPs (p)
  - RestrictedPageTitle (p)
  - OpacAdvSearchOptions (p)
  - OpacAdvSearchMoreOptions (p)
  - PayPal* (p)
  - OPACUserSummary (mainpage to OPAC start page)
- read correctly.

Signed-off-by: David Nind <david@davidnind.com>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
2020-09-02 12:05:33 +02:00
Katrin Fischer
0c30554759 Bug 25630: Fix capitalization and terminology for Patrons system preferences
- Consistent use of 'staff interface'
- Ending punctuation
- Rearranged/rephrased for better readability

To test:
- Verify:
  - patronimages
  - PatronsPerPage (rearranged)
  - PatronQuickAddFields (rearranged)
  - PrefillGuaranteeField (punctuation)
  - borrowerRelationship (punctuation)
  - GDPR_Policy
  - CollapseFieldsPatronAddForm
- read correctly.

Signed-off-by: David Nind <david@davidnind.com>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
2020-09-02 12:05:33 +02:00
Katrin Fischer
10c2eb01c9 Bug 25630: Fix capitalization and terminology for Enhanced content and Web services system preferences
- Fixes capitalization, including URL and OPAC
- Consistent use of "staff interface"
- Ending punctuation
- Spelling: web service

To test:
- Verify:
  - Enhanced content page heading
  - Babeltheque_url_js
  - Babeltheque_url_update
  - FRBRizeEditions
  - BakerTaylorEnabled
  - NovelistSelectStaffProfile
  - NovelistSelectStaffEnabled
  - CustomCoverImages
  - LocalCoverImages
  - IntranetCoce
  - AutoShareWithMana
  - OAI-PMH:AutoUpdateSets
  - IdRef
- read correctly.

Signed-off-by: David Nind <david@davidnind.com>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
2020-09-02 12:05:33 +02:00
Katrin Fischer
9475a7db68 Bug 25630: Fix capitalization and terminology for Acquisitions and Tools system preferences
- Adds some ending punctuation
- Fixes capitalization
- Consistent use of "staff interface"

To test:
- Verify:
  - NewsAuthorDisplay
  - EmailPurchaseSuggestions
  - UseACQFrameworkForBiblioRecords
  - AcqItemSetSubfieldsWhenReceived
  - AcqItemSetSubfieldsWhenReceiptIsCancelled
  - OrderPriceRounding
- read correctly.

Signed-off-by: David Nind <david@davidnind.com>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
2020-09-02 12:05:33 +02:00
Katrin Fischer
db47dbe56a Bug 25630: Fix capitalization and terminology fixes for Searching system preferences
- Rephrases LoadSearchHistoryToTheFirstLoggedUser system preference
- Consistently use "staff interface"
- Add ending punctuation to some preferences

To test:
- Read through the Searching system preferences
- Verify consistent use of staff interface
- Verify LoadSearchHistoryToTheFirstLoggedUser description is
  improved

Signed-off-by: David Nind <david@davidnind.com>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
2020-09-02 12:05:33 +02:00
Katrin Fischer
b56ad54f49 Bug 25630: Fix capitalization and terminology for Staff interface system preferences
This changes "staff client" to "staff interface" and fixes capitalization
in a couple of cases.

For terminology changes see:
https://wiki.koha-community.org/wiki/Terminology#S

To test:
- Read through the preferences of the "staff interface" tab.
- Staff interface should be used consistently.
- Firefox "PlugIn" was changed to "add-on" reflecting Mozilla's
  own terminology.

Signed-off-by: David Nind <david@davidnind.com>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
2020-09-02 12:05:33 +02:00
Katrin Fischer
c0adeab58f Bug 25448: Update German (de-DE) framework files
The updated files have been auto-generated based on the
po files and downloaded from
https://translate.koha-community.org/files/

To test:
- Make sure German language is installed, see:
  https://wiki.koha-community.org/wiki/Installation_of_additional_languages_for_OPAC_and_INTRANET_staff_client
- Run the web installer and choose de-DE
- Select all sample files
- Make sure they all install without any errors

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
2020-09-01 16:10:50 +02:00
4009bb04ad Revert "Bug 25242: Improve column wrapping and overflow for tables"
This reverts commit a3a09d09e3.

And also reverts the 3 other commits from bug 25242.

Revert "Bug 25242: Compiled CSS"

This reverts commit 198bbfa409.

Revert "Bug 25242: (QA follow-up) Remove deprecated break-word"

This reverts commit c3680149be.

Revert "Bug 25242: (QA follow-up) Colwidth on results table"

This reverts commit 84cbf0b937.

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
2020-09-01 16:02:25 +02:00
76bd932296 Bug 19889: Add new attribute to the REST API definition
It fixes t/db_dependent/api/v1/items.t

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
2020-09-01 12:22:06 +02:00
9be6b76a7b Bug 25504: Fix failing tests
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
2020-09-01 12:11:54 +02:00
092276f53c Bug 19889: DBRev 20.06.00.032
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
2020-08-31 16:17:58 +02:00
d6e72c0de2 Bug 19889: Add select2 class to the new dropdown list
This is needed since bug 25727.

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
2020-08-31 16:17:58 +02:00
Agustin Moyano
2793e45580 Bug 19889: (follow-up) Fix text in moredetail.tt
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
2020-08-31 16:17:58 +02:00
0de40dd877 Bug 19889: (QA follow-up) Check that exclude from local holds priority is set and not a blank string
Signed-off-by: Agustin Moyano <agustinmoyano@theke.io>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
2020-08-31 16:17:58 +02:00
fee0b9310e Bug 19889: (QA follow-up) use em over i and update field if unset
em is better for accessibility

We should set the field to 0 when it was previously unset

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
2020-08-31 16:17:58 +02:00
Agustin Moyano
c1be2b8817 Bug 19889: (follow-up) Fix few minor things
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>

JD amended patch: remove unecessary indentation changes

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
2020-08-31 16:17:58 +02:00
785265aea0 Bug 19889: (follow-up) Add tests
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
2020-08-31 16:17:58 +02:00
Agustin Moyano
18d42db176 Bug 19889: (follow-up) Fix overlapping blue box and message in batch item modification
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
2020-08-31 16:17:58 +02:00
cb9c48a6f6 Bug 19889: Add feedback when exclusion is updated on moredetail.pl
Signed-off-by: Christopher Brannon <cbrannon@cdalibrary.org>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
2020-08-31 16:17:58 +02:00
Agustin Moyano
bcf9b259c5 Bug 19889: Make it possible to exclude items and categories from local holds priority
This patch adds the ability to exclude patrons (by category) from local
holds, and items, by editing the item itself or by batch item
modification tool.

To test:
1. apply patches
2. updatedatabase
3. Enable LocalHoldsPriority preference, and leave
   LocalHoldsPriorityPatronControl in pickup library, and
LocalHoldsPriorityItemControl in holding library.
4. Search for a biblio with one item.
5. Place a hold with a patron (patron1) and set pickup location to a different
   library of the item's home library
6. Place another hold with another patron (patron2) and set pickup location to be
   the same as the item's home library
7. ./misc/cronjobs/holds/build_holds_queue.pl
8. Go to circulation -> holds queue
9. Search by the item's home library
CHECK => only the hold for patron2 (with the pickup location the same as the
item's home library) appears in the table
10. Go back to the biblio details page and click on "Items" tab
CHECK => There is a new section in the item's details between "Statuses"
and "History" called "Priority"
11. Set exclude to "Yes" and update
12. repeat steps 7 to 9
SUCCESS => only the hold for patron1 now appears, even the other hold had local
hold priority
13. Repeat step 10 and 11 but this time set exclude to "No"
14. repeat steps 7 to 9
CHECK => the hold for patron2 is back
15. Edit patron2's category and set exclude from local holds priority to
    "Yes"
16. Repeat steps 7 to 9
SUCCESS => the hold for patron1 is back
17. Go to tools -> Batch item modification and in barcode list place
    several (existing) barcodes and press continue
CHECK => There is a new section in the bottom called "Priority"
18. Set exclude to "Yes" and save
SUCCESS => all items in the list now have exclude setted to "Yes"
19. Try to checkout the first item to a patron3
SUCCESS => Alert message appears saying that patron1 has a hold on that
item
20. Click on Yes and then checkin that item
SUCCESS => There is a modal window saying that a hold was found for
patron1
21. prove t/db_dependent/HoldsQueue.t t/db_dependent/Holds/LocalHoldsPriority.t
22. Sign off

Sponsored-by: Cooperative Information Network (CIN)

Signed-off-by: Christopher Brannon <cbrannon@cdalibrary.org>

Signed-off-by: Christopher Brannon <cbrannon@cdalibrary.org>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
2020-08-31 16:17:58 +02:00
Agustin Moyano
93fdca5209 Bug 19889: Add tests
Sponsored-by: Cooperative Information Network (CIN)

Signed-off-by: Christopher Brannon <cbrannon@cdalibrary.org>

Signed-off-by: Christopher Brannon <cbrannon@cdalibrary.org>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
2020-08-31 16:17:58 +02:00
Agustin Moyano
34a42570dc Bug 19889: set exclude_from_local_holds_priority columns as boolean in schema
Sponsored-by: Cooperative Information Network (CIN)

Signed-off-by: Christopher Brannon <cbrannon@cdalibrary.org>

Signed-off-by: Christopher Brannon <cbrannon@cdalibrary.org>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>

JD Amended patch: fix md5sum
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
2020-08-31 16:17:40 +02:00
Agustin Moyano
05e5210194 Bug 19889: Add exclude_from_local_holds_priority columns to item, deleteditems and categories tables
Sponsored-by: Cooperative Information Network (CIN)

Signed-off-by: Christopher Brannon <cbrannon@cdalibrary.org>

Signed-off-by: Christopher Brannon <cbrannon@cdalibrary.org>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
2020-08-31 16:10:26 +02:00
28d826263b Bug 26250: StockRotationItems.t and StockRotationStages.t
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
2020-08-31 16:10:26 +02:00
9c9dddeaa4 Bug 26250: Fix tests when SearchEngine=Elastic
Most of the time the tests are failing because the item is not created
correctly (missing biblio and/or biblioitem).
The usual error is:
 t/db_dependent/selenium/regressions.t ..... 5/5 Can't call method "leader" on an undefined value at /kohadevbox/koha/Koha/SearchEngine/Elasticsearch.pm line 534.

In this patch we are making sure $builder->build({ source => 'Item' })
is replace with $builder->build_sample_item

Test plan:
Turn on Elastic and confirm that all the tests pass!

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
2020-08-31 16:10:26 +02:00
5fd8774c68 Bug 26069: Pass correct URL to twitter
We don't provide the url of the detail page so the twitter JS code
retrieve the current location, with the search terms.

Test plan:
Do a search
Click on a result
Click on the twitter button and confirm that the link only contain
biblionumber=x in the parameter

Signed-off-by: Amit Gupta <amit.gupta@informaticsglobal.com>

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
2020-08-31 16:10:26 +02:00
faa4b2aa62 Bug 25504: (QA follow-up) Remove unused include
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
2020-08-31 16:10:25 +02:00
f9ab4f0aac Bug 25504: Use Koha::Logger and display the full stacktrace
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
2020-08-31 16:10:25 +02:00
Ere Maijala
d01f5f6e8f Bug 25504: Improve REST API spec loading errors
Test plan:
1. Introduce a typo in swagger.json or another spec json file.
2. Restart plack if used or try to access the REST APIs
3. Without the patch, verify that  an incomplete error message and potentially lots of stack trace are logged.
4. With the patch, verify that much more meaningful error messages are logged and stack trace is omitted.
5. Fix the problem introduced in step 1 and verify that no messages are logged, or only warning about bundle is logged with Debian Stretch.
6. Repeat with a REST API plugin.

Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
2020-08-31 16:10:25 +02:00
5a87514b2e Bug 25273: (follow-up) Don't die on unknown authtype
We are guessing authtype code and inserting the heading built accorindg to C4::Heading

If we can't identify the auth type, we can format the heading. There is a record in the koha test
data that is missing the heading field so type cannot be idenfitied

This prevents us from dying n a record where we cannot identify the type.

Note: This code will also be triggered for custom authority types, higlighting
that they won't link because of hardcoded mappings in C4::Heading. We must tackle this
on a new bug

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
2020-08-31 16:10:25 +02:00
ce161fda9b Bug 25273: Make match-heading rely on authority type configuration
The match-heading field is a special field used only by the linker, not accessible
to staff or patrons via the interface. This field is used to store the constructed
'search form' used for matching bib headings to authority fields.

In bug 24269 I attempted to use the mappings defined in the inferface and also inject the search term.
This did not work as too many subfields were indexed on their own and leading to false matches.
In this bug we remove the mappings for this field, and create it ourselves during
the indexing process. The C4::Headings module is still used to generate the correct form,
however, the mappings are set based on the authority types in the system. This gives the user
the ability to add new typoes, but prevents mapping changes from breaking linker functionality

To test:
 1 - Start form a sample database with ElasticSearch working
 2 - Download via Z39.50 2 authorities, one of which is a narrower heading of the other, e.g.:
    Waterworks
    Waterworks - Costs
 3 - Place a heading for the broader term in a record. e.g. Waterworks
       In 650$a, without the cataloguing authority plugin. We don't want
       the link created now.
       You need syspref BiblioAddsAuthorities => allow
 4 - Make sure linker is set to default
 5 - Attempt to link the records
       misc/link_bibs_to_authorities.pl
 6 - Linking fails
 7 - Apply patch
 8 - refresh index settings (if using a custom file, remove 'match-heading')
       You can reset mappings in the UI or run this:
       misc/search_tools/rebuild_elasticsearch.pl -v -d -r
 9 - Reindex ES
10 - Try to link again
11 - It succeeds!
12 - Run the tests
     prove t/db_dependent/Koha/SearchEngine/Elasticsearch.t

Signed-off-by: Victor Grousset/tuxayo <victor@tuxayo.net>

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>

Bug 25273: (follow-up)

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
2020-08-31 16:10:25 +02:00
c96fabb8c4 Bug 17661: Trivial simplification using += operator
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
2020-08-31 16:10:25 +02:00
224ac84aec Bug 17661: (follow-up) Update regex to support Unicode characters
Rather than limiting initials to [A-Z] we should test for a broad
range of uppercase letters.

The ES/Zebra changes are slightly different because of Perl vs Java regex
conventions. POerl may support either, but I found 'Uppercase' to be a bit more explicit

More info here:
https://perldoc.perl.org/perlunicode.html

TO test:
Same plan as before but use Ж. as the ending initial
Confirm the period is preserved and other punctuation removed

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
2020-08-31 16:10:25 +02:00
e34f95a1f5 Bug 17661: Ending punctuation causes duplicate facets
The current code for facets doesn't pull strip ending punctuation from facets
This causes duplicate facets for terms that should be combined

Sometimes series can have different punctuation depending on the field they are in
Author initials punctuation should be preserved

To test:
1 - Do search and pull up some records
2 - Edit some of the records to have authors like:
    Date, C.J.
    Date, C.j.
    Date, C.J .
3 - Edit the records to have some series statments like:
    830 $aDate, C.J. ;$v5
    830 $aDate, C.J. ; $v5
    830 $aDate, C.J.; $v5
4 - Add some 490s to the record with first indicator 1 and series like:
    You wouldn't want to--
    You wouldn't want to
    You wouldn't want to..
5 - Search again and note you have 3 facets each for author and series
6 - Apply patch
7 - Repeat
8 - Now you get 2 facets for author, period not removed when following Upper case immediately, is otherwise
9 - Now you should have a single series facet
10 - Switch search engine to ES (index before applying patch)
11 - Note facets are separate again
12 - Reset mappings and reindex
   perl misc/search_tools/rebuild_elasticsearch -v -r
13 - Repeat search, facets combined as above

Signed-off-by: Sarah Cornell <sbcornell@cityofportsmouth.com>

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
2020-08-31 16:10:25 +02:00
a4e922ffe8 Bug 26289: Add missing variable definition to templates
This patch puts definition of the missing "searchid" variable into an
include file to be used by various bibliographic detail pages. The
variable is required by several JavaScript functions.

To test, apply the patch and locate or create a record with no items.
Open the labeled MARC view and choose Edit -> Delete record. Confirm the
deletion. The deletion should complete correctly.

Perform the same test with the detail view, ISBD view,  MARC view, and
items view.

Signed-off-by: Amit Gupta <amit.gupta@informaticsglobal.com>

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
2020-08-31 16:10:25 +02:00
Katrin Fischer
9ea7907618 Bug 26281: (QA follow-up) Fix missing filter
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
2020-08-31 16:10:25 +02:00
5c161c145b Bug 26281: Add cancellation reason to holds history
Bug 25534 adds the ability to store the cancellation reason when a hold
is cancelled and communicate it to the user. It would be great if the
cancellation reason could also be shown on the holds history.

Test Plan:
1) Apply this patch
2) Cancel a hold with a reason
4) Browse to holds history for the holds' patron
5) Note the reason shows in the status column if one was provided

Working ok.

Signed-off-by: Amit Gupta <amit.gupta@informaticsglobal.com>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
2020-08-31 16:10:25 +02:00
40393adc0f Bug 26015: Replace 2 missing occurrences
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
2020-08-31 16:10:25 +02:00
Katrin Fischer
ed066caf58 Bug 26015: Terminology: Fix tons more staff clients to staff interfaces
This takes care of more occurences of staff client and changes it to
staff interface, including in code comments.

To test:
- I think in this case careful code review is what we look for.

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
2020-08-31 16:10:25 +02:00
Katrin Fischer
d39d5b20d6 Bug 26015: Terminology: Use staff interface instead of staff client
We have agreed to use 'staff interface' instead of 'staff client'
and similar terms. This fixes the template files where staff client
appears:

To test:
- Check Administration > Patron categories
- Check the title of the staff interface start page in your
  browser tab
- Check the description of hte catalogue permission
- One more: this changes the message shown when someone managed
  to log in as the database user - as we no longer allow that, I am
  not sure if it can be triggered.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Joonas Kylmälä <joonas.kylmala@helsinki.fi>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
2020-08-31 16:10:25 +02:00
cf93255428 Bug 25639: Add search query strings as global javascript variables
To test:
1 - Search on OPAC for "qwertyuiop"
2 - View the HTML source
3 - Find 'qwertyuiop' in the source, it is not easily accessible via JS
4 - Apply patch
5 - Repeat
6 - Note that now there are global variables with the query strings
7 - Add to OpacUserJs:
    console.log( query_desc );
    console.log( querystring );
    console.log( query_cgi );
8 - Reload page and confirm variables are warned in the JS console (Press F12)
9 - Sign off

Signed-off-by: Sally <sally.healey@cheshiresharedservices.gov.uk>

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
2020-08-31 16:10:25 +02:00
8c92eda719 Bug 22789: DBRev 20.06.00.031
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
2020-08-31 16:10:25 +02:00
Katrin Fischer
671f2b86a9 Bug 22789: (QA follow-up) Some minor formatting changes
- Remove the unordered list added to the holds list Details column
- Switch div to span to have the hint appear behind the checkbox

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
2020-08-31 16:10:25 +02:00
Agustin Moyano
4b43c886a0 Bug 22789: (follow-up) Fix atomic update, GUI and more than one hold
This patch
* sets one check for reserves and another for old_reserves in
atomic update
* Adds a message below the checkbox and adds detail when a hold is non
  priority
* Fixes issue when there are more than one hold, but the first is non
  priority
* Adds test case for this last scenario

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
2020-08-31 16:10:25 +02:00
Agustin Moyano
d390b2f7cf Bug 22789: Add non priority feature to C4 classes and staff interface
This patch implements necesary code to implement non priority feature

To test:
1) Apply all patches.
2) Run updatedatabase.
3) Checkout a specific item for patron1.
4) Place a hold on the same item for patron2 (do not check non priority
   hold checkbox).
5) Try to renew the item for patron1.
CHECK => in checkouts table, there is a message that the item could not
be renewed because there was a hold.
6) Cleanup all checkouts and holds.
7) repeat steps 3 to 5, but this time check the non priority checkbox.
SUCCESS => item was renewed
8) prove t/db_dependent/Holds.t

Signed-off-by: Lisette Scheer <lisettes@latahlibrary.org>

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
2020-08-31 16:10:25 +02:00