Commit Graph

26741 Commits

Author SHA1 Message Date
Marc Véron dc6ea8d5c9 Bug 16857 - patron-attr-types.tt: Get rid of warnings "Argument "" isn't numeric"
To vrify:
- Go to Home > Administration > Patron attribute types
- Make sure you have some patron attribute types with no branches limitation
- For each attribute type you get a warning in intranet-error.log:
patron-attr-types.pl: Argument "" isn't numeric in numeric gt (>) at (...)/koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tt line 284.

To test:
- Appy patch
- Verify that warnings no longer appear in intranet-error.log

Signed-off-by: Srdjan <srdjan@catalyst.net.nz>

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

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit abb7980004)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2016-08-01 10:48:17 +02:00
Magnus Enger 3f3c78865a Bug 16823 - Comment out koha-rebuild-zebra in koha-common.cron.d
Bug 16190 enabled the indexer daemon by default for package installations.
This means that it is no longer necessary to set up koha-rebuild-zebra as
a cron job. This patch comments it out, so that people who might run into
bug 16814 can easily activate the cronjob again after de-activating the
indexer daemon.

To test:
Just read the diff and check that it makes sense.

Signed-off-by: Srdjan <srdjan@catalyst.net.nz>

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

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 666397446f)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2016-08-01 10:47:58 +02:00
Hector Castro 1d29e0488c Bug 16803: Add Font Awesome Icons to "Select/Clear all" links to shelves.tt
Add Font Awesome Icons to "Select/Clear all" links to shelves.tt
(Public and private lists)

To test:
-Apply patch
-Go to More -> Lists
-Create some Public and Private Lists
-See the contents of the list and notice about the new icons in
 "Select/Clear  all"

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

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

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 3c80818f68)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2016-08-01 10:47:20 +02:00
Marc Véron ecc37f0f57 Bug 16795 - Patron categories: Accept integers only for enrolment period and age limits
To test:
- Apply patch
- Clear browser cache
- Go to Home > Administration > Patron categories
- Create or edit a category
- Verify that field 'In months', 'Age required' and 'Upperage limit'
  accept digits only

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

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

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit e3002eea20)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2016-08-01 10:47:03 +02:00
Jonathan Druart aa680d86dd Bug 16794: Group the 2 action buttons into the same column
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 9b399a8061)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2016-08-01 10:46:33 +02:00
Hector Castro de9b8b1cd1 Bug 16794: Revise layout for Admistration > Patron categories
Add Bootstrap buttons and Font Awesome Icons to "Delete" and "Edit" links

To test
- Go to Administration -> Patron categories
 - Confirm that two button appear instead of links for "Edit" and "Delete"
 - Edit an existing category and confirm that works as expected
 - Delete a category and confirm that works properly.

Patch fix it according with QA comment 3
Fix copy and paste according with QA comment 6
Fix column "Default privacy" to be sorted again according with comment 8
Patch set squashed

Buttons appear now as requested in comment #3 (2 buttons, no action menu)

Re-tested, 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: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit a50eb52a42)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2016-08-01 10:46:10 +02:00
Hector Castro 80d4fef0c5 Bug 16781: Add Font Awesome Icons to "Select/Clear all" links to modborrows.tt and result.tt
Add Font Awesome Icons to "Select/Clear all" links to:
modborrows.tt (Batch patron modification) and result.tt (Search results)

To test:

-Apply on top bugs 16469 and 16494
-Goto Batch patron modification
-Create a new batch patron or select one patron list
-See the new icons for "Select all" and "Clear all"
-Do a search and see the new icons in Search results page

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

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

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 68c0c94b94)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2016-08-01 10:45:39 +02:00
Hector Castro ad4ceadaf4 Bug 16793: Use Font Awesome for arrows instead of images in audio_alerts.tt
This changes fit with bug 16148 for marc modification template management

To test
-Apply patch
-Goto Admin->Audio alerts
-Verify that green arrows have disappeared now
 in blue Awesome Icons

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

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

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

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 90da601783)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2016-08-01 10:45:25 +02:00
Marc Véron a6c80d1a0f Bug 16779: Move road type after address in US style address formatting (main address)
To verify:
- Create a patron with address, streettype, streetnumber defined
- Set syspref 'AddressFormat' to US style
- Go to patron's detail page (in staff client)
- In main address, road type preceeds address (e.g. 25 Drive Euclid)

To test:
- Apply patch
- Refrexh patron's detail page
- Verify that main address displays correctly (e.g. 25 Euclid Drive)

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

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

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit eb77861750)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2016-08-01 10:44:58 +02:00
Claire Gravely ac83809da7 Bug 15929 - typo in explanation for MaxSearchResultsItemsPerRecordStatusCheck
There's a typo in the explanation for the new
MaxSearchResultsItemsPerRecordStatusCheck  sys pref that was added in 3.22.2.

"If a record has more than this number of items, they availability statuses
..."

I have re-worded the description so it reads a bit better.

Test plan:
1. Check the description for syspref MaxSearchResultsItemsPerRecordStatusCheck.
2. Apply patch
3. Check syspref MaxSearchResultsItemsPerRecordStatusCheck description
 to make sure it makes sense.

Signed-off-by: Mirko Tietgen <mirko@abunchofthings.net>

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

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit cae7e29cf2)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2016-08-01 10:44:14 +02:00
Mark Tompsett 5129b29b02 Bug 16869: Silence and catch warnings in t/db_dependent/SuggestionEngine_ExplodedTerms.t
By properly defining a opachtdocs (intranethtdocs was done too)
in the mock function, uninitialized variable warnings are
eliminated. Given that we can check if $KOHA_CONF is defined or
not, we can catch the warning as part of testing, so the output
of the test is cleaner.

TEST PLAN
---------
1) unset KOHA_CONF
2) prove t/db_dependent/SuggestionEngine_ExplodedTerms.t
   -- lots of noise
3) apply patch
4) prove t/db_dependent/SuggestionEngine_ExplodedTerms.t
   -- no noise
5) prove -v t/db_dependent/SuggestionEngine_ExplodedTerms.t
   -- see the warnings were caught and not just ignored.
6) run koha qa test tools

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

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

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 5ec641fbbb)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2016-08-01 10:43:57 +02:00
Marc Véron 6f5b5a2cb0 Bug 16562 - Translatability: Issue in opac-user.tt (separated word 'item')
Alternate patch with wording as proposed in comment #12

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

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 5f147cc6bb)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2016-08-01 10:43:19 +02:00
Nick Clemens 66250c1df6 Bug 16807 - Use Koha::BiblioFrameworks instead of GetFrameWorkLoop
Refactor code to use work from 14889

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

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 10d4d2fd31)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2016-08-01 10:43:05 +02:00
Nick Clemens 9c4576cb93 Bug 16807: Frameworks unordered in dropdown when adding/editing a biblio
To test:
Start to add or edit a biblio
Open the dropdown to change framework
Notice the order
Refresh the page - notice the order changes
Apply patch
Order is alphabetical
Refresh the page
Order does not change

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

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

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit d17085ea03)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2016-08-01 10:42:46 +02:00
Marc Véron 82bbaf5212 Bug 16774: Format date on 'Transfers to receive' page to dateformat system preference
To test:
- Apply patch
- Go to Home > Circulation > Transfers to receive
- Verify that in title (Transfer made to your library as of...) is
  is formatted as defined in syspref dateformat

Additionaly, the patch changes page title and breadcrumb from:
Home > Circulation > Transfers to your library
to:
Home > Circulation > Transfers to receive
...to make them consistent with the link text on the Circulation home page
   (Transfers to receive)

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

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

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 11dc97cfae)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2016-08-01 10:42:08 +02:00
Owen Leonard f07737744a Bug 16600 - Remove some obsolete references to Greybox in some templates
This patch removes unused Greybox markup from two templates.

To test, apply the patch and go to Authorities.

- Perform an authority search which will return multiple results.
- Select two records to merge.
- On the "merging records" page, an earlier version used Greybox to show
  a preview of the selected authority records. Confirm that authority
  number link for the two records triggers a pop-up window instead.

- From the authorities home page, choose 'New from Z39.50'
- Perform a search which will return multiple results.
- Confirm that there is only a 'MARC' preview link. A
  forever-commented-out 'Card' link has been removed.

Signed-off-by: Hector Castro <hector.hecaxmmx@gmail.com>
Works as advertised. Obsolete comment on 'Card' removed

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

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit b6ccd8366d)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2016-08-01 10:41:35 +02:00
Bouzid Fergani 57a727afa5 Bug 15636 - DataTables Warning: Requested unknown parameter from opac-detail.tt
Signed-off-by: Srdjan <srdjan@catalyst.net.nz>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
This patch adds the same tests in the aoColumns DT definition than the
ones in the creation of the table. That's sound good.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit a12d3d1bfa)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2016-08-01 10:41:13 +02:00
Marcel de Rooy 58de933e03 Bug 16859: Fix wrong item field name in export.pl
Field callnumber should be itemcallnumber.
For completeness, prefixing the joined fields with items table prefix.

Note: You should expect Tools/Export to export only the items within a
given itemcallnumber range, but if the biblio has one item in that
range, the biblionumber is selected for export with ALL items. The script
is designed that way (first select biblio numbers based on criteria, and
run export with those biblio numbers).

Test plan:
[1] Select a biblio N with one item with say itemcallnumber X.
[2] Goto Tools/Export. Select biblio range N,N and no itemcallnumber
    range. The biblio should be exported.
[3] Select biblio range N,N and itemcallnumber range A,B. No output.
[4] Select biblio range N,N and itemcallnumber range A,<empty>. Output.
[5] Select biblio range N,N and itemcallnumber range <empty>,X. Output.

Signed-off-by: Srdjan <srdjan@catalyst.net.nz>

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

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 00960f1964)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2016-08-01 10:40:45 +02:00
Nick Clemens 0b40c96d2d Bug 16855 - Poor performance due to high overhead of SQL call in export.pl
This patch eliminates all columns retrieved in the biblioitems query
except for biblionumber.

To test:
1 - Go to tools->Export data
2 - Export using various filters and note you get expected records
3 - Apply patch
4 - Ensure exported results match results before patch

Signed-off-by: Srdjan <srdjan@catalyst.net.nz>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit a44bb07b88)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2016-08-01 10:40:14 +02:00
Marc Véron e9840ac795 Bug 16854: request.tt: Logic to display messages broken
This patch fixes broken logic in
koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt

To verify, see initial comment.

To test:
- Apply patch
- Have a patron with a restricion and with outstanding fines
  greater than defined in syspref 'maxoutstanding'
- Place a hold for this patron and verify, that messages
  'Patron has restrictions' and 'Patron has outstanding fines...'
  appear

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

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

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 44092cbafd)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2016-08-01 10:39:40 +02:00
Kyle M Hall e0b29cea2a Bug 16780 - Specify due date always sets time as AM when using 12 hour time format
This regression is occurs because the time format for the checkout
date/time widget is only meant to be given in 24 hour format. The time
due should not be converted to 12 hr time even if the library has 12
hour set as their preferred time format.

Test Plan:
1) Performat a backdated checkout with a date due that has a PM time
2) Note the date/time picker on the confirmition screen shows the time
   in AM/PM
2) Note the time is not stored correctly
3) Apply this patch
4) Repeate step 1
5) Note the confirmation date/time picker now show the time in 24hr
   format
6) Note the time was stored correctly

Signed-off-by: Claire Gravely <c.gravely@arts.ac.uk>

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

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 7c89f78f3b)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2016-08-01 10:39:00 +02:00
Owen Leonard 071ce5aa26 Bug 16762: Record matching rules: Remove match check link removes too much
My patch for Bug 5006 introduced a lot of markup changes to the record
matching rules template. I missed a change in one are though, which
caused a bug with the way the 'Remove match check' link works.

To reproduce:

- Go to Administration -> Record matching rules.
- Edit a matching rule which includes at least one match check.
- Click a 'Remove match check' link. The entire "Required match checks"
  block is removed.

To test, apply the patch and repeat the steps above. Clicking any
'Remove match check' link should remove only the corresponding rule.

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

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

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit ffcb360321)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2016-08-01 10:38:36 +02:00
Galen Charlton 01b0fe1aa8 Bug 16760: fix Circulation Statistics wizard under Plack
This patch fixes some variable scoping problems when running
the circulation statistics wizard under Plack.  For example,
when using the item type as a row header, with this patch the
item type description is displayed rather than "UKNOWN VALUE".

This patch also enables warnings and fixes a couple variable
initialization issues. (Note that turning on warnings across
the board would make it easier to identify Plack variable scoping
issues, as "Variable "$foo" is not available at' errors would
be recorded in the Plack error log).

To test
-------
[1] Run the staff interface under Plack.
[2] Go to the Circulation Statistics Wizard and run a report
    using item type as the row. Note that the row labels
    display as "UNKNOWN VALUE" rather than the item type.
[3] Apply the patch and restart Plack.
[4] Run step #2 again; this time, the item type descriptions should
    be used as the row labels.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>

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

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 8ca55a7fb3)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2016-08-01 10:37:35 +02:00
Marcel de Rooy c575ed3f20 Bug 16671: [QA Follow-up] Replace remaining itemtype lines
Instead of relying on existing data, we use new TestBuilder recs.

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

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit c7596a4894)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2016-08-01 10:37:17 +02:00
Marcel de Rooy 71e73f5a44 Bug 16671: [QA Follow-up] Add new itemtype and remove bailout
No need to bail out, if we are using TestBuilder.
Somehow, this test passes with me if we add a new record, and if
we do not, it fails (using BK as the first itemtype with notforloan
is 0).

Looking further, we should imo remove the Koha::ItemTypes searches
here and not depend on existing data. Just add some item types.

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit eddc0a0e0a)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2016-08-01 10:37:05 +02:00
Jonathan Druart 4b2804dce1 Bug 16671: (bug 14828 follow-up) Pick the right itemtypes
Looking at commit aafe73eefb
  Bug 14828: Use Koha::ItemType[s] everywhere C4::ItemType was used
-my @item_types = C4::ItemType->all;
-my @for_loan = grep { $_->{notforloan} == 0 } @item_types
-  or BAIL_OUT("No adequate itemtype");
-my $itemtype = $for_loan[0]->{itemtype};
+my $itemtype = Koha::ItemTypes->search({ notforloan => 1 })->next;
+$itemtype or BAIL_OUT("No adequate itemtype"); #FIXME Should be $itemtype = $itemtype->itemtype

It seems that the tests expect itemtypes for loan.

Test plan:
  prove t/db_dependent/HoldsQueue.t
should still return green

Signed-off-by: Hector Castro <hector.hecaxmmx@gmail.com>
Works as advertised. No qa test tool errors

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

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 8f42c681b0)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2016-08-01 10:36:42 +02:00
Jonathan Druart 7c68f51d13 Bug 16459: Add patron to a patron card requires catalogue permission
Currently, serials => 'routing' is required, which does not make any
sense.
It's a copy/paste error when this file has been created (you can blame
me).

Note that I am not sure catalogue is the correct permission, but it's
the one used almost everywhere in this module

Test plan:
Confirm that catalogue is enough to search for patrons to add to a
patron card.

Signed-off-by: Srdjan <srdjan@catalyst.net.nz>

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

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 3bb51d0386)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2016-08-01 10:35:22 +02:00
Jonathan Druart 39838698a1 Bug 16431: Use Koha::Cache to cache marc subfield structure
The marc subfield structure is currently cached using a global variable
of C4::Context. The infos are retrieved every time a new context is
created.
This patch suggests to use Koha::Cache instead.

To achieve this goal, a new subroutine is created
C4::Biblio::GetMarcSubfieldStructure, it will be called from code which
needs to get the marc subfield structure. GetMarcFromKohaField,
GetMarcSubfieldStructureFromKohaField, TransformKohaToMarc and
_get_inverted_marc_field_map are modified accordingly and the cache is cleared
when the table is updated (from the 3 pl scripts modified by this patch).

The caching done in C4::Context (marcfromkohafield) is removed.

Test plan:
Play with the marc subfield structure (in the administration module),
then add and edit records and make sure everything went fine.

Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
Everything works as expected on my functional tests. I'm really happy to see the
patch introduces relevant tests for previously untested functions.

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

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 172ebfe520)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2016-08-01 10:34:57 +02:00
Alex Arnaud ca08a21e4e Bug 14968 - Provides unit test
Signed-off-by: Broust <jean-manuel.broust@univ-lyon2.fr>

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

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 1509322c9a)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2016-08-01 10:33:02 +02:00
Lyon3 Team 3bed66a3e2 Bug 14968 - found shouldn't be set to null when cancelling holds
Signed-off-by: JM Broust <jean-manuel.broust@univ-lyon2.fr>

Signed-off-by: Broust <jean-manuel.broust@univ-lyon2.fr>

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

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 83328c1061)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2016-08-01 10:32:51 +02:00
Morgane Alonso 17156342e6 Bug 12509 - Fix Untranslatable Restriction added by overdues process
Changes the value of the "comment" column in "borrower_debarments" table
from "Restriction added by overdues process yyyy-mm-dd hh:mm:ss" to
"OVERDUE_PROCESS yyyy-mm-dd hh:mm:ss" in the overdue_notices.pl. Then in
the templates "moremember.tt", "circulation.tt", "memberentrygen.tt",
"opac-reserve.tt" and "opac-user.tt" the value of "comment" is
check, if it's an automatical comment due to overdue process it'll
write "Restriction added by overdues process yyyy-mm-dd hh:mm:ss",
then if there is a customizable comment it will be written without
modification. Like this, the comment "Restriction added by overdues
process" is written in the po files and can be translated later.

To test:
1) create a patron with automatical restriction due to overdue process;
2) apply patch;
3) run misc/cronjobs/overdue_notices.pl;
4) verify if the comment "Restriction added by overdues process" is well
   written and translatable on the following page :
    - opac patron home page (opac-user.tt);
    - opac item reservation page (opac-reserve.tt);
    - pro patron page (moremember.tt);
    - reservation item for a patron (circulation.tt, memberentrygen.tt);
5) try to translate the comment in po files;
6) sign off.

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

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

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit a1285ba9c0)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2016-08-01 10:32:21 +02:00
Marc Véron 79744a3989 Bug 16772 - Change label from 'For:' to 'Library:' to ease translation
This patch changes the label from "For:" to "Library:" in the
acquisition information filter on the suggestions page in staff client.

To test:
- Apply patch
- Go to Home > Acquisitions > Suggestions management
- Verify that label reads as appropriate (in filter
  Acquisition information)

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

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

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 4747e6155e)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2016-08-01 10:21:09 +02:00
Jonathan Druart 927498a007 Bug 16770: Remove 2 other occurrences of libmemoize-memcached-perl
Signed-off-by: Jacek Ablewicz <abl@biblos.pk.edu.pl>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 735789d71a)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2016-08-01 10:20:51 +02:00
Jonathan Druart 998ea5d57a Bug 16770: Remove Memoize::Memcached dependency
This module is no longer in use and can be removed.

Signed-off-by: Jacek Ablewicz <abl@biblos.pk.edu.pl>

This part involves some changes in a bunch of mysterious debian|ubuntu
related files, not quite sure if I know what I'm doing
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 67e6efab5d)
2016-08-01 10:20:05 +02:00
Jonathan Druart 0a09cb7d09 Bug 16770: Remove wrong caching of 3 subroutines in C4::Lancuages
ooking at this code, you might think these subroutines are cached, but
actually they are not.

The eval surrounding the code hides a bug, if you remove it, you will
get:
  Invalid memcached argument (expected a hash)

Test plan:
Do not apply this patch and confirm that the code does not work

Signed-off-by: Jacek Ablewicz <abl@biblos.pk.edu.pl>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 44fb6e7225)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2016-08-01 10:19:58 +02:00
Kyle M Hall 8dbb79564f Bug 16745 - Add edit catalog and edit items links to serials toolbar
It would be very helpful for librarians to have links directly to the
record and items editor from a serial. Right now moving from the serial
to those editors requires jumping through a number of pages.

Test Plan:
1) Apply this patch
2) Browse subscription-detail.pl for a given serial
3) Under the Edit button, note the "Edit record" link
4) Verify the link takes you to the marc editor for that record
5) Create or find a serial that is set to create items on receiving
6) Under the Edit button, note the new "Edit items" link
7) Verify the link takes you to the items editor for that record
8) Create of find a serial that is *not* set to create items on receiving
9) Verify the "Edit items" link does not exists for that serial

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

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

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit db52dfed01)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2016-08-01 10:17:19 +02:00
Nick Clemens d09b015e97 Bug 16651: Notes field blank for 952$z in opac-course-details.pl
This patch changes course reserves to check for item notes form the
course reserve and fallback to itemlevel notes if they are empty

To test:
1 - Enabvle course reserves
2 - Add some items
3 - Make sure the items have notes at the item level and not at course
reserves
4 - Notes don't display in staff or opac
5 - Apply patch
6 - Notes display in staff and opac
7 - Add notes at course reserves level
8 - These override the item level notes

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

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

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 62508428cd)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2016-08-01 10:16:21 +02:00
Owen Leonard f60739c3da Bug 16602 - Remove the use of "onclick" from several templates
This patch removes the use of "onclick" from several templates, instead
defining click events in JavaScript.

Also changed: Some markup corrections.

To test, apply the patch and:

- Go to Circulation -> Upload offline circulation file
  - Browse for an offline circulation file.
  - Clicking the 'Upload file' button should work correctly.
    - After uploading a file, both the 'Add to offline circulation
      queue' and 'Apply directly' buttons should work to trigger their
      corresponding processes (keeping Bug 16603 in mind).

- Go to Patrons -> Patron lists.
  - For any patron list containing patrons, click the 'Print patron
    cards' menu item. This should trigger a modal window which exports
    the correct list.

- Go to Tools -> Batch item modification.
  - Submit a batch of items for modification.
  - Clicking the 'Save' button should trigger the background job and the
    items should be successfully modified.

- Go to Tools -> Batch item deletion.
  - Submit a batch of items for deletion.
  - Clicking the 'Delete' button should trigger the background job and
    the items should be successfully deleted.

- Go to Tools -> Calendar.
  - Trigger the 'Add new holiday' panel by clicking a day on the
    calendar which has no holiday defined.
  - Clicking the 'Cancel' link should hide the panel.
  - Trigger the 'Edit this holiday' panel by clicking a day which has a
    holiday defined.
  - Clicking the 'Cancel' link should hide the panel.

Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
  Everything works as previously.

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

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 458ce34a1d)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2016-08-01 10:15:31 +02:00
Zeno Tajoli 9670cd33b3 Bug 16601: Update of italian MARC21 files
This is the update for April 2016 changes of Library of Congress
The basic creation of the files is done in http://translate.koha-community.org/files/it/mandatory/

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Both files load without problems.
No errors

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

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 718a0a7d14)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2016-08-01 10:15:11 +02:00
Owen Leonard 8fd6b0f6e4 Bug 16557 - Remove the use of "onclick" from several include files
This patch modifies several include files, removing "onclick" attributes
in favor of defining events in JavaScript.

A reusable "toggle" function has been added to the global JS file so
that clicking elements with the class "toggle_element" will toggle the
display of elements as defined in the click target's "data-element"
attribute.

Also changed: In subtypes_unimarc.inc some capitalization errors have
been fixed and label/id pairs corrected.

To test, apply the patch and clear your browser cache if necessary.

- On the Acquisitions home page, click the "Orders search" header search
  tab. Clicking the [+] link should expand and collapse the additional
  search fields.

- On the checkout or patron detail page, view the "Restrictions" tab.
  Click to add a restriction and use the datepicker to select a date.
  Clicking the "Clear date" link should clear the date.

- Trigger the help window on any page. Clicking the "close window"
  button should work correctly.

- Go to Administration -> Patron categories -> Edit. Checking and
  unchecking messaging preference options should work correctly. The "do
  not notify" checkbox should clear other checkboxes in that row and
  vice versa.

- In Serials, from a subscription detail page, clicking the "Renew"
  button should trigger the renew popup.

- Go to Acquisitions -> Vendor -> Add to basket -> From a subscription.
  Clicking the "Advanced search" link in the left hand sidebar should
  toggle the sidebar search form.

- In a UNIMARC system, view the advanced search page. Clicking the "Show
  coded information filters" link should show additional search fields.
  (I tested in my MARC21 system by temporarily moving line 174 of
  advsearch.tt to line 172).

Signed-off-by: Claire Gravely <c.gravely@arts.ac.uk>

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

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 0c476f1508)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2016-08-01 10:14:27 +02:00
Owen Leonard 54e949b8e0 Bug 16549 - Remove the use of "onclick" from header search forms
This patch removes the use of "onclick" from all header search forms for
the purpose of triggering the "keep_text" function. This behavior is now
handled in the globally-included JS file.

To test, apply the patch and clear your cache if necessary.

- Enter text in any header search form field. Click to each other tab
  in the header and confirm that your text is copied to each.
- Test the behavior of the header search form on at least one page where
  each is included:

  - The staff client home page
  - The advanced search page
  - The authorities home page
  - The administration home page
  - The cataloging home page
  - The checkin page
  - The circulation home page
  - The patrons home page
  - Acquisitions -> Vendor -> Contracts
  - Administration -> Cities
  - Administration -> Currencies and exchange rates
  - Administration -> Patron categories
  - Administration -> Printers (why is this page still around?)
  - Administration -> System preferences
  - Administration -> Z39.50/SRU servers
  - Tools -> Notices & slips

This patch modifies does not fix the existing (unreported) bug which
prevents the keep text function from working in the include file used on
these pages:

  - Acquisitions -> Vendor -> Basket -> New order from suggestion
  - Administration -> Budgets
  - The serials home page

Signed-off-by: Claire Gravely <c.gravely@arts.ac.uk>

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

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 6524e6d957)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2016-08-01 10:13:58 +02:00
Owen Leonard 5f3ee1ed82 Bug 16513 - Improvements and fixes for quote upload process
This patch fixes some minor bugs and adds a small enhancement to the
quotes editor and quotes upload pages.

To test, apply the patch and go to Tools -> Quote editor

- In the table of quotes, clicking the "ID" table header should trigger
  an alert, "Click on the quote's ide to select..."
- Go to "Import quotes" and select a file to upload.
- On the upload preview page you should see a new "Cancel import"
  button. Clicking it should return you to the quotes upload page after
  asking for confirmation.
- Test the upload cancel button:
  - If you have fast reflexes or are uploading a file large enough, you
    should be able to see a "Cancel upload" button during the upload
    process.
  - Clicking this button should cancel the upload and return you to the
    quote upload page.

Tested on top of Bug 16589, 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: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 90a1d98e06)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2016-08-01 10:13:03 +02:00
Owen Leonard f72d2cb6bf Bug 16494 - Remove the use of "onclick" from some patron pages
This patch removes the use of "onclick" attributes from some patron
pages.

To test, apply the patch and:

- In Patrons, perform any search which will return multiple results.
  Confirm that the "select all" and "clear all" links work as expected.
  Font Awesome icons have been added to these links.

  In the left-hand sidebar, change any of the filters and click the
  "Clear" button. The form (and your search results) should reset.

- Open the 'Set permissions' page for any patron. Checking any
  permission with sub-permissions should correctly expand the tree and
  select all sub-permissions. The reverse should also work.

  Also changed in this file: The "Inconsistency detected" alert has been
  reformatted to make it translatable.

- View the detail page for a patron with one or more restrictions.
  Clicking the "View restrictions" link at the top of the page should
  jump you to and activate the restrictions tab.

- View the 'Notices' tab for a patron who has been sent one or more
  notices. Click any notice title to expand the notice. Clicking the
  "resend" button should resend the notice.

- Create a new patron with the same first and last name as an existing
  patron. This should trigger a duplicate warning message. Click the
  "View existing record" link to trigger a pop-up window with a patron
  detail brief view.

  In this window an "email" class has been added to the primary and
  secondary email lines so that long email addresses don't overlap the
  second column of data.

  Confirm that clicking the "close" button in this window closes the
  window. The changes to staff-global.css are included in this patch to
  prevent the close button from having an incorrect color change on
  hover.

Signed-off-by: FILIPPOS KOLOVOS <f.kolovos@gmail.com>

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

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 0336f32b65)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2016-08-01 10:11:08 +02:00
Jonathan Druart 03d11bd791 Bug 16490: Tidy updateLink and updateAllLinks
Went through 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: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit f9282eca29)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2016-08-01 10:10:34 +02:00
Owen Leonard 91873075ff Bug 16490 - Add an "add to cart" link for each search results in the staff client
This patch adds an "add to cart" link to each line of search results in
the staff client.

To test, apply the patch and clear your browser cache if necessary.

- Enable the intranetbookbag system preference.
- Perform a search which will return multiple search results.
- Each result should have an "Add to cart" link.
  - Clicking the "Add to cart" link should add the title to the cart,
    triggering the correct pop-up message and changing the link to read
    "In your cart (remove)."
  - Clicking the "remove" link should remove the title from your cart
    and trigger the correct messages.
- Add multiple titles to your cart and perform the same search again.
  Each result should correctly indicate which titles are already in your
  cart.
- Open the cart popup window.
  - Check the checkbox for one or more titles in your cart and choose
    "Remove." The titles should be removed, and the "In your cart" label
    in the search results page should reflect that the titles are no
    longer in the cart.
  - Choose "Empty and close." All titles in the parent page should now
    indicate that they are not in the cart.
- Disable the intranetbookbag preference and confirm that the "Add to
  cart" links are no longer there.

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: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 480a445991)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2016-08-01 10:10:14 +02:00
Owen Leonard 7a50586bb0 Bug 16477 - Improve staff client cart JavaScript and template
This patch makes several changes to the cart JavaScript and template. In
the template:

- Remove "onclick" attributes in favor of defining events in the
  JavaScript.
- Add a [% BLOCK %] section for some repeated markup.
- Add some Font Awesome icons (I didn't add icons to all controls
  because I thought it looked cluttered).
- Move the batch modification control out of the toolbar and into the
  group of controls which affects selected records. I think this is a
  logical grouping, and makes more sense than having a drop-down menu in
  the toolbar with a single menu item.

JavaScript:

- Created separate "cart.js" file so that JS could be moved out of the
  template without loading up basket.js with event functions which are
  not needed on every page in the staff client.
- Fix JSHint errors.

To test, apply the patch and clear your browser cache if necessary.

- Add multiple items to the cart in the staff client and open the cart.
- Confirm correct functionality of these toolbar buttons:
  - "More details" (and the corresponding "Show less")
  - "Send"
  - "Print"
  - "Empty and close"
- Confirm the correct functionality of all the selection controls:
  Select all, clear all, Remove, Add to a list, Place hold, Batch
  modify, and Batch delete.
- Confirm that clicking any title in the cart opens the correct detail
  page in the parent window.

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

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

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

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 24729ff8f9)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2016-08-01 10:08:21 +02:00
Katrin Fischer a5f3334314 Bug 16472: Update MARC21 de-DE frameworks to update 22 (April 2016)
To test:
1) Start with a fresh database
2) Check mandatory bibliographic and authority files
   load without problem using the German web installer
3) Check new fields/subfields are ok

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Not a german speaker but seems right :)
File loads without problem.
No errors

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 7a3b5ee04b)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2016-08-01 10:07:12 +02:00
Owen Leonard 748cf4b75f Bug 16469 - Remove the use of "onclick" from some catalog pages
This patch removes the use of "onclick" attributes from two
catalog-related templates: The local cover image viewer and the search
results page. Events are now defined in JavaScript.

To test:

On the search results page:

- Perform a catalog search which will return multiple results.
- On the search results page, confirm that the "Select all" and "Clear
  all" links at the top of the results table work correctly.

In the local cover image viewer:

- The LocalCoverImages and AllowMultipleCovers system preferences must
  enabled, and at least one catalog record must have at least two local
  cover images attached.
- Locate that record in the catalog and view the detail page for it.
- Click the cover image in the "Images" tab to go to the image viewer
  page.
- Clicking each local cover image thumnail should correctly display the
  larger version of each image.

Signed-off-by: Nikos Chatzakis, Afrodite Malliari <nchatzakis@datascouting.com>

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

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 9cb7244433)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2016-08-01 10:06:23 +02:00
Owen Leonard 9f35e93910 Bug 16468 - Remove last "onclick" from the stage MARC records template
This patch reviseds the stage MARC records template, removing
one more "onclick" attribute from the markup and defining that event in
the script.

This patch also corrects a missing quotation mark in the HTML. I have
done some reindentation to that section.

To test, apply the patch and go to Tools -> Stage MARC records for
import.

- Select a MARC file for import.
- Click the "Upload file" button.
- Click the "Stage for import" button. Your import should be correctly
  staged.

Signed-off-by: Claire Gravely <c.gravely@arts.ac.uk>

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

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit dd867b10b8)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2016-08-01 10:05:35 +02:00
Owen Leonard 48b7ae3502 Bug 16400 [Follow-up] Proposal to uniform the placement of submit buttons
This follow-up makes some corrections to the markup of the cancel
button:

- Use <a> instead of <button> to eliminate the need for an "onclick"
  attribute.
- Remove the "cancel" class which adds unwanted padding.
- Correct the destination of the cancel button when cancelling during an
  edit (should redirect to the patron detail page).

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

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

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit b77bd31fbf)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2016-08-01 10:03:04 +02:00