This commit adds unit tests for Bug 14783.
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
This patch attemps to simplify the list of holds by moving the form for
changing a hold's pickup library into a modal dialog.
This patch also makes minor tweaks to the CSS for the "X" close button
shown in modal in windows. Instances where modal markup used "x" have
been updated to use the Bootstrap 4 standard "×"
To test, apply the patch and rebuild the OPAC
SCSS
(https://wiki.koha-community.org/wiki/Working_with_SCSS_in_the_OPAC_and_staff_client)
- Turn on the OPACAllowUserToChangeBranch system preference.
- Log in to the OPAC as a user with holds.
- In the view of your holds, confirm that each hold which can be
modified shows a "Change" link.
- Clicking the link should show a modal window with the title of the
item on hold shown in the header.
- Confirm that changing the pickup location works correctly.
Signed-off-by: Barbara Johnson <barbara.johnson@bedfordtx.gov>
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
This patch allows users to change the pickup location for their holds
from the opac. A syspref (OPACAllowUserToChangeBranch) controls at what
stage a hold can be changed.
To test:
1. Set up holds with diffrent statuses for a patron (pending, waiting,
in transit, suspended)
2. No pickup locations for any hold should be able to be changed.
3. Turn on and off the different options under
OPACAllowUserToChangeBranch. Make sure that only the corresponding
holds can be changed from the opac. Check eg in the staff client that
pickup location has changed.
4. The available pickup locations should respect any transfer
restrictions. (Same as the
holds list for a biblio in staff client)
5. For an in-transit hold: Check in the item at the original pickup
location.
6. Note that it will be redirected to the new location.
Sponsored-by: Lunds Universitetsbibliotek
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Barbara Johnson <barbara.johnson@bedfordtx.gov>
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
This patch adds a mapping from 264 to biblio.copyrightdate.
To test:
1) Apply patch
2) Delete existing frameworks
- In the database
delete from marc_tag_structure;
delete from marc_subfield_structure;
delete from biblio_framework;
3) Load default framework
- In a terminal, run
./misc/load_yaml.pl -f installer/data/mysql/en/marcflavour/marc21/mandatory/marc21_framework_DEFAULT.yml --load
4) In the staff interface, go to Administration > MARC bibliographic framework
- Make sure the default framework is there
5) In Administration > Koha to MARC mapping, check the mappings for biblio.copyrightdate
- biblioitems.publishercode should be mapped to 260 as well as 264
6) Create a bibliographic record with a value in 264
- In the database, check the biblio entry for this record, the value from 264 should be in copyrightdate
7) Create a bibliographic record with a value un 260
- In the database, check the biblio entry for this record, the value from 264 should be in copyrightdate
I hope I didn't forget anything! :)
Caroline
Signed-off-by: David Nind <david@davidnind.com>
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
This patch adds the page-section div to 2 tables on the branch transfer page.
To test:
1. Apply patch
2. Place an item level hold on a few items.
3. Now go to the branch transfer page and try transferring your items that have holds on them.
4. This should bring up a 'Reserve found' page. Look at the table and make sure it looks good with the page-section div added.
5. Now try some transfers that do not have holds. Make sure the table that populates also goods good with the page-section div added.
Note: There are some indentation changes.
Signed-off-by: David Nind <david@davidnind.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
We should run any inputted barcode through barcodedecode before passing it to any subroutines.
This was missed during the initial development of bug 26351.
Test Plan:
1) Set itemBarcodeInputFilter to "Remove spaces from"
2) Browse to the staff side advanced search
3) Run a barcode search for "MY TEST"
4) Note the message returned is:
No results match your search for 'bc,wrdl: "MY TEST"'.
5) Apply this patch
6) Restart all the things!
7) Repeat your search
8) Note the message returned is:
No results match your search for 'bc,wrdl: "MYTEST"'.
9) Note the lack of the space between MY and TEST!
Signed-off-by: David Nind <david@davidnind.com>
Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
Removing unused parts.
Test plan:
See first test plan. Confirm that it still works.
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: David Nind <david@davidnind.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
Test plan:
Check both cases: one library (public accessible) and more
libraries (public accessible). In the latter case click on
one of these libraries too.
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: David Nind <david@davidnind.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
To test:
1. Find an item and try placing a hold.
2. Under 'Hold details' the first list element is the patron name, it displays far to the right in an unusual location.
3. Apply patch and regenerate CSS ( https://wiki.koha-community.org/wiki/Working_with_SCSS_in_the_OPAC_and_staff_interface )
4. Try steps 1 & 2 again.
5. The name should display correctly.
Signed-off-by: David Nind <david@davidnind.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
Before this change, the ISBN woudl display like: ( isbn )
This patch removes the additional spaces so the display is
the same as without this patch set on current master: (isbn)
Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
Signed-off-by: Andrew Fuerste-Henry <andrewfh@dubcolib.org>
Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
By using objects a number of other routines are not needed:
GetImportRecordMarc SetImportRecordStatus SetMatchedBiblionumber
To test:
Grep for routines above in addorderiso2709 and confirm they are not used
Signed-off-by: Andrew Fuerste-Henry <andrewfh@dubcolib.org>
Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
This patch removes the use of GetImportRecordsRange from the step
of listing import batches to choose. It was only used for a count so is a simple
replacement
To test:
1 - Stage a number of files for import
2 - Import one of the files from tools
3 - Add to basket form a staged file
4 - Confirm staged baskets are listed, and imported basket is not
Signed-off-by: Andrew Fuerste-Henry <andrewfh@dubcolib.org>
Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
This patch removes the use of GetimportRecordsRange from the importing
step
To test:
0 - Apply patch
1 - Stage a marc file for import
2 - Add to basket from a staged file
3 - Select titles to import (don't select all)
4 - Fill out necessary fields, be sure to select itemtype on items tab
5 - Import
6 - Confirm titles successfully added to basket
7 - Confirm staged import not marked as imported
8 - Add to basket from same file
9 - Select rest of titles
10 - Import
11 - Confirm staged file now marked imported
Signed-off-by: Andrew Fuerste-Henry <andrewfh@dubcolib.org>
Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
This patch changes the way records are loaded for display when adding to
a basket from a staged file
To test:
1 - Stage a file of records for import
2 - Go to Acquisitions, find a vendor, create or find a basket
3 - Add to basket from staged file
4 - Choose the file
5 - Note the display of records
6 - Cancel
7 - Apply patch
8 - Stage from same file
9 - Note the display is unchanged
Signed-off-by: Andrew Fuerste-Henry <andrewfh@dubcolib.org>
Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
Signed-off-by: Andrew Fuerste-Henry <andrewfh@dubcolib.org>
Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
cleanup_database.pl cronjob has a typo in it's usage/help:
"preserve-logs" option should be "preserve-log" as it is everywhere
in the code.
Signed-off-by: David Nind <david@davidnind.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
To test:
1. Apply the patch and go to Administration -> Audio alerts
2. Confirm that the screen/table look correct with the page-section class added.
Note: There are some indentation changes.
Signed-off-by: David Nind <david@davidnind.com>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
When IndependentBranches is activated and a non-superlibrarian user looks at the "Patrons with no checkouts" report, it shows patrons from other libraries.
To recreate:
1) Activate IndependentBranches, IndependentBranchesPatronModifications and IndependentBranchesTransfers
2) Create a staff user with limited permissions (NOT a superlibrarian), including reports permissions. Here are mine as an example
- circulate (all)
- catalogue
- borrowers
- delete_borrowers
- edit_borrowers
- reserveforothers (all)
- reports (all)
3) Create (or make sure you already have) a patron in another branch (if using an existing patron, make sure they have no checkouts or checkout history)
4) Log in as your limited staff patron
5) Go to Reports > Inactive > Patrons who haven't checked out
6) Don't put in any limitations and click Submit
-- The patron from the other library appears in the list
7) Try to search for that other patron in the patron module
-- The patron from the other library is inaccessible
8) Apply the patch
9) Notice that the limited patron can only see patrons from his own
library
Signed-off-by: David Nind <david@davidnind.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
This patch add the context 'noun' to the 'Filter' string in
marc-overlay-rules.tt. This will separate that instance of 'Filter' from
the other ones, where it is meant as a verb.
To test:
1. Apply patch
2. Visit Administration > MARC overlay rules, make sure the page works
(no errors) and that there is a column called 'Filter'
3. Update the po files
gulp po:update --lang xx-XX
for example, gulp po:update --lang fr-CA
4. Check the xx-XX-messages.po file (e.g.
misc/translator/po/fr-CA-messages.po), there should be an entry for
'Filter', with a line msgctxt that gives the 'noun' context
5. Update the file with a random word for the 'Filter' translation
for example, I translated 'Filter' by 'Filter as a noun', just to see
the difference
\#: koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc-overlay-rules.tt:83
msgctxt "noun"
msgid "Filter"
msgstr "Filter as a noun"
6. Install a new language
6.1. Run the following commands in the terminal, replacing xx-XX with
the language code (e.g. fr-CA)
cd misc/translator
./translate install xx-XX
6.2. In the Koha staff interface, go to Administration > Global system
preferences
6.3. Search for language
6.4. Check the box next to the new language
6.5. Save
7. View the MARC overlay rules page in the new language, the 'Filter'
column heading should be whatever you put in step 5
Optional test
8. In the staff interface in English, view one or more of these pages,
the 'Filter' should be unchanged
- Acquisitions > Late orders (Filter button)
- Aquisitions > Search for vendor > Receive shipments (Filter heading on
the left and Filter button)
- Acquisitions > Search for vendor > Click vendor's name > Uncertain
prices (Filter button)
- Administration > Budgets > Click budget's name > Planning > Plan by
... (any option) (Filter heading on the left)
- Reports > Use saved (Filter heading on the left)
- Reports > Acquisitions statistics wizard (Filter column heading)
- Reports > Patrons statistics wizard (Filter column heading)
- Reports > Catalog statistics wizard (Filter column heading)
- Reports > Circulation statistics wizard (Filter column heading)
- Reports > Holds statistics wizard (Filter column heading)
- Reports > Average loan time (Filter column heading)
- Tools > News (Filter heading on the left)
9. View these same pages in the other language, the Filter should NOT be
changed to whatever you put in step 5
Signed-off-by: David Nind <david@davidnind.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
This patch updates the checkout and patron details pages, updating
jQueryUI tabs to Bootstrap tabs.
To test, apply the patch and rebuild the staff interface CSS
(https://wiki.koha-community.org/wiki/Working_with_SCSS_in_the_OPAC_and_staff_client).
Go to Circulation -> Check out and load a patron record for checkout.
Ideally the patron record should have a variet of data associated with
it:
- Checkouts
- Relative's checkouts (if patron is a guarantor or guarantee to
another patron with checkouts)
- Holds
- Article requests
- Claims
- Restrictions
- Clubs
On the patron's checkout page, test the various tabs corresponding to
the features listed above. Having data to display in those tabs helps
confirm that any table functionality triggered by the tab activation is
working correctly.
The checkouts tab should work correctly whether you have "Always show
checkouts immediately" checked or not.
Test that you can pre-select any tab by appending its anchor to the URL,
e.g.:
/cgi-bin/koha/circ/circulation.pl?borrowernumber=123#reserves
Perform the same checks on the patron details page.
Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
This patch removes the box-shadow from our 'card' mixin and thus makes
page-section and other similar content area blocks look flat
Signed-off-by: David Nind <david@davidnind.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
To test:
1. Apply patch
2. Have some MARC records and stage them for import. It will be nessesary to add more than 1
3. Go to the Manage staged MARC records page and make sure the table looks right with the page-section added.
Note: I am also adding the Bootstrap table class to this table becuase I think it makes the table look much nicer.
Signed-off-by: David Nind <david@davidnind.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
To test:
1. Apply patch
2. Look at the noitce page and notice how the table, and it's tools, now are wrapped with the page-section element.
3. Is it better than it was before?
Feel free to osboslete these patch and replace it with your own.
Signed-off-by: David Nind <david@davidnind.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
This patch updates patron clubs template so that the main content of
the page is wrapped with a "page-section" div. This ensures that content
has sufficient contrast. See Bug 31757.
Note: This patch contains indentation changes, so use diff accordingly.
To test, apply the patch and go to Tools -> Patron clubs.
- If necessary, add at least one club template and at least one club
based on that template.
- Confirm that the display of club templates and clubs looks correct.
- Locate some patrons and add them to a club.
- On the patron clubs page, locate a club with enrollments and click
Actions -> Enrollments. Confirm that the page looks correct.
Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
This patch updates tags templates so that the main content of
the page is wrapped with a "page-section" div. This ensures that content
has sufficient contrast. See Bug 31757.
Note: This patch contains indentation changes, so use diff accordingly.
To test, apply the patch and go to Tools -> Tags.
- Confirm that the content area of the page looks correct.
- Click one of the tag terms to view the list of titles tagged with that
term. Confirm that this page looks correct too.
Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
Edit: changed the subject
An alternative that puts adds a new page-section div around each
preference subsection rather than around the whole tab section.
Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
Edit: changed the title
Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
To test:
1. Apply patch
2. Regenerate staff CSS ( https://wiki.koha-community.org/wiki/Working_with_SCSS_in_the_OPAC_and_staff_interface )
3. Look at the #area-news element of the mainpage.
4. There should be no rounded corners and the box-shadow should be the same as seen elsewhere ( i.e. patron details page )
Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
This patch simply adds a check to the import process to only process attrbutes if
they have been found in the data
To test:
1 - Import some patrons without extended attributes
2 - Import patrons including extended attributes
3 - Confirm both work unchanged
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
Test plan:
Enable SQL strict mode (koha-conf).
Modify branch, set Public to No.
Check.
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
The code in admin/branches.pl changed a 0 to undef which is not
desirable for booleans.
A similar fix was already present for pickup_location.
This may need a bit more thought (somewhere else!).
Test plan:
Add a new branch with pickup location No, public No.
Check.
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
Remove 'i' added to the end of the breadcrumb on the confirmation page
when deleteing a MARC framework subfield.
Test plan:
1. Go to Administration > MARC bibliographic frameworks.
2. View the subfields for a tag for a framework, for example:
. BKS framework > Actions > MARC structure
. Search for tag 245
. Select Actions > View subfields.
3. Select any subfield to delete and select the Delete button.
4. Note that there is an 'i' at the end of the breadcrumb, for example:
. ... > Confirm deletion of subfield bi
5. Apply the patch.
6. Refresh the page and note that that 'i' is removed.
7. Sign off.
Signed-off-by: David Nind <david@davidnind.com>
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
This patch updates patron lists templates so that the main content of
the page is wrapped with a "page-section" div. This ensures that content
has sufficient contrast. See Bug 31757.
Unrelated change: I wrapped some form controls in a <fieldset> to make
it consistent with other pages and to work better with the updated
markup.
Note: This patch contains indentation changes, so use diff accordingly.
To test, apply the patch and go to Tools -> Patron lists.
- If necessary, create one or more patron lists so that the table
appears. Confirm that the content area looks correct.
- Click Actions -> Add patrons to confirm that the screen
looks correct.
Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
Signed-off-by: David Nind <david@davidnind.com>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
Koha::Object->store is triggering an UPDATE because the datelastseen is
different than the value in DB (comparing a datetime with a date)
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
Hiding the list may lead to biblioitems.itemtype being NULL.
We do not want that, since 942$c is mandatory.
Test plan:
Create basket and set 'create items when' to receiving or
cataloging.
Create order from new empty record.
Check biblioitems.itemtype of created biblio.
Without this patch, it would have been NULL like this:
select biblionumber,title from biblio;
| 7 | Test 3 |
select biblionumber,itemtype from biblioitems;
| 7 | NULL |
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: David Nind <david@davidnind.com>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
To test:
1. Apply patch
2. Have none of the image services turned on:
AmazonCoverImages
LocalCoverImages
IntranetCoce
SyndeticsCovers
3. Look at the detail page, things should look right.
4. Turn on some of these image services, things should still look right.
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
Some CSS was removed which controlled the appearance of DataTables
column sort icons. Without it, DataTables tries to use some default
images which do not exist.
This patch restores the icons. With it, sorting icons should look like
they do in master and there should be no related 404 errors in the
console.
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
I think styling links with a bold hover state results in a "jumpy" look,
and I seem to recall making changes in the past to issues like in
response to bug reports.
I'd like to propose an alternative style for the nav menu which uses
color changes to indicate the hover state. This menu can be seen in the
sidebar of patron details, bibliographic details, etc.
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
