Commit graph

11208 commits

Author SHA1 Message Date
6dce6f171d Bug 12663: (QA followup)
Insert SCOUserCSS/JS 'after' OPACUserCSS/JS rather than 'instead of'
    i.e. Remove IF/ELSE and use 2 IF

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

Signed-off-by: Brendan Gallagher <bredan@bywatersolutions.com>
2016-04-22 00:57:44 +00:00
e476be5568 Bug 12663 - SCOUserCSS and SCOUserJS ignored on selfcheck login page
Currently if not logged in when browsing to
http://YOURCATALOG/cgi-bin/koha/sco/sco-main.pl
You are redirected to opac-auth.tt and SCOUserCSS and SCOUserJS are not
loaded. This page passes through a parameter to the template to indicate
this is an SCO login and appropriate CSS and JS should be loaded.

Additionally this patch ensure that when loggin in using the form you
are redirected to the sco-main.pl instead of the patron account page for
the user.

To test:
1 - Verify that normal login works on both staff and opac
2 - Verify that SCO link goes to login page if AutoSelfCheckAllowed is
set to "Don't allow"
3 - Enter changes into SCOUserJS and SCOUserCSS and observe these are
present on SCO log in page with AutoSelfCheck disabled
4 - Verify that a logged in opac user without permissions cannot access
the self-checkout module
5 - Verify that AutoSelfCheckAllowed and associated system preferences
function as expected
6 - Verify the AutoSelfCheck user is logged out if they attempt to visit
another page

Followed test plan.
If I go to http://YOURCATALOG/cgi-bin/koha/sco/sco-main.pl, CSS and JS trigger already on
the login form, I suppose that is intended.
Signed-off-by: Marc Véron <veron@veron.ch>

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

Signed-off-by: Brendan Gallagher <bredan@bywatersolutions.com>
2016-04-22 00:57:44 +00:00
a8491dc156 Bug 15930: Make patron searches defaulting on 'contain'
The default patron search types has changed from 'contain' to
start_with. Users consider it as a bug.
This patch revert the previous changes to default on 'contain'.

Test plan:
Search for patrons in different places (guarantor, checkout, patron
module, acquisition module, etc.) and confirm that the default is always
'contain'

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

Signed-off-by: Jesse Weaver <jweaver@bywatersolutions.com>

Signed-off-by: Brendan Gallagher <bredan@bywatersolutions.com>
2016-04-22 00:31:50 +00:00
Julian Maurice
9aa8bf46f6 Bug 14816: Fix multiple selection in item search
Send each selected value as a separate parameter. Otherwise DataTables
(or jQuery ?) joins all values with a comma

Signed-off-by: Owen Leonard <oleonard@myacpl.org>

I could not reproduce the bug when selecting multiple home libraries,
but I could by selecting multiple item types or collection codes. The
patch allowed those queries to complete correctly.

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

Signed-off-by: Brendan Gallagher <bredan@bywatersolutions.com>
2016-04-20 21:00:49 +00:00
9550e37fc6 Bug 15682 - Only allow merging of 2 or more records form lsits (for consistency)
Test as above but on shelves.pl

Signed-off-by: Chris Cormack <chrisc@catalyst.net.z>

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

Signed-off-by: Brendan Gallagher <bredan@bywatersolutions.com>
2016-04-20 20:55:53 +00:00
8f1e5ad95f Bug 15682 - Merging records from cataloguing search only allows to merge 2 records
To test:
1 - Perform a cataloging search
2 - Attempt to merge 0 results - should fail
3 - Attempt to merge 1 resutls - should fail
4 - Attempt to merge 2 results - should succeed
5 - Attempt to merge 3 results - should succeed
6 - Test any other amount of records and if more than 1 it should
succeed

**Note: On shelves.pl you can merge a single record.  I think that is
incorrect so made this only work for 2. Will add a followup to fix
shelves.pl

Signed-off-by: Chris Cormack <chrisc@catalyst.net.z>

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

Signed-off-by: Brendan Gallagher <bredan@bywatersolutions.com>
2016-04-20 20:55:52 +00:00
1931ff4653 Bug 15832: Remove empty string from the filters
On each cell, the split will generate a new empty entry.
This patch removes that entry.

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

Signed-off-by: Brendan Gallagher <bredan@bywatersolutions.com>
2016-04-20 20:41:02 +00:00
Alex Arnaud
82be93af1c Bug 15832 - Fix filter and items split-up in pendingreserves.tt
Test plan:

- Go to circ/pendingreserves.pl (Ensure that there are biblios with many
  items on different branches),
- Check the libraries filter at the bottom of datatable. There should be
  duplicates.
- Apply this patch and return to circ/pendingreserves.pl,
- check that libraries filter should not contain duplicate,
- check that the filter works.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>

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

Signed-off-by: Brendan Gallagher <bredan@bywatersolutions.com>
2016-04-20 20:41:02 +00:00
88e8f60ebc Bug 15883 - Upgrade jQuery from v1.7.2 in the staff client
This patch updates the staff client version of jQuery to 2.2.3. In order
to maintain compatibility with existing scripts, the jQuery migrate
plugin has also been added.

Included is the development version of the jQuery migrate plugin.
Developers could modify doc-head-close.inc to use this version if they
wanted to take advantage of its upgrade warning log.

To test, apply the patch and test JavaScript interactions everywhere in
the staff client.

Signed-off-by: Marc Véron <veron@veron.ch>

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

Signed-off-by: Brendan Gallagher <bredan@bywatersolutions.com>
2016-04-20 20:31:58 +00:00
be33e1b465 Bug 16055: Do not allow basketgroup deletion unless empty
If a basketgroup has basket attached, it should not be deletable.
This patch just removes the Delete button from the interface if it
cannot be deleted.
When editing a basketgroup, the "Delete basket group" button is no
longer displayed.

Test plan:
1/ Create a basketgroup
2/ Attach 1+ baskets to this basketgroup
3/ Confirm you are not able to delete it
4/ Remove the baskets from this basketgroup
5/ Confirm you are able to delete it

Signed-off-by: Owen Leonard <oleonard@myacpl.org>

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

Signed-off-by: Brendan Gallagher <bredan@bywatersolutions.com>
2016-04-20 20:29:13 +00:00
41549bf3f4 Bug 16285 - write_age() function throws error for patron categories that don't include dateofbirth in form
To test:
1 Add a patron in category Library or School
2 Note the js error in the console
3 Apply patch
4 Repeat and note the error is gone

Signed-off-by: Chris Cormack <chrisc@catalyst.net.z>

Made it an explicit if, and fixed the author of the commit

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

Signed-off-by: Brendan Gallagher <bredan@bywatersolutions.com>
2016-04-20 18:36:51 +00:00
fd9f9f9be1 Bug 16227: Fix regression from bug 15084 - select currencies correctly
This patch fixes a regression introduced by bug 15084: The currency
dropdown lists are not correctly built.
The selected currencies are wrong.

Test plan:
Create a vendor, the selected currencies should be the default one
Edit the vendor, the selected currencies should be the ones defined for
 this vendor
Create an order, the selected currency should be the 'List prices' of
 the vendor
Edit an order, the selected currency should be the one defined for this
 order

Signed-off-by: Owen Leonard <oleonard@myacpl.org>

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

Signed-off-by: Brendan Gallagher <bredan@bywatersolutions.com>
2016-04-20 18:35:38 +00:00
8ec54c86fe Bug 16240: (follow-up for 16082) Do not display message if no borrowernumber passed
"This patron does not exist" message should not be displayed on the
"Checkouts home page". The message should only be displayed if the
borrowernumber parameter is passed.

Test plan:
Go on circ/circulation.pl
=> No message
Go on circ/circulation.pl?borrowernumber=424242
=> You should see the message

Signed-off-by: Marc Véron <veron@veron.ch>

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

Signed-off-by: Brendan Gallagher <bredan@bywatersolutions.com>
2016-04-20 17:09:17 +00:00
51e3e31627 Bug 16256 - Can't edit library EAN if you leave EAN empty
Test Plan:
1) Create an empty EAN
2) Edit it and save
3) Note you get a new EAN row
4) Apply this patch
5) Edit the empty EAN again
6) Note you now get an updated EAN and not a new row

Signed-off-by: Chris Cormack <chrisc@catalyst.net.z>

Depends on bug 16208 (which depends on 16206)

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

Signed-off-by: Brendan Gallagher <bredan@bywatersolutions.com>
2016-04-20 16:52:17 +00:00
e89f7a6080 Bug 16208 [QA Followup] - Fix incorrect form parameter names
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>

Signed-off-by: Brendan Gallagher <bredan@bywatersolutions.com>
2016-04-20 16:51:07 +00:00
e1cdef939a Bug 16208 - Can't delete a library EAN if the EAN value is empty
Test Plan:
1) Create an empty EAN
2) Attempt to delete it, you should get an error
3) Apply this patch
4) Attempt to delete the EAN, you should now be able to

Signed-off-by: Chris Cormack <chrisc@catalyst.net.z>

This depends on bug 16206 being pushed, or you need to apply that patch
first

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

https://bugs.koha-community.org/show_bug.cgi?id=16256

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

Signed-off-by: Brendan Gallagher <bredan@bywatersolutions.com>
2016-04-20 16:51:07 +00:00
3156950e0a Bug 16206: Corrections to templates related new EDI feature
There are some issues with the template changes introduced by the EDI
feature in Bug 7736. This patch makes the following changes:

- Use Font Awesome icon on the Acquisitions basket page instead of a
  Glyphicon.
- Use Font Awesome icon on the Acquisitions basket group page instead of
  a Glyphicon.
- For consistency's sake, use the phrase "Library EANs" instead of "EDI
  EANs" in menus and the Library EANs page.

- On the EDI accounts page:
  - Correct the markup of the title tag.
  - Improve the breadcrumbs to eliminate redundancy.
  - Use Font Awesome icon instead of Glyphicon for the "New account"
    button.
  - Change or remove "maxlength" attribute of form fields to match table
    structure.
  - Move the contents of some title attributes into a visible hint.
  - Use 'checked="checked"' instead of 'checked'. Koha templates use
    XTHML-style attributes.
  - Correct template variable in account deletion confirmation dialog.
    Before this patch the vendor name was not correctly displayed.
  - Show a message if there are no accounts defined rather than an empty
    table.
  - Remove use of "highlight" class from table rows (Bug 15927).
  - Correct parameter name in link to vendor details page (should be
    booksellerid instead of supplierid).
  - Correct the markup of the deletion confirmation dialog (Bug 15785).
  - Use Bootstrap-style buttons for "edit" and "delete," with Font
    Awesome icons.

- On the Library EANs page:
  - Correct the markup of the title tag.
  - Make capitalization of "EAN" consistent.
  - Use Font Awesome icon instead of Glyphicon for the "New EAN" button.
  - Show a message if there are no EANs defined rather than an empty
    table.
  - Change or remove "maxlength" attribute of form fields to match table
    structure.
  - Remove use of "highlight" class from table rows (Bug 15927).
  - Correct the markup of the deletion confirmation dialog (Bug 15785).
  - Use Bootstrap-style buttons for "edit" and "delete," with Font
    Awesome icons.

To test, apply the patch and review the affected templates. Confirm that
pages look correct and work correctly.

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
All seems to work and looks well,
add/edit/delete EDI accounts and Library EANs works Ok
No errors

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

Signed-off-by: Brendan Gallagher <bredan@bywatersolutions.com>
2016-04-20 16:49:46 +00:00
Jesse Weaver
22633b5a61 Bug 16237: Allow entering of EDI accounts with plugins disabled
Test plan:
  1. Disable <enable_plugins> in koha-conf.xml (restart memcached if needed).
  2. Open the EDI accounts admin page.
  3. Notice incredible breakage.
  4. Apply patch.
  5. Reload page, should now display (and the "Plugin:" dropdown should
     be hidden).
  6. Re-enable <enable_plugins> (and the UseKohaPlugins syspref as
     well).
  7. Ensure that the "Plugin:" dropdown is once again displayed.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>

Signed-off-by: Brendan Gallagher <bredan@bywatersolutions.com>
2016-04-20 16:46:34 +00:00
d496d03e8a [SIGNED-OFF] Bug 16210: Revert OPAC changes from Bug 15111
This patch reverts the changes made at the OPAC from the following
patches:

Do not include the antiClickjack legacy browser trick for greybox"

Revert "Bug 15111: Do not include the antiClickjack legacy browser trick for greybox"
This reverts commit fc640d2a86.

Revert "Bug 15111: Change X-Frame-Options with SAMEORIGIN"
This reverts commit fb167c0e4b.

Revert "Bug 15111 - Koha is vulnerable to Cross-Frame Scripting (XFS) attacks"
This reverts commit dc03bca76c.

Setting X-Frame-Options to SAMEORIGIN is enough for mordern browsers:
https://developer.mozilla.org/en-US/docs/Web/HTTP/X-Frame-Options

The antiClickjack trick should be removed at the OPAC as we want to keep
the OPAC usable even if the user has disabled JS.
That means the OPAC will be vulnerable to XFS if a user is navigating
with a prehistoric browser:
Firefox 3.6.9 September 2010
IE 8    March 2008
Opera 10.5  March 2010
Safari 4  February 2009
Chrome 4.1.…  somewhen 2010

Test plan:
Confirm that there are no regression of bug 15111 with modern browsers

Signed-off-by: Marc Véron <veron@veron.ch>

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

Signed-off-by: Brendan Gallagher <bredan@bywatersolutions.com>
2016-04-20 16:06:31 +00:00
4b271fad9b Bug 15008 - Add custom HTML areas to circulation and reports home pages
To test:
1 - Apply patch
2 - run updatedatabase.pl
3 - Add some html to the two new prefs IntranetReportsHomeHTML and
IntranetCirculationHomeHTML
4 - View the reports and circulation homepages and confirm your changes
show

Sponsored by Northeast Kansas Library System, NEKLS (http://nekls.org/)

Followed test plan, works as expected.
Signed-off-by: Marc Véron <veron@veron.ch>

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

Signed-off-by: Brendan Gallagher brendan@bywatersolutions.com
2016-04-07 05:38:50 +00:00
Aleisha
928c0af2b6 Bug 15824 - 'Done' button is unclear on batch item modification and deletion
EDIT: Making sure the messages and the buttons show the same text, as per Comment 6.

To test:

MODIFICATION
1) Go to a biblio record page (ie http://localhost:8081/cgi-bin/koha/catalogue/detail.pl?biblionumber=1)
2) Click edit -> Edit items in a batch
3) Click Save (you don't need to make any changes)
4) Validate 'Done' button. Confirm that there is now a link in dialog message box which takes you back to the record detail page.

5) Go to a biblio record page
6) Select one or some or all items in the record
7) Click modify selected items
8) Click Save
9) Validate 'Done' button. Confirm that there is now a link in dialog message box which takes you back to the record detail page.

10) Go to batch item modification (http://localhost:8081/cgi-bin/koha/tools/batchMod.pl)
11) Write some barcodes into the barcode list and click Continue
12) Click Save
13) Validate 'Done' button. Confirm that there is now a link in dialog message box which takes you back to the batch item mod page.

DELETION
14) Go to a biblio record page (ie http://localhost:8081/cgi-bin/koha/catalogue/detail.pl?biblionumber=1)
15) Click edit -> Delete items in a batch
16) Unselect all the items so you don't actually delete them, then click Delete selected items
17) Validate 'Done' button. Confirm that there is now a link in dialog message box which takes you back to the record detail page.

18) Go to a biblio record page
19) Select one or some or all items in the record
20) Click Delete selected items
21) Unselect all the items so you don't actually delete them, then click Delete selected items
22) Validate 'Done' button. Confirm that there is now a link in dialog message box which takes you back to the record detail page.

23) Go to batch item deletion (http://localhost:8081/cgi-bin/koha/tools/batchMod.pl?del=1)
24) Write some barcodes into the barcode list and click Continue
25) Unselect all the items so you don't actually delete them, then click Delete selected items
26) Validate 'Done' button. Confirm that there is now a link in dialog message box which takes you back to the batch item deletion page.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>

Followed test plan, works as expected.
Signed-off-by: Marc Véron <veron@veron.ch>

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

Signed-off-by: Brendan Gallagher brendan@bywatersolutions.com
2016-04-07 05:37:58 +00:00
b64e6be1c4 Bug 16157: Move the selected flag from GetAuthorisedValues to the templates
From C4::Koha::GetAuthorisedValues

    # TODO: the "selected" feature should be replaced by a utility function
    # somewhere else, it doesn't belong in here. For starters it makes
    # caching much more complicated. Or just let the UI logic handle it, it's
    # what it's for.

Indeed, it's not a job for a subroutine, the template should take care of that.
Note that a perf gain could be won with this patch \o/

Test plan:
- Edit an itemtype and check the value of the "Search category" dropdown list
- Edit a patron attribute type and check the value of the "Class" dropdown list
- Detail for a catalogue record, the Status column should be correctly
  populated if items are damaged and/or lost
- Item details for a catalogue record, the lost, damaged and withdrawn
  value should be correctly displayed
- Edit a patron, the "street type" should be correctly selected
- Create a patron attribute type linked to an authorised value list.
- Edit a patron, set a value for this attribute, edit it again. The
  correct value should be selected.
- Search for subscriptions. The 'Location' dropdown list should behave
  correctly (select the entry you have choosen before, etc.)
- Edit a subscription, the location dropdown list should select the
  correct value.
- Edit and view a suggestion with a 'reason for suggestion' set (you
  should have at least 1 OPAC_SUG AV defined)

Followed test plan, works as expected
Signed-off-by: Marc Véron <veron@veron.ch>

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

Signed-off-by: Brendan Gallagher brendan@bywatersolutions.com
2016-04-07 00:16:09 +00:00
Aleisha
efff8e5143 Bug 16162: Making dictionary 'Delete' a button
EDIT: This patch should have gotten rid of those tabs
EDIT2: Will now apply with patch on Bug 16161

To test:
1) Apply Bug 16161 first
2) Go to Reports -> View dictionary
3) Confirm that the 'Delete definition' button now just says 'Delete' and is styled as a font awesome button.
4) Confirm that the button does not wrap on narrower browsers.
5) Confirm that column heading is now 'Action'.
6) Confirm that button deletes as expected. (If you're wondering about the missing confirm message upon delete, see Bug 16161.)

Sponsored-by: Catalyst IT

Tested on top of Bug 16161
Signed-off-by: Marc Véron <veron@veron.ch>

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

Signed-off-by: Brendan Gallagher brendan@bywatersolutions.com
2016-04-07 00:09:53 +00:00
Aleisha
6ffb20f728 Bug 16161: Confirm message when deleting definition
To test:

1) Go to Reports -> View dictionary
2) Attempt to delete definiton. Confirm that a confirm messages comes up and works as expected.

Sponsored-by: Catalyst IT

NOTE: confirmation message didn't exist before patch.
      confirmation message appeared after patch.
      both options worked as expected.

Signed-off-by: Mark Tompsett <mtompset@hotmail.com>

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

Signed-off-by: Brendan Gallagher brendan@bywatersolutions.com
2016-04-07 00:09:08 +00:00
Aleisha
57cf173c0c Bug 16164: Making check expiration actions buttons
EDIT: Using same font awesome icon for 'Renew' as in other places

To test:
1) Go to Serials -> Check expiration
2) Put in a date where one or more subscriptions will expire prior to this date
3) Confirm that column heading is now 'Actions'
4) Confirm that Edit and Renew now show as font awesome buttons
5) Confirm that the buttons don't wrap on narrower browsers
6) Confirm the buttons still work as expected

Sponsored-by: Catalyst IT

Signed-off-by: Marc Véron <veron@veron.ch>

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

Signed-off-by: Brendan Gallagher brendan@bywatersolutions.com
2016-04-07 00:05:43 +00:00
Aleisha
dde8856754 Bug 16183: Confirm message upon deleting patron messages
To test:
1) Go to a patron circulation page and add a message
2) Click '[Delete]'
3) Confirm that a confirm dialog shows up and 'Cancel' and 'OK' do what
   is expected.

Sponsored-by: Catalyst IT
Signed-off-by: Owen Leonard <oleonard@myacpl.org>

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

Signed-off-by: Brendan Gallagher brendan@bywatersolutions.com
2016-04-07 00:02:09 +00:00
Aleisha
94d0ed6115 Bug 16193: Typo in Automatic item modifications by age
To test:
1) Go to Tools -> Automatic item modifications by age
2) Click Edit
3) Add a rule if you have none, otherwise notice button 'Submit theses
   rules' and typo (theses)
4) Apply patch, refresh page
5) Confirm button now says 'Submit these rules' (typo is fixed)

Sponsored-by: Catalyst IT
Signed-off-by: Owen Leonard <oleonard@myacpl.org>

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

Signed-off-by: Brendan Gallagher brendan@bywatersolutions.com
2016-04-07 00:00:44 +00:00
5ecdd8c6a3 Bug 16205 - MARC editor settings menu should use a Font Awesome icon
When I added the MARC editor settings menu in Bug 15859 I accidentally
used a Glyphicon. This patch corrects it to use a Font Awesome icon.

To test, apply the patch and open the basic cataloging editor. The
"Settings" menu should use a Font Awesome icon instead of a Glyphicon.

Signed-off-by: Hector Castro <hector.hecaxmmx@gmail.com>
Icons changed
Signed-off-by: Tomas Cohen Arazi <tomascohen@unc.edu.ar>
Works as expected, no qa errors

Signed-off-by: Brendan Gallagher brendan@bywatersolutions.com
2016-04-06 23:58:05 +00:00
e4d0363bc7 Bug 15928 - Show unlinked guarantor
To test:
1 - Add guarantor data to patron account by typing it in but do not 'Set to patron'
2 - Note it is not displayed on patron details
3 - Apply patch
4 - Note the info is displayed
5 - Test that linked guarantors show as expected

Signed-off-by: Marc Véron <veron@veron.ch>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Amended-patch: Correct some indents/spaces

Signed-off-by: Brendan Gallagher brendan@bywatersolutions.com
2016-04-06 23:50:33 +00:00
Alex Arnaud
c2f92f68d8 Bug 16171 - Show many media in html5media tabs
Signed-off-by: Mirko Tietgen <mirko@abunchofthings.net>

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

Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
2016-04-06 22:11:32 +00:00
Julian Maurice
e916ded097 Bug 16214: Fix typo 'To.jon' -> 'To.json'
Bug 15722 introduces a regression in serials patron search results,
causing the surname to not be displayed

To reproduce:
1. Create a routing list for a subscription
2. Click on "Add recipients" button
3. Run a search
4. Check that surname is not displayed

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

Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
2016-04-06 22:09:09 +00:00
22a33b7868 Bug 16215: Missing closing quote in checkout template
This patch adds a missing closing quote to the circulation template.

To see the affect of this bug:

- Log in to Koha with an account which does not have the
  'force_checkout' permission.
- Locate a barcode which is checked out to a patron.
- Open a different patron account for checkout.
- Try to check out the barcode to that different patron.

You see a "Cannot check out" dialog which breaks the structure of the
rest of the page.

To test, apply the patch and repeat the steps above. The issue should be
fixed.

Signed-off-by: Hector Castro <hector.hecaxmmx@gmail.com>
Works as advertised

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

Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
2016-04-06 22:00:59 +00:00
7e1b0c25cd Bug 7736: (QA followup) Add missing body id and class
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>

Signed-off-by: Brendan Gallagher brendan@bywatersolutions.com
2016-04-04 20:43:01 +00:00
fb0d0ddf39 Bug 15630 - Make Edifact module pluggable
Koha's EDIFACT module works great for many European vendors,
but does not work will for US vendors, which have a much different
interpretation of 'standard'. In fact, each vendor may require
different arrangements of values in EDIFACT messages. It would be
impossible to encompass all these requirements within Koha's EDIFACT
module itself. Instead, we should allow the module to be pluggable, so
versions of the module can be developed for vendors that require EDIFACT
messages that don't conform to the standard set by Koha's EDIFACT
module.

Test Plan:
1) Apply this patch
2) Run updatedatabase
3) Enable Koha plugins
4) Install the Edifact stub plugin available at
   https://github.com/bywatersolutions/koha-plugin-edifact-stub
5) Edit the EDI Vendor account, assign the plugin to a Vendor EDI account
6) Test EDI functionality ( ORDER, INVOICE ), there should be no errors
   or changes to the EDIFACT message input or output

Signed-off-by: Jason DeShaw <JDeShaw@cityoffargo.com>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
2016-04-01 21:31:28 +00:00
Brendan A Gallagher
5182400859 Bug 7736 - RM followup fixing/removing </title> on .tt
Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
2016-04-01 21:20:56 +00:00
07e098ef67 Bug 7736 [QA Followup] - Fix SQL, Add description field for Library EANs
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>

Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
2016-04-01 20:03:18 +00:00
c2ec238d9f Bug 7736 [QA Followup] - Fix column headers, values and spelling
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>

Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
2016-04-01 20:03:18 +00:00
Colin Campbell
e2e9916348 Bug 7736: Support Ordering via Edifact EDI messages
Add support for processing incoming Edifact Quotes, Invoices
and order responses and generating and transmission of
Edifact Orders.
Basic workflow is that an incoming quote generates an aquisition
basket in Koha, with each line corresponding to an order record

The user can then generate an edifact order from this (or another)
basket, which is transferred to the vendor's site

The supplier generates an invoice on despatch and this will
result in corresponding invoices being generated in Koha
The orderlines on the invoice are receipted automatically.

We also support order response messages. This may include
simple order acknowledgements, supplier reports/amendments
on availability. Cancellation messages cause the koha order
to be cancelled, other messages are recorded against the order

Which messages are to be supported/processed is specifiable on a
vendor by vendor basis via the admin screens

You can also specify auto order i.e. to generate orders from quotes
without user intervention - This reflects existing
workflows where most work is done on the suppliers website
then generating a dummy quote

Received messages are stored in the edifact_messages table
and the original can be viewed via the online

Database changes are in installer/data/mysql/atomicchanges/edifact.sql
Note new perl dependencies:
    Net::SFTP:Foreign
    Text::Unidecode

Signed-off-by: Paul Johnson <p.johnson@staffs.ac.uk>

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

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>

Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
2016-04-01 20:03:17 +00:00
Katrin Fischer
b11d2f43f9 Bug 10612: Follow-up - correcting icon to be Font Awesome
- check print icon on the patron list summary page is correct

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

Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
2016-04-01 19:52:14 +00:00
621742d4c6 Bug 10612 [Follow-up] Combine and clarify menu items
This follow-up patch for Bug 10612 moves all list operations into one
menu while (hopefully) clarifying the labels for each.

Also in this patch: Changed datatables sorting configuration to use the
"nosort" attribute.

To test, apply the patch and go to Tools -> Patron lists.

- On a patron list with no patrons, confirm that the "Actions"
  menu lists "Add patrons," "Edit list," and "Delete list."
- On a patron list containing one or more patrons, confirm that the
  "Actions" menu /also/ has these options: "Print patron cards," "Batch
  edit patrons," and "Batch delete patrons."
- Confirm that the "actions" column is not sortable.
- Test logging in as a user who has various combinations of permission
  to batch edit and batch delete.

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

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

Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
2016-04-01 19:52:13 +00:00
7f9d5b27ae Bug 10612 - Add ability to delete patrons with batch patron deletion tool
This patch adds the ability to select a patron list for deletetion
when using the Batch patron deletion/anonymization tool. It also adds
buttons to the the patron lists table to access both the batch deletion
and batch modification directly from the lists view.

This is a squash of previous patches but now adds a patron_list_id
parameter to C4::Members::GetBorrowersToExpunge and uses that routine to
fetch patrons from a list.

Test Plan:
1) Apply this patch
2) Create a list of patrons with the new Patron Lists feature
3) Try using the batch edit link form the lists table
4) Try using the batch delete link from the lists table
5) Verify previous functionality has not changed

Signed-off-by: Owen Leonard <oleonard@myacpl.org>

Patron batches are correctly passed to the edit and delete pages.

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

Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
2016-04-01 19:52:13 +00:00
Mark Tompsett
e22e5c74af Bug 10988: Tabs vs Spaces qa failure patch
Run Koha QA Test tools and discovered this failed because of tabs.
Rather than fail this and wait forever for it to get fixed, this
patches it, and I'll mark it as signed off anyways.

Signed-off-by: Mark Tompsett <mtompset@hotmail.com>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
2016-04-01 19:25:36 +00:00
Nicholas van Oudtshoorn
722a098eac Bug 10988 - Fixes for comments 57 and 58
Test Plan (remains the same):
     0) Back up your database
     1) Apply all these patches
     2) In your mysql client use your Koha database and execute:
        > DELETE FROM systempreferences;
        > SOURCE ~/kohaclone/installer/data/mysql/sysprefs.sql;
        -- Should be no errors.
        > SELECT * FROM systempreferences LIKE 'GoogleO%';
        -- Should see 4 entries.
        > QUIT;
     3) Restore your database
     4) Run ./installer/data/mysql/updatedatabase.pl;
     5) In your mysql client use your Koha database and execute:
        > SELECT * FROM systempreferences LIKE 'GoogleO%';
        -- Should see the same 4 entries.
     6) Log into the staff client
     7) Home -> Koha administration -> Global system preferences
     8) -> OPAC
        -- make sure your OPACBaseURL is set (e.g. https://opac.koha.ca)
     9) -> Administration
        -- There should be a 'Google OAuth2' section with the ability
           to set those 4 system preferences.
    10) In a new tab, go to https://console.developers.google.com/project
    11) Click 'Create Project'
    12) Type in a project name that won't freak users out, like your
        library name (e.g. South Pole Library).
    13) Click the 'Create' button.
    14) Click the 'APIs & auth' in the left frame.
    15) Click 'Credentials'
    16) Click 'Create new Client ID'
    17) Select 'Web application' and click 'Configure consent screen'.
    18) Select the Email Address.
    19) Put it a meaningful string into the Product Name
        (e.g. South Pole Library Authentication)
    20) Fill in the other fields as desired (or not)
    21) Click 'Save'
    22) Change the 'AUTHORIZED JAVASCRIPT ORIGINS' to your OPACBaseURL.
        (http://library.yourDNS.org)
    23) Change the 'AUTHORIZED REDIRECT URIS' to point to the new
        googleoauth2 script
        (http://library.yourDNS.org/cgi-bin/koha/svc/auth/googleopenidconnect)
    24) Click 'Create Client ID'
    25) Copy and paste the 'CLIENT ID' into the GoogleOAuth2ClientID
        system preference.
    26) Copy and paste the 'CLIENT SECRET' into the GoogleOAuth2ClientSecret
        system preference.
    27) Change the GoogleOpenIDConnect preference to 'Use'.
    28) Click 'Save all Administration preferences'
    29) In the OPAC, click 'Log in to your account'.
        -- You should get a confirmation request, if you are
            already logged in, OR a login screen if you are not.
        -- You need to have the primary email address set to one
           authenticated by Google in order to log in.
    30) Run koha qa test tools

Signed-off-by: Mark Tompsett <mtompset@hotmail.com>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
2016-04-01 19:25:35 +00:00
73b3968dce Bug 16178: Fix tests for xt/single_quotes.t
Caused by
  commit 9c5c1bc9f1
    Bug 15206: Make strings translatable

Test plan:
  prove xt/single_quotes.t
should return green

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

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>

Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
2016-04-01 19:05:58 +00:00
Katrin Fischer
4a605225cc Bug 14257: Follow-up - Add documentation, fix typo, fix test
- t/db_dependent/ILSDI_Services.t was failing for me as I had
  issues in my database, fixed with another delete line
- QA tools found a typo - comparision
- Added documentation of the new parameter to the ilsdi.pl page

Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
2016-03-31 20:31:06 +00:00
6167cf0128 Bug 15931: Replace relative path with /cgi-bin/koha/
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
2016-03-31 20:20:26 +00:00
Aleisha
19f9673a3b Bug 15931: Removing link to records if authority is not used by any records
EDIT:
Fixing typo: records(s) -> record(s)
On details page, if authority is not used in any records, the page will display a more used friendly message: "This authority is not used in any records."

To test:
1) Do an authority search on authorities-home.pl. Notice that authorities not used in any records have a clickable link (under 'Used in:' column) which redirects to a catalog search with no results
2) Go back to your authority search results on authorities-home.pl and click 'Details'. Notice that under the auth name, there is a 'Used in X records' link that again returns a catalog search with no results.
3) Apply patch
4) Repeat steps 1, 2. Authorities not used in any records should no longer have clickable links and links to authorities which are used in records should work as expected.
5) Confirm it now says record(s) instead of records(s)
6) Confirm that on detail page for an authority which is not used by any records, it now says more friendly message.

Sponsored-by: Catalyst IT

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
Signed-off-by: Marc Véron <veron@veron.ch>

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

Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
2016-03-31 20:20:26 +00:00
Aleisha
09c7a9c3af Bug 16058: Delete individual news item from koha-news.pl
This patch adds a confirm message for deleting a news item from the home page in the staff client. It also gives the ability to delete an individual news item from koha-news.pl with a confirm message. The buttons on koha-news.pl are now styled as font awesome buttons.

To test:
1) Go to main intranet page. Click 'Delete' for a news item.
2) Confirm that Cancel stops the Delete, and OK deletes the item and takes you to tools/koha-news.pl
3) Confirm that the buttons (Edit and Delete) on koha-news.pl are now styled as font awesome buttons and the buttons don't wrap on a narrow browser.
4) Confirm that the column heading for the buttons is now "Actions".
5) Confirm that clicking Delete triggers a confirm message. Confirm that Cancel stops the Delete, and OK deletes the item and it no longer shows in the News table or anywhere else.

Sponsored-by: Catalyst IT

Signed-off-by: Marc Véron <veron@veron.ch>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Amended-patch: just split the td on several lines for readability.

Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
2016-03-31 20:08:17 +00:00
Hector Castro
d995613eaf Bug 16092: Fix error dialog and introduce the Font Awesome icons when delete a branch category
Also change admin/branch.pl   type => 'error' to type => 'alert' to fit
with wiki <https://wiki.koha-community.org/wiki/Interface_patterns#Errors_and_messages>

To test:
1) Go to Admin -> Libraries and groups
2) Try to delete a library with patrons and bib items
3) See the error message in yellow
4) Try to delete a branch category/group without any library attached
   to it
5) Apply patch and repeat steps 1 to 4. Notice about the changes
6) Test buttons Yes, delete and No, do not delete and verify that they
   work as expected

Signed-off-by: Marc Véron <veron@veron.ch>

NOTE: Patch rebased and reword title according with QA comment 4

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

Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
2016-03-31 19:36:13 +00:00
Aleisha
f321e68c39 Bug 16153: Adding "actions" class to Label Creator table actions so the buttons dont wrap
To test:
1) Go to Tools -> Label Creator
2) Confirm that the actions column for the table on each management page (Manage label batches, Manage layouts, Manage label templates, Manage printer profiles) does not wrap on narrow browser windows.

Sponsored-by: Catalyst IT
Signed-off-by: Marc Véron <veron@veron.ch>

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

Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
2016-03-31 19:29:40 +00:00