Jonathan Druart [Thu, 21 Dec 2017 00:35:47 +0000 (21:35 -0300)]
Bug 19673: Allow to set patron attributes to 0 with batch patron modification
This patch will have to be tested deeply to make sure it will not
introduce regression!
The idea is to display an empty option in the patron attributes select
and ignore it. That way we can deal with false values 0 and "" which
were skipped before.
Test plan:
Add several patron attributes
Use the batch patron modification tool to add/update/remove them
Play with empty "" and 0 values, as well as other values
Modify several attributes in a row
Signed-off-by: Charles Farmer <charles.farmer@inLibro.com> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Nick Clemens [Thu, 4 Jan 2018 15:31:52 +0000 (15:31 +0000)]
Bug 19916: Add keyword and standard ID fields to acq external search
To test:
1 - Add an order from external source
2 - Note you don't have keyword or standard ID fields
3 - Add a catalog record from Z3950, note those fields are there
4 - Apply patch
5 - Check acq and note you do have those fields
6 - Do some searches to verify they work as expected
Signed-off-by: Maksim Sen <maksim.sen@inlibro.com> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Pasi Kallinen [Mon, 5 Mar 2018 07:09:28 +0000 (09:09 +0200)]
Bug 20330: Allow translating more of quote upload
Translate the error messages, and the table headers.
Test plan:
1) Go to Home -> Tools -> Quote editor -> Import quotes
2) Upload quotes from a file. Try to trigger the error messages
3) On successful import, check the table header texts
4) Apply patch, update & install a language
5) The error messages and the table header texts should
show up in the xx-YY-staff-prog.po
6) Repeat 1,2,3
Signed-off-by: Pasi Kallinen <pasi.kallinen@joensuu.fi> Signed-off-by: Mark Tompsett <mtompset@hotmail.com> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Josef Moravec <josef.moravec@gmail.com> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
Edit: removed debian/control changes as the file is generated
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Jonathan Druart [Mon, 26 Mar 2018 16:13:58 +0000 (13:13 -0300)]
Bug 20455: Fix sort patrons by date expired
We may need to apply this change for all other occurrences in our
codebase.
Test plan:
- Make sure sample patron data is loaded and you have a patron without a
date expired defined
- Make an empty search for all patrons or another search that gives you
a good amount of results
- Try to sort on the date expired column
=> Without this patch you get
Odd number of elements in anonymous hash
at /home/vagrant/kohaclone/C4/Utils/DataTables/Members.pm line 189.
output_pref is called with 'dateonly' (ref SCALAR), not a DateTime
object
Signed-off-by: Mark Tompsett <mtompset@hotmail.com> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Nick Clemens [Mon, 12 Mar 2018 15:56:45 +0000 (15:56 +0000)]
Bug 19582: (follow-up) get params in correct order
We were ordering the values out of sync with the order of the mathclist
param and so causing 'entire record' and 'all headings' to be reversed
Signed-off-by: Nicolas Legrand <nicolas.legrand@bulac.fr> Signed-off-by: Alex Arnaud <alex.arnaud@biblibre.com> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Nick Clemens [Tue, 7 Nov 2017 01:24:56 +0000 (01:24 +0000)]
Bug 19582: Unit tests
Signed-off-by: David Bourgault <david.bourgault@inlibro.com> Signed-off-by: Nicolas Legrand <nicolas.legrand@bulac.fr> Signed-off-by: Alex Arnaud <alex.arnaud@biblibre.com> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Nick Clemens [Mon, 6 Nov 2017 17:14:34 +0000 (17:14 +0000)]
Bug 19582: Use compat routines for searching authorities in auth_finder.pl
To test:
1 - Enable Zebra
2 - Perform an auth search
3 - note results
4 - Enable ES
5 - Repeat search, note (likely) diff results
6 - Open a record in cataloging and use the button to launch auth search
7 - Perform same search as above, note results match for eiher engine
selected
8 - NOTE: Disbale sorting for ES search - this will be dealt with in
another report
Signed-off-by: David Bourgault <david.bourgault@inlibro.com> Signed-off-by: Nicolas Legrand <nicolas.legrand@bulac.fr> Signed-off-by: Alex Arnaud <alex.arnaud@biblibre.com> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Claire Gravely [Tue, 13 Mar 2018 11:18:33 +0000 (11:18 +0000)]
Bug 20386: Improve warning and error messages for Search Engine Configuration
This patch updates a warning message and error message in the Search
engine configuration for Elasticsearch.
Note: elasticsearch does not need to be active in order to test.
To test warning message:
1. go to: cgi-bin/koha/admin/searchengine/elasticsearch/mappings.pl
2. note the warning message
3. Apply patch
4. Note the change in warning message. Confirm it makes sense.
To test error message:
Apply patch and check the changed message in the template file mappings.tt and confirm it makes sense.
Signed-off-by: Nicolas Legrand <nicolas.legrand@bulac.fr> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Fridolin Somers [Mon, 4 Dec 2017 09:04:48 +0000 (10:04 +0100)]
Bug 19739: Add default ES configuration to koha-conf.xml
Bug 18571 added default ES configuration for packaging config.
This patch adds it to dev install in koha-conf.xml.
Database name is used in index_name to allow multiple installs.
Test plan :
- Run dev install
- Install ElasticSearch server and Koha deps
- Enable ElasticSearch in Koha
- Check indexing and searching works directly
Signed-off-by: Brendan Gallagher <brendan@bywatersolutions.com> Signed-off-by: Nick Clemens <nick@bywatersolutions.com> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Owen Leonard [Mon, 18 Sep 2017 15:23:38 +0000 (15:23 +0000)]
Bug 19233: (follow-up) Send itemnumbers in report results to batch modification
This patch changes the obscure "^" symbol to a styled link with the text
"Batch modify." I think the only disadvantage of this is that it takes
up more space, but it is outweighed by the improved clarity.
This patch also makes minor indentation corrections to new lines of
HTML.
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Julian Maurice <julian.maurice@biblibre.com> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Nick Clemens [Fri, 1 Sep 2017 00:54:44 +0000 (00:54 +0000)]
Bug 19233: Add ability to send itemnumbers in report results to batch modification
To test:
1 - Apply patch
2 - Run a report with an itemnumber column
3 - Note there is a linked '^' after column title
4 - Hover over the '^'
5 - You should see a tooltip 'Send visible items to batch modification'
6 - Click the '^'
7 - You should be sent to batch item modification with itemnumbers that
were visible in report
Signed-off-by: George <george@nekls.org> Signed-off-by: BWS Sandboxes <ByWaterSandboxes@gmail.com> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Julian Maurice <julian.maurice@biblibre.com> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Nick Clemens [Tue, 27 Mar 2018 12:47:57 +0000 (12:47 +0000)]
Bug 20479: Don't kick superlibrarians out of the opac
To test:
1 - Try to log in to opac with a superlibrarian
2 - Everythign goes wrong
3 - Apply patch
4 - Try to log in with superlibrarian
5 - You can sign in
Signed-off-by: Claire Gravely <claire.gravely@bsz-bw.de> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Jonathan Druart [Tue, 27 Mar 2018 16:27:27 +0000 (13:27 -0300)]
Bug 20480: send KOHA_VERSION even if only one language is enabled
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Bug 20480: Make KOHA_VERSION available to all templates in all circumstances
This patch makes C4::Templates::gettemplate set the KOHA_VERSION param
for the template. This way this template parameter, which is required by
(probably) all pages that include CSS/JS content is available in all
circumstances.
A noticeable problem with the current approach is when using the SCO and
SCI modules with wrong/forbidden users: C4::Auth short-circuits and
redirects to the login page, without setting the KOHA_VERSION param.
This patch solves it for good.
To test:
- Enable the SCI module
- Open the browser at
http://localhost:8080/cgi-bin/koha/sci/sci-main.pl
- Login with the db user (koha_kohadev / password)
=> FAIL: Login failure, but styling is broken
- Apply this patch
- Retry
=> SUCCESS: Everything looks as it should!
- Sign off :-D
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Jonathan Druart [Tue, 27 Mar 2018 15:03:51 +0000 (12:03 -0300)]
Bug 20045: Fix Selenium tests
Element id=doc does not longer exist on the admin home page
The "main block" need to be localized using the new class 'main
container-fluid'
We will certainly need to improve this later.
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Bug 17468: Remove koha-*-zebra scripts and its traces
This patch removes traces from the (deprecated) koha-*-zebra scripts.
To test:
- Apply the patch
- Verify no traces of koha-*-zebra remain on the codebase (besides
Release Notes and the koha-zebra script):
$ cd kohaclone
$ git grep koha-start-zebra
$ git grep koha-stop-zebra
$ git grep koha-restart-zebra
=> SUCCESS: No traces!
- Create the following symlinks:
$ sudo ln -s /usr/sbin/koha-zebra /usr/sbin/koha-start-zebra
$ sudo ln -s /usr/sbin/koha-zebra /usr/sbin/koha-stop-zebra
$ sudo ln -s /usr/sbin/koha-zebra /usr/sbin/koha-restart-zebra
- Try the koha-*-zebra commands:
$ sudo koha-stop-zebra kohadev
$ sudo koha-start-zebra kohadev
$ sudo koha-restart-zebra kohadev
=> SUCCESS: They all work as expected!
- Sign off :-D!
Sponsored-by: Orex Digital Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Owen Leonard [Tue, 6 Mar 2018 18:48:08 +0000 (18:48 +0000)]
Bug 20345: Put saved report keyword search form on reports home
This patch makes cosmetic changes to the reports home page in the staff
client following the pattern set on the Administration home page with
the system preferences search box. A reports keyword search form is
added, and reports actions have font-awesome icons.
To test, apply the patch and view the reports home page. Confirm that
all affected links work correctly and that the search form works
correctly.
Signed-off-by: Claire Gravely <claire.gravely@bsz-bw.de> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Owen Leonard [Tue, 16 Jan 2018 16:55:36 +0000 (16:55 +0000)]
Bug 19983: Switch single-column templates to Bootstrap grid: Authorities
This patch updates several single-column Authorities module templates to
use the Bootstrap grid.
- authorities-home - The home page of the Authorities module.
- authorities.tt - The authority add/edit page.
- blinddetail-biblio-search.tt - Not really testable -- It's the small
popup window which appears during the process of linking an authority
to a MARC record.
- detail.tt - The authority detail page. Search for an authority record
and click on the "details" link in the search results.
- merge.tt - From a list of authority search results, select "Merge"
from the Actions menu of two authority records. Test both the initial
selection screen and the source/destination merging view.
- searchresultlist.tt - The authority search results page.
Each of these pages should look correct, with a single centered column
with wide margins on either side. At lower browser widths the margins
should disappear.
Signed-off-by: Claire Gravely <claire.gravely@bsz-bw.de> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Owen Leonard [Wed, 21 Feb 2018 19:40:06 +0000 (19:40 +0000)]
Bug 19961: Move template JavaScript to the footer: Patron card creator
This patch modifies the staff client patron card creator templates so
that JavaScript is included in the footer instead of the header.
Also changed: Removed "type" attribute from script tags.
To test, apply the patch and test the JavaScript-driven features of
each modified template: All button controls, DataTables functionality,
form validation, etc.
- Creating and managing layouts
- Creating and managing card batches
- Creating and managing card templates
- Creating and managing printer profiles
- Creating and managing images
Signed-off-by: Jesse Maseto <jesse@bywatersolutions.com> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Owen Leonard [Fri, 9 Feb 2018 13:16:40 +0000 (13:16 +0000)]
Bug 19946: (follow-up) Add fixed footer to authorities Z39.50 popup
This patch adds additional Bootstrap framework markup to the search form
so that the "Save" and "Cancel" controls are in a fixed footer at the
bottom of the window. This prevents the controls from disappearing down
off screen.
This patch also adds some whitespace to the "Author
(meeting/conference)" label to enable better word wrapping.
To test, apply the patch and go to Authorities -> New from Z39.50/SRU.
In the popup window, both the search form and search results pages
should look correct.
Owen Leonard [Wed, 10 Jan 2018 16:10:44 +0000 (16:10 +0000)]
Bug 19946: Update popup window templates to use Bootstrap grid: Authority Z39.50 search
This patch updates the authority Z39.50 search template to use the
Bootstrap grid instead of the YUI grid.
Also fixed: Some capitalization corrections, better <title>
handling. This patch does not fix Bug 17119.
To test, apply the patch and go to Authorities -> New from Z39.50.
In the popup window, both the search form and search results pages
should look correct.
Signed-off-by: Te Rauhina Jackson <terauhina.jackson@gmail.com> Signed-off-by: Te Rauhina Jackson <terauhina.jackson@gmail.com> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Owen Leonard [Wed, 10 Jan 2018 17:42:59 +0000 (17:42 +0000)]
Bug 19949: Update popup window templates to use Bootstrap grid: Cataloging authority search
This patch updates the cataloging authority search templates to use the
Bootstrap grid instead of the YUI grid.
To test you must have a MARC subfield configured with "Thesaurus"
linked to an authority type.
Apply the patch and go to Cataloging -> New record. Click the plugin
link for the field which is linked to authorities. In the popup window,
the search form and search results should look correct.
Signed-off-by: Zoe Bennett <zoebennett1308@gmail.com> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Owen Leonard [Tue, 2 Jan 2018 16:29:44 +0000 (16:29 +0000)]
Bug 19878: Move template JavaScript to the footer: UNIMARC editor plugins, part 7
This patch updates the last of the UNIMARC plugin templates so that
JavaScript is included in the footer following the same pattern as
other templates which have been modified to fix Bug 17858.
To test you do not need a UNIMARC system.
Apply the patch and for each plugin, configure a MARC subfield (e.g.
100$a) to use that plugin.
From the MARC edit page, trigger the plugin and confirm that changes
made in the popup window are saved to the corresponding field in the
editor.
Owen Leonard [Fri, 22 Dec 2017 16:32:57 +0000 (16:32 +0000)]
Bug 19877: Move template JavaScript to the footer: UNIMARC editor plugins, part 6
This patch updates more UNIMARC plugin templates than ever before, so
that JavaScript is included in the footer following the same pattern as
other templates which have been modified to fix Bug 17858.
To test you do not need a UNIMARC system.
Apply the patch and for each plugin, configure a MARC subfield (e.g.
100$a) to use that plugin.
From the MARC edit page, trigger the plugin and confirm that changes
made in the popup window are saved to the corresponding field in the
editor.
Owen Leonard [Fri, 22 Dec 2017 14:51:20 +0000 (14:51 +0000)]
Bug 19874: Move template JavaScript to the footer: UNIMARC editor plugins, part 5
This patch updates yet more UNIMARC plugin templates so that
JavaScript is included in the footer following the same pattern as other
templates which have been modified to fix Bug 17858.
To test you do not need a UNIMARC system.
Apply the patch and for each plugin, configure a MARC subfield (e.g.
100$a) to use that plugin.
From the MARC edit page, trigger the plugin and confirm that changes
made in the popup window are saved to the corresponding field in the
editor.
Owen Leonard [Fri, 22 Dec 2017 14:12:09 +0000 (14:12 +0000)]
Bug 19872: Move template JavaScript to the footer: UNIMARC editor plugins, part 4
This patch updates more and more UNIMARC plugin templates so that
JavaScript is included in the footer following the same pattern as other
templates which have been modified to fix Bug 17858.
To test you do not need a UNIMARC system.
Apply the patch and for each plugin, configure a MARC subfield (e.g.
100$a) to use that plugin.
From the MARC edit page, trigger the plugin and confirm that changes
made in the popup window are saved to the corresponding field in the
editor.
Owen Leonard [Thu, 21 Dec 2017 18:20:12 +0000 (18:20 +0000)]
Bug 19869: Move template JavaScript to the footer: UNIMARC editor plugins, part 3
This patch updates even more UNIMARC plugin templates so that
JavaScript is included in the footer following the same pattern as other
templates which have been modified to fix Bug 17858.
To test you do not need a UNIMARC system.
Apply the patch and for each plugin, configure a MARC subfield (e.g.
100$a) to use that plugin.
From the MARC edit page, trigger the plugin and confirm that changes
made in the popup window are saved to the corresponding field in the
editor.
- unimarc_field_123a.tt
- unimarc_field_123d.tt
- unimarc_field_123e.tt
- unimarc_field_123f.tt
- This template has been modified, but doesn't appear to be used. The
unimarc_field_1234.pl script uses unimarc_field_123g.tt as its
template.
- unimarc_field_123g.tt
- unimarc_field_123i_j.tt
Signed-off-by: Anne-Claire Bernaudin <anne-claire.bernaudin@univ-rennes1.fr> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Owen Leonard [Thu, 21 Dec 2017 17:45:09 +0000 (17:45 +0000)]
Bug 19868: Move template JavaScript to the footer: UNIMARC editor plugins, part 2
This patch updates several more UNIMARC plugin templates so that
JavaScript is included in the footer following the same pattern as other
templates which have been modified to fix Bug 17858.
To test you do not need a UNIMARC system.
Apply the patch and for each plugin, configure a MARC subfield (e.g.
100$a) to use that plugin.
From the MARC edit page, trigger the plugin and confirm that changes
made in the popup window are saved to the corresponding field in the
editor.
Owen Leonard [Thu, 21 Dec 2017 16:30:05 +0000 (16:30 +0000)]
Bug 19866: Move template JavaScript to the footer: UNIMARC editor plugins, part 1
This patch updates several UNIMARC plugin templates so that JavaScript
is included in the footer following the same pattern as other templates
which have been modified to fix Bug 17858.
To test you do not need a UNIMARC system.
Apply the patch and for each plugin, configure a MARC subfield (e.g.
100$a) to use that plugin.
From the MARC edit page, trigger the plugin and confirm that changes
made in the popup window are saved to the corresponding field in the
editor.
Owen Leonard [Tue, 20 Feb 2018 14:19:31 +0000 (14:19 +0000)]
Bug 19786: (follow-up) Correct js include path, popup window size
This follow-up adds the required KOHA_VERSION variable to two templates
where it was missing.
This patch also adds a 'window_size' parameter to a popup window
function so that self-closing windows like blinddetail-biblio-search.pl
can appear small and others at a reasonable size.
To test, apply the patch and clear your browser cache if
necessary.
- Confirm that the QA tools do not complain about missing KOHA_VERSION
in auth_finder.tt and searchresultlist_auth.tt.
- Open a bibliographic record for editing in the basic editor using a
framework in which a field is linked to authorities.
- Trigger the authority selection window for that field.
- Click the "Clear field" button at the top of the authority search
pop-up window. Another smaller popup window should briefly appear, and
then both windows should close.
- Trigger the authority selection window again.
- Click the "Create new authority" button. A new window should appear
with the MARC authority editor. The window should be a usable size.
Signed-off-by: Claire Gravely <claire.gravely@bsz-bw.de> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Owen Leonard [Fri, 8 Dec 2017 19:57:28 +0000 (19:57 +0000)]
Bug 19786: Move template JavaScript to the footer: Authorities, part 2
This patch modifies the staff client patron lists templates so that
JavaScript is included in the footer instead of the header.
To test, apply the patch and test the JavaScript-driven features of
each modified template.
I've made one change to the JavaScript in addition to moving it: I've
made it so that the blank window which pops up briefly in this process
is 100px x 100px instead of full screen.
- Cataloging -> Add or edit bibliographic record in a framework which
has authorities linked to a tag
-> Click authorities plugin link
-> Create new authority button
-> Autocomplete on text inputs (except "Search all headings")
-> Search
-> Select authority record ("choose")
-> Click authorities plugin link again
-> Clear field
Signed-off-by: Claire Gravely <claire_gravely@hotmail.com> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Bug 15492: Add KOHA_VERSION to included .css and .js
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io> Signed-off-by: Josef Moravec <josef.moravec@gmail.com> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Bug 15492: Display nicer message on data corruption
This patch hides scary messages and changes the wording for a more
idiomatic approach. Thanks to Nick :-D
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io> Signed-off-by: Josef Moravec <josef.moravec@gmail.com> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Bug 15492: Make SCI use its own sysprefs and CSS file
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io> Signed-off-by: Josef Moravec <josef.moravec@gmail.com> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
get_template_and_user gets refactored to avoid code duplication and the
conditions are adjusted for the new permissions.
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io> Signed-off-by: Josef Moravec <josef.moravec@gmail.com> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
and moves the circulate => self_checkout permission into
- self_check => self_checkout_module
Descriptions are adjusted accordingly.
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io> Signed-off-by: Josef Moravec <josef.moravec@gmail.com> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Kyle M Hall [Thu, 21 Dec 2017 17:59:13 +0000 (12:59 -0500)]
Bug 15492: (QA follow-up) Reset SCI if idle for 30 seconds
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io> Signed-off-by: Josef Moravec <josef.moravec@gmail.com> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
This patch adds the SCI module, and adapts C4::Auth to know about it.
The current behaviour is:
- Requires admin user initialization/login
- Uses the logged users' library
- A form allows to scan multiple barcodes
- A button sends the barcode list to the controller
to batch perform the checkins
- Successful and failed checkins are sent to the template
- Results are displayed
- Logout link
To test:
- Apply this patches
- Make sure you upgrade:
$ kshell
k$ perl installer/data/mysql/updatedatabase.pl
- Have 'SelfCheckInModule' disabled
- Go to http://kohadev.myDNSname.org:8080/cgi-bin/koha/sci/sci-main.pl [1]
=> SUCCESS: You are rejected because the feature is disabled
- Enable 'SelfCheckInModule'
- Go to the previous URL
=> SUCCESS: You are required to login
- Login with a user WITHOUT self_checkout permissions
=> SUCCESS: You are not allowed to log into the Self check-in module.
- Login with a user WITH self_checkour permissions
=> SUCCESS: You gain access, and are presented the UI
- Go through the several options
=> SUCCESS: All works as it should
- Click the 'Help' link
=> SUCCESS: A help text is displayed on a modal
- Sign off :-D
- Bonus points:
$ kshell
k$ qa -c 2 -v 2
=> SUCCESS: All tests green
[1] Adjust to your dev's OPAC setup
Signed-off-by: David Bourgault <david.bourgault@inlibro.com> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Josef Moravec <josef.moravec@gmail.com> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: David Bourgault <david.bourgault@inlibro.com> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Josef Moravec <josef.moravec@gmail.com> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Nick Clemens [Tue, 23 Jan 2018 20:21:57 +0000 (20:21 +0000)]
Bug 20081: Set inline headers for uploaded pdfs
To test:
1 - Edit a framework and add the 'upload/pl' plugin to the 856 field
2 - Attach a pdf to one record
3 - Attach a different type of file to another
(To attach, edit a record in the framework edited above and find the
helper by the 856 field)
4 - Click the links on the record
5 - Verify the pdf opens inline
6 - Verify the other file does not
7 - prove t/db_dependent/Upload.t
Signed-off-by: Claire Gravely <claire.gravely@bsz-bw.de> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Nick Clemens [Thu, 11 Jan 2018 18:19:33 +0000 (18:19 +0000)]
Bug 19957: Allow continued editing of report after saving
To test:
1 - Edit or create a report
2 - Save it
3 - Note the report is saved but you can't keep editing
4 - Clicking 'Edit' returns you to editing
5 - Apply patch
6 - Save report
7 - Note success message remains, but report is still open for editing
8 - Note when you click the saved/updated message dissappears
9 - Try again after inserting erros into report (No Select, bad
authorised value, etc.)
10 - Note errors stil display as expected
11 - Verify message works on update of existing report and save of new
new report
Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Charles Farmer <charles.farmer@inLibro.com> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Joubu: amended patch to fix alignment
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Mark Tompsett [Sat, 17 Mar 2018 02:24:41 +0000 (02:24 +0000)]
Bug 18797: Make rollingloans test useful
TEST PLAN
---------
1) Run the following commands on a kohadevbox:
kshell
prove -v t/db_dependent/rollingloans.t
exit
-- all the tests were skipped, not useful!
2) Apply this patch
3) Redo step 1
-- all the tests run
4) Run qa test tools
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Marcel de Rooy [Tue, 7 Nov 2017 14:29:56 +0000 (15:29 +0100)]
Bug 19584: Check compare barcodes box when uploading barcodes
This patch makes two trivial changes in the inventory interface:
[1] If you have uploaded a barcode file, the compare barcodes checkbox is
automatically checked. In most cases this will be the option the user wants.
The compare will report missed items on the shelf.
[2] If the compare barcodes checkbox is checked, the Skip items on loan-
checkbox is automatically checked. This again is often desirable. If you
compare, you normally are not interested in seeing items reported missing
while they are checked out.
Test plan:
[1] Upload a barcode file on inventory. Is the compare checked?
[2] Toggle compare. Does 'skip items on loan' change accordingly?
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Grace Smyth <gracesmythh@gmail.com> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Kyle M Hall [Thu, 11 Jan 2018 18:00:31 +0000 (13:00 -0500)]
Bug 19955: Add ability to process only one 'type' of message ( sms, email, etc ) for a given run of process_message_queue.pl
It would be nice to allow emails to be sent overnight, but limit the sending of SMS messages to hours when people are awake. Adding a type limit to process_message_queue.pl would allow this to be accomplished easily.
Signed-off-by: Charles Farmer <charles.farmer@inLibro.com> Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Julian Maurice [Thu, 22 Feb 2018 09:51:27 +0000 (10:51 +0100)]
Bug 20267: Add basic .gitignore
Ignore files generated by ExtUtils::MakeMaker
NOTE: Limited scope does not affect files created
by translation utilities
Signed-off-by: Mark Tompsett <mtompset@hotmail.com> Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
David Bourgault [Tue, 28 Nov 2017 16:23:01 +0000 (11:23 -0500)]
Bug 19708: Improve code for printing the cart in OPAC
This removes a lot of useless code relating to the print function from opac-basket.tt, opac-basket.pl and opac/basket.js.
It also fixes the CSS so that no extra blank page is printed.
To test:
0) Add an item to your cart
1) Print your basket
Note the appearance of the page. There will be an extra blank page.
2) Apply patch
3) Reload basket
4) Print your basket
The appearce should be identical. The extra blank page is gone.
This only affects the OPAC.
Signed-off-by: Tomás Cohen Arazi <tomascohen@theke.io> Signed-off-by: claude <claude.brayer@cea.fr> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Move the hardcoded error strings in the batch label edit into the template,
so they can be translated.
Test plan:
1) Apply patch
2) Go to Home -> Tools -> Label edit
3) Create a new batch with some items in it
4) Try to trigger any of the errors, check that the error
messages look correct
5) Update a language xx-YY
5) Check that the error messages show up in xx-YY-staff-prog.po
Signed-off-by: Pasi Kallinen <pasi.kallinen@joensuu.fi> Signed-off-by: Mark Tompsett <mtompset@hotmail.com> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Changed branch to library in one of the error messages.
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Owen Leonard [Fri, 16 Mar 2018 10:30:30 +0000 (10:30 +0000)]
Bug 20433: Remove unused Mozilla Persona image file
This patch removes an unused image file from the OPAC which was added
when we added Mozilla Persona authentication but wasn't removed when
Mozilla Persona went away.
To test, apply the patch and confirm that the image no longer exists:
Signed-off-by: Mark Tompsett <mtompset@hotmail.com> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Mark Tompsett <mtompset@hotmail.com> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Victor Grousset [Fri, 2 Mar 2018 13:00:04 +0000 (14:00 +0100)]
Bug 19522: Label creator: Batches: make "Export Labels" translatable
Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Simon Pouchol <simon.pouchol@biblibre.com> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Victor Grousset [Fri, 27 Oct 2017 09:51:21 +0000 (11:51 +0200)]
Bug 19522: Label creator: edit batch: make Call number translatable
Test plan:
1. install the fr_FR locale
2. go to /cgi-bin/koha/labels/label-manage.pl?label_element=batch
3. create a batch if there is none
4. edit that batch
5. then you should see "Call number" in the column names
6. apply this patch
7. install the fr_FR locale
8. refresh the page
9. then you should see "Cote" in the column names
Signed-off-by: Simon Pouchol <simon.pouchol@biblibre.com> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Simon Pouchol <simon.pouchol@biblibre.com> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Victor Grousset [Wed, 25 Oct 2017 15:17:21 +0000 (17:17 +0200)]
Bug 19522: Coding style: Replace tabs with spaces
In Label creator: Templates: new/edit form
Signed-off-by: Simon Pouchol <simon.pouchol@biblibre.com> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Simon Pouchol <simon.pouchol@biblibre.com> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Victor Grousset [Wed, 25 Oct 2017 10:07:43 +0000 (12:07 +0200)]
Bug 19522: Coding style: Fix alignement after previous patch
Signed-off-by: Simon Pouchol <simon.pouchol@biblibre.com> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Marcel de Rooy [Thu, 15 Mar 2018 11:37:11 +0000 (12:37 +0100)]
Bug 20422: Fix warning on uri_escape_utf8 in Output.pm
When opac-details calls parametrized_url, it triggers an uninitialized
warning when you would have a record without e.g. author, like:
Use of uninitialized value in subroutine entry at /usr/share/perl5/URI/Escape.pm line 184.
This is (imo) actually a bug in URI::Escape; it should check its args.
But we resolve the warning here by adding the "// q{}" in parametrized_url.
NOTE: Along the way we do something similar in the arrParamsBusc loop.
If the variable is undefined, jump to the next one. (Consistent with the
approach in the if-part preceding it.)
Test plan:
[1] Run t/Output.t again. Should pass now.
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Brendan Gallagher <brendan@bywatersolutions.com> Signed-off-by: Nick Clemens <nick@bywatersolutions.com> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Marcel de Rooy [Thu, 15 Mar 2018 13:07:11 +0000 (14:07 +0100)]
Bug 20422: Add unit test to Output.t for parametrized_url
This test will reveal that we need to resolve a warning too.
Test plan:
[1] Run t/Output.t without the second patch.
[2] The test will fail on the warning raised by an undefined value.
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Brendan Gallagher <brendan@bywatersolutions.com> Signed-off-by: Nick Clemens <nick@bywatersolutions.com> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Jonathan Druart [Wed, 28 Feb 2018 17:26:06 +0000 (14:26 -0300)]
Bug 20298: Fix SMS characters counter when TranslateNotices is set
If you have multiple languages installed, the notices and slips page
uses the same HTML id multiple times, once for each language. This
prevents eg. the SMS character count javascript from working, because
each of the textareas has the same id.
Test plan:
Test the sms characters counter, with and without TranslateNotices
Make sure other features on this page still work correctly
QA: Make sure this change of id did not break something else.
Signed-off-by: Brendan Gallagher <brendan@bywatersolutions.com> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Victor Grousset [Thu, 22 Mar 2018 14:44:00 +0000 (15:44 +0100)]
Bug 20461: Serials: fix ignored params in subscription creation form
In subscription-add.pl, the two params aren't passed to
NewSubscription() but they are to ModSubscription()
== Test plan ==
1. Enable syspref "makePreviousSerialAvailable"
2. Create a minimal subscription with a value in the "Item type" and
"item type for older issues" fields.
3. Edit the subscription
4. You should see that the two fields are empty. This is the bug.
5. Apply this patch
6. Do step 2 and 3
7. You should see that the two fields have the right value
8. Express the joy of a successful and easy sign off.
(this is important, otherwise the sign off spell won't work!)
Bug 20438: Allow uninstalling plugins not implementing the 'uninstall' method
The plugins handling code expects plugins implementing an 'uninstall' method for
cleanup purposes. It executes this method, and then moves on with removing the
configuration entries in the storage, and the plugin itself.
But the 'plugins-home.tt' template makes the tool display the 'Uninstall'
link in the dropdown ONLY when the plugin has the 'uninstall' method.
This patch fixes the issue.
To reproduce:
- Install the KitchenSink plugin [1]
=> SUCCESS: The 'actions' dropdown for KitchenSink shows an 'Uninstall' option
- Edit the code for the plugin:
$ sudo vim /var/lib/koha/kohadev/plugins/Koha/Plugin/Com/ByWaterSolutions/KitchenSink.pm
- Remove the uninstall sub
- Restart everything:
$ restart_all
- Reload the browser
=> FAIL: There's no 'Uninstall' option in the actions dropdown.
- Apply this patch
- Restart everything
$ restart_all
- Reload the browser
=> SUCCESS: The 'actions' dropdown for KitchenSink shows an 'Uninstall' option
- Sign off :-D
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io> Signed-off-by: Mark Tompsett <mtompset@hotmail.com> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
This patch removes [% KOHA_VERSION %] from the <script> tag for some
third-party JavaScript sources. [% KOHA_VERSION %] should only be used
for Koha's JS resources.
To test, apply the patch and enable the SocialNetworks and
NovelistSelect* preferences.
In the OPAC, view the detail page for a bibliographic record. In the
right-hand sidebar you should see social network icons for Google+ and
Twitter. Clicking either of them should trigger a sharing popup window.
If you have Novelist credentials and can enable the feature for the OPAC
you should see Novelist content in the place specified in your
preferences.
If you don't have Novelist credentials, put some random text in the
NovelistSelectProfile system preference. Looking at the detail page in
the OPAC, view source. You should see a link to Novelist JS around line
1020 of the source. Clicking the link should show JavaScript. This
confirms that the path is correct, thus the bug has been fixed.
Note: The QA tool will complain that [% KOHA_VERSION %] is missing. This
is a false positive.
Signed-off-by: Brendan Gallagher <brendan@bywatersolutions.com> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Marcel de Rooy [Thu, 22 Mar 2018 09:36:00 +0000 (10:36 +0100)]
Bug 20459: Correct message for cancelling an article request
We should not ask for 'cancel this hold'. Remove corresponding TODO.
Fix qa warning on old bootstrap style:
btn btn-mini => btn btn-default btn-xs
I removed above change, qa tool complaint is wrong (refers to staff, we
are on opac)
Test plan:
Create an article request and cancel it on opac-user.
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Nick Clemens <nick@bywatersolutions.com> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Katrin Fischer [Fri, 23 Feb 2018 13:29:48 +0000 (14:29 +0100)]
Bug 20067: Fix other checks for linked authorised value categories
The same pattern was used in other files, this patch fixes it.
Signed-off-by: Jesse Maseto <jesse@bywatersolutions.com> Signed-off-by: Nick Clemens <nick@bywatersolutions.com> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Katrin Fischer [Fri, 23 Feb 2018 13:20:17 +0000 (14:20 +0100)]
Bug 20067: Fix false display of authorised value for materials on staff detail page
Koha didn't check for a linked authorised value category for
Koha didn't check for a linked authorised value category for
items.materials correctly which led to displaying false information
on the detail page.
To test:
- before applying the patch:
- make sure sample data and configuration is loaded
- edit any item
- write 2 in the $3 materials specificed
- check the details page normal view - it will display 'restocking'
- apply patch
- check display, it should now show "2"
- link 952$3 (MARC21) to ORDER_CANCELLATION_REASON
- check display again, it should now show 'restocking'
Signed-off-by: Jesse Maseto <jesse@bywatersolutions.com> Signed-off-by: Nick Clemens <nick@bywatersolutions.com> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Fridolin Somers [Wed, 24 Jan 2018 13:23:30 +0000 (14:23 +0100)]
Bug 20085: Better translatability of smart-rules.tt
Template smart-rules.tt in administration contains some if/elsif/else with translatable strings.
For example :
[% IF rule.onshelfholds == 1 %]
Yes
[% ELSIF rule.onshelfholds == 2 %]
If all unavailable
[% ELSE %]
If any unavailable
[% END %]
Adding span to translatable strings will allow to have the same translation than :
<select name="onshelfholds" id="onshelfholds">
<option value="1">Yes</option>
<option value="0">If any unavailable</option>
<option value="2">If all unavailable</option>
</select>
This is important to allow editing an existing circulation and fine rule.
Actually for example in french some strings are translated differently :
msgid "%s Yes %s If all unavailable %s If any unavailable %s"
msgstr "%s Oui %s Si tous indisponibles %s Si aucun indisponible %s"
msgid "If any unavailable"
msgstr "Si au moins un exemplaire est indisponible"
Test plan :
1) Look at PO files, for example fr-FR and see there is :
msgid "%s Yes %s If all unavailable %s If any unavailable %s"
msgid "If any unavailable"
2) Apply patch
3) update PO files
4) Look at PO files, for example fr-FR and see there is now only :
msgid "If any unavailable"
5) Install translation
6) Go to Administration > Circulation and fine rule
7) Check that when editing an existing rule, edition comboboxes are set on the correct value
8) Create a default holds policy by item type and check that correct values are displayed in table
Signed-off-by: Mark Tompsett <mtompset@hotmail.com> Signed-off-by: Nick Clemens <nick@bywatersolutions.com> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Owen Leonard [Fri, 23 Mar 2018 13:02:29 +0000 (13:02 +0000)]
Bug 20299: Koha is a gift
This patch updates the database update script replacing the "pile of
poo" emoji with the "wrapped gift" emoji.
To test, apply the patch and go to Administration -> System preferences
-> Local use. Set the "Version" preference back to trigger a database
update. Go through the database update process and confirm that the
"Convert DB tables to utf8mb4" upgrade message includes a gift emoji.
Signed-off-by: Mason James <mtj@kohaaloha.com> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Jonathan Druart [Tue, 2 Jan 2018 18:42:12 +0000 (15:42 -0300)]
Bug 18593: Move suggestions when bibliographic records are merged
When bibliographic records are merged, the suggestions.biblionumber
field should be replaced with the new record.
Ideally we should have kept an history of the merges, to know what was
the original record. Now we cannot fix the broken links.
Test plan:
1) Create a suggestion in OPAC
2) Accept the suggestion in staff
3) Add order from this suggestion
4) Go to cataloguing search and search for the record and another
5) Merge the suggestion record with the catalog record - catalog record wins (should be the more common case when a patron suggests something that already exists)
6) Verify that after merging, the new title displays in the acquisition record
7) Verify that the suggestion info no longer displays in basket
From Katrin's test plan:
8) Verify that the new title doesn't display in suggestions. The old title will still show as suggested (not updated)
=> This is the title from suggestions.title, I think it makes sense to show this one.
Maybe we should open a new bug report to improve the display of the suggestion, and link to the bibliographic record
Signed-off-by: Lucie Gay <lucie.gay@ens-paris-saclay.fr> Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
The patron variable was only set when no action was defined.
This patch restores the feature the easiest way possible (less changes)
even if it is not the best one.
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>