Commit Graph

26691 Commits

Author SHA1 Message Date
Jonathan Druart be529c2b2b Bug 16400: Use the fa-times icon for Cancel
Signed-off-by: Owen Leonard <oleonard@myacpl.org>

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

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit f9d239daba)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2016-08-01 10:02:30 +02:00
Jonathan Druart ccad7d9081 Bug 16400: Restore the previous stack order behavior
When updating the plugin, the stack order behavior has changed. This
patch restores the prevous behavior (not always z-index: 1000)

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

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

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 82dbf05f54)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2016-08-01 10:02:07 +02:00
Jonathan Druart 5c01530e51 Bug 16400: Reintroduce the floating class
Signed-off-by: Owen Leonard <oleonard@myacpl.org>

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

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 3fe6398c22)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2016-08-01 10:01:46 +02:00
Jonathan Druart 7012121d08 Bug 16400: Let's hack the fixFloat plugin to fix our needs
On comment bug 11088 comment 2, Owen explained the problem with the
fixFloat toolbar. Since we have a hidden div, the plugin does not manage
to place the toolbar correctly.
In order to make it work, this patch adds some changes to the plugin to
add the ability to define our own offset.
When the div is extended (+, filteraction_on), the offset should be
updated to move the toolbar. Same when the div is folded (-,
filteraction_off)

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

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

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit c1f101e86c)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2016-08-01 10:01:28 +02:00
Jonathan Druart 2628fdd8c4 Bug 16400: Update the fixFloat plugin
I have updated it just in case it fixed the issue.
I don't think there are big changes between our current version and this
one, so keep it up-to-date

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

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

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 0d6ff55174)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2016-08-01 10:00:56 +02:00
Marcel de Rooy 1db9defdec Bug 16751: What is sitemaper?
s/sitemaper/sitemapper/

Test plan:
Run t/db_dependent/Sitemapper.t

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 3e566de51f)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2016-08-01 09:27:14 +02:00
Marc Véron 992ac84f3e Bug 16718 - Translatability: Fix problems with sentence splitting by <strong> in about.tt
This patch removes sentence splitting by <strong> tags in
koha-tmpl/intranet-tmpl/prog/en/modules/about.tt for better translatability.

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

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

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 0712048030)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2016-08-01 09:26:36 +02:00
Marc Véron 4662519a09 Bug 16697: Translatability: Fix problem with isolated "'s"in request.tt
This patch fixes translation problems with tag-isolated 's in
koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt

The patch fixes it at two places. In consequence, some other texts
ares sigthly changed to make them look similar.

To test:
- Inspect code changes and verify that the new wording makes sense.

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

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

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 2289c8c930)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2016-08-01 09:26:21 +02:00
Hector Castro 299f4e418d Bug 16742: (follow-up)Remove unused template subject.tt
Delete extra useless comment line:
"# if its a subject we need to use the subject.tt"

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

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit a4f80ab223)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2016-08-01 09:25:51 +02:00
Marc Véron a6843caa70 Bug 16742: Remove unused template subject.tt
The template koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/subject.tt
is not used and can be removed.

To test:
- Apply patch
- Verify that catalogue/moredetail.pl works as before (go to a
  biblio with items and click 'Items' in left hand menu)

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 cf441013a5)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2016-08-01 09:25:26 +02:00
Fridolin Somers cc31338f26 Bug 16736 - Keep branch filter when changing suggestion
When changing suggestion, the selected tab is kept.
The same should be done with the selected branch.

Test plan:
- Go to suggestions table : /cgi-bin/koha/suggestion/suggestion.pl
- Select a branch in Acquisition information > For
- Select a pending suggestion
- Change status as accepted
- Click on Submit
=> without patch, the table is no longer filtered by branch
=> with patch, the table is filtered by branch

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: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 0c1fa2f93c)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2016-08-01 09:24:33 +02:00
Marcel de Rooy 8b15c8328b Bug 16644: Plack: Use to_app to remove warning about Plack::App::CGIBin instance
Using Plack with the debian psgi file, I get lots of warnings like:
WARNING: Automatically converting Plack::App::CGIBin instance to a PSGI code reference. If you see this warning for each request, you probably need to explicitly call to_app() i.e. Plack::App::CGIBin->new(...)->to_app in your PSGI file.

This patch is aimed to eliminate the warns.

Test plan:
Run Plack with plack.psgi or koha.psgi and verify if you do not see these
warnings anymore.

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
I tested on Jessie and I see no regressions.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit d69d874a3f)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2016-08-01 09:24:14 +02:00
Owen Leonard 92b4bb6f9a Bug 16462 - Change default sorting of circulation patron search results to patron name
This patch changes the default sort of patron quick search results from
the circulation header search or when searching for a patron during the
hold process.

To test:

In Circulation:
- Perform a search by name for a patron which will
  return multiple search results.
- Confirm that the results are sorted by patron name.

In the catalog:
- Locate and place a hold on a title.
- When prompted to select a patron to place the hold for, perform a
  search by name which will return multiple results.
- Confirm that the results are sorted by patron name.

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 38d1a1862d)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2016-08-01 09:23:50 +02:00
Kyle M Hall 605516c4ea Bug 16737 - Error when deleting EDIFACT message
If you try to delete an EDIFACT message it triggers an error:

Can't use string ("2") as a subroutine ref while "strict refs" in use at
/acqui/edifactmsgs.pl line 43.

Test Plan:
1) Attempt to delete an EDIFACT message
2) Note the error
3) Apply this patch
4) Attempt to delete an EDIFACT message again
5) Note it succeeds

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

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

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 1f2dcfd2e9)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2016-08-01 09:23:29 +02:00
Jonathan Druart a4b9c51858 Bug 16731: Use INSERT IGNORE when inserting a syspref
IGNORE should be used to allow backporting (and local patch)

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

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

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit e5bb0fac3f)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2016-08-01 09:23:03 +02:00
Jonathan Druart ad4f188ef6 Bug 16724: Fix link to the online documentation links
Since the numbering changes, the online doc links are broken.

Test plan:
Make sure the online doc links work on the help pages.

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

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

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 27de2ece61)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2016-08-01 09:22:30 +02:00
Nick Clemens 9b5c84e88b Bug 16708 - (QA followup) Fix pod copy/paste error
Change Koha::Authority to Koha::MetadataRecord::Authority

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 4491780ecc)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2016-08-01 09:21:49 +02:00
Jonathan Druart 32fd9c80d6 Bug 16708: Fix authority reindex for ElasticSearch
The changes made to Koha::Authority has not been correctly fixed.
The code of Koha::Authority has been moved bo
Koha::MetadataRecord::Authority by bug 15380.

Test plan:
  perl misc/search_tools/rebuild_elastic_search.pl -a -v
should success

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 1e39ecc7f1)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2016-08-01 09:21:37 +02:00
NguyenDuyTinh d6484dfe2f Bug 16705 - Add missing status to serials history in OPAC
The bug is related to 10851. Due to add of status in 10851, status added were
missing in opac-detail.tt and opac-full-serial-issues.tt. The patch just added
these missing status.

To test:
1) Create New subscription in Serials, in Intranet
2) Do a search of the new subscription by Title
3) Take Serial receive as Actions to edit the status to Missing (<something>)
4) Go to Opac and Search the subscription created, by its title and See missing status
5) Apply patch, status must be showed.
6) Sign off

Followed test plan, works as expected.
Amended to format commit title and message.
Signed-off-by: Marc Véron <veron@veron.ch>

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

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit e1d6974bff)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2016-08-01 09:20:29 +02:00
Jonathan Druart 917054eaf6 Bug 16624: Fix regression displaying a letter with hours
Bug 13622 has introduced a bug, if pref TimeFormat is 12hr and a date is
displayed in both title and content of the letter.

Test plan:
1 - Checkout an item (with default time 11:59:00 PM)
2 - Generate a quickslip
3 - Notice the time is 'AM'
4 - Apply patch
5 - Generate quickslip
6 - Note time is correct

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

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

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 6f0ce92543)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2016-08-01 09:19:21 +02:00
Jonathan Druart 91d6b787dd Bug 16624: Add regression tests
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>

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

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 47e41ea1c2)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2016-08-01 09:19:06 +02:00
Kyle M Hall 90d3635fed Bug 16612 - Cannot set "Until date" for "Enrollment period" for Patron Categories
Attempting to set an "Until date" date for "Enrollment period" will
result in the date being accepted but not saved.

Test Plan:
1) Attempt to set an enrollment period until date for a new patron category
2) Note the period is not saved
3) Apply this patch
4) Attempt to set the enrollment period date again
5) This time it should save!

Signed-off-by: Andrew Brenza <abrenza@audubonlibrary.org>

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

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 2af028bb13)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2016-08-01 09:17:17 +02:00
Jonathan Druart 787720de69 Bug 16707: Fix software error in OPAC password recovery when leaving form fields empty
The $search_results is considered as an arrayref but is not defined if
no patron matches the recovery infos.

Test plan:
- Set syspref OpacResetPassword to "Allow"
- Go to OPAC
- Click link "Forgot your password?
- On the following screen "Forgotten password recovery", do not fill in
  form fields, click "Submit"
=> Without this patch you got the software error
=> With this patch apply, you will get "No account was found with the
provided information."

Sign-off on counter patch.
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 0d690ca383)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2016-08-01 08:57:21 +02:00
Jonathan Druart 47e39d6ce7 Bug 16680: (bug 13918 follow-up) Display library names for holds in transit
Regression introduced by bug 13918: the library names are not displayed
anymore for holds in transit.
They are 2 warns in the logs:
No method wbrname! at
/home/koha/src/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt
line 603.
No method wbrcd! at
/home/koha/src/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt
line 603.

Test plan:
Make sure you have holds in transit and go the opac-user.pl
In the "Holds" tab, you should see "Item in transit to LIBRARY NAME"

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

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

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 574bff5c6f)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2016-08-01 08:56:21 +02:00
Jonathan Druart 0974bb3888 Bug 16593: Do not allow patrons to delete search history of others patrons
A malicious user can delete the search history of all other users by
correctly guessing the ID value assigned to the victim's search. As
searches are assigned values sequentially, an attacker could quickly
remove the searches belonging to all of the application's users.

To reproduce:
Login with patron A
launch a search
Note the id generated for this search history:
select id from search_history order by id desc limit 1;
Login with patron B
Hit /cgi-bin/koha/opac-search-history.pl?action=delete&id=<ID>
Note that the row is deleted in the DB

Test plan
Confirm that this patch fixes the issue.
The same test can be made at the staff interface

Reported by Alex Middleton at Dionach

Signed-off-by: Chris Cormack <chrisc@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 f01720808a)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2016-08-01 08:53:51 +02:00
Jonathan Druart cb2895592a Bug 16527: Restore sticky due date behavior
Bug 10067 has introduced a regression on the sticky due date behavior:
If "remember for session" is checked and the due date is changed from 1
checkout to another, the old due date will be used.

The code added by bug 10067 is really confusing and it's hard to say
this patch won't introduce another regression.
The manipulation of $restoreduedatespec, $duedatespec and $stickyduedate
is not easy to follow.

Test plan:
Confirm that the regression is fixed and that this patch will not
introduced a regression on bug 10067 (good luck!)

Signed-off-by: Eivin Giske Skaaren <eivin@sysmystic.com>

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

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 33f1354b7b)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2016-08-01 08:52:54 +02:00
Kyle M Hall 16d14e1467 Bug 16534: (followup) - Tidy AddIssue
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit f1fa65f637)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2016-08-01 08:51:22 +02:00
Marc Véron b067e2803b Bug 16534: (followup) Correct tiny typo
This patch corrects "...must be return..." to "must be returned..."

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit fe02c9fdf0)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2016-08-01 08:50:43 +02:00
Jonathan Druart 2cc01d139a Bug 16534: Block AddIssue from issuing if the return is not possible
To make sure the return can be done, AddIssue must not trust callers (they
should have done their job, but we are not sure) and check that the issue can
be returned before issuing to the patron.

There is no test plan here, this should not be possible from the Koha
interface.
However, looking at the code, it may be possible using SIP.

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

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 1a9674fd3a)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2016-08-01 08:50:23 +02:00
Jonathan Druart e974de2c69 Bug 16534: Add tests for AddIssue
Signed-off-by: Marc Véron <veron@veron.ch>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit a879efb574)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2016-08-01 08:50:01 +02:00
Jonathan Druart df9fbe0aef Bug 16534: Make CanBookBeIssued test if the issue can be returned
If an issue is already checked out, CanBookBeIssued must check if the
issue can be checked in before processing the return.
In such cases (depending of the AllowReturnToBranch pref), the issue
should not be allowed.

Prior to this patch, the checkin was not done and the checkout failed
with "Duplicate entry '1204321' for key 'itemnumber'". Indeed since bug
14978, there is an uniq key on issues.itemnumber. Before bug 14978 the
issue existed but was hidden (and some weird behaviors certainly
happened!).

To avoid Koha to crash, a check is added to CanBookBeIssued (call to
CanBookBeReturned) and the librarian is not able to process the
checkout.

Test plan:

- Set AllowReturnToBranch to anywhere
- Check an item (homebranch Library 1, holding branch Library 1) out from Library 1
- Check the item out from Library 2
=> Confirm the checkout (should work with and without this patch)

- Set AllowReturnToBranch to holdinbranch ("only the library the item
  was checked out from").
- Check an item (homebranch Library 1, holding branch Library 1) out from Library 1
- Check the item out from Library 2
=> Without this patch, Koha crashed
=> With this patch, you will be warned that the checkin is not possible.

Try other combinations of the AllowReturnToBranch syspref

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

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 9427d44568)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2016-08-01 08:49:47 +02:00
Jonathan Druart 141ada91cc Bug 16534: Add tests for CanBookBeIssued & AllowReturnToBranch
Signed-off-by: Marc Véron <veron@veron.ch>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 2c88538946)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2016-08-01 08:49:29 +02:00
Frédéric Demians 10db143310 Translation for 16.05.01 2016-06-24 08:20:13 +02:00
Frédéric Demians 01398dee5a Version 16.05.01 2016-06-24 08:02:13 +02:00
Marc Véron 29e0eb0f4b Bug 16747 - Patron card creator broken with version 16.05
To reproduce:
- Prepare a patron car layout with Image 1 using Patron Image
- Create a patron card for a patron without patron image
Result: OK, PDF can be opened wit PDF viewer
- Try to create a patron card with a patron who has a patron image
Result: The PDF file is corrupt (contains text only with error message)
        intranet error log contains: create-pdf.pl: Illegal division
        by zero at /usr/share/kohaclone/patroncards/create-pdf.pl line 200
To test:
- Apply patch
- Create a patron card with a patron who has a patron image
Result: PDF is OK and contains the image

Bonus test: Do the same with a card layout with an additional image
(Image 2: Image source: Other image)

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

Test and bonus test pass: PDF generated without errors.

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

Signed-off-by: Brendan Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit 87dbed0abd)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2016-06-24 07:44:48 +02:00
Marc Véron 546b95aee4 Bug 16729: Use member-display-address-style*-includes when printing user summary
This patch replaces the address part in moremember-print.tt to print identical
address information as displayed on the screen (including street numer, formatted as required by syspref 'AddressFormat'

To test:
- Apply patch
- Search for a user with all address information filled
- Verify that 'Print summmary' displays the same information
  as displayed on the screen.
- Change value of syspref 'AdressFormat'
- Verify that address format on 'Print summary' changes
  as appropriate

Signed-off-by: mehdi <mehdi@inlibro.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 555f40626a)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2016-06-24 07:42:02 +02:00
Julian Maurice 5fd657a8fc Bug 16693: Remove reserve/renewscript.pl
It is not used since bug 11703

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 c92d0823f8)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2016-06-24 07:41:47 +02:00
Owen Leonard 1dfbe758c2 Bug 16543 - Make edit and delete links styled buttons in patron attribute types administration
This patch modifies the Patron attribute types page, converting edit and
delete links to Bootstrap buttons with Font Awesome icons.

To test, apply the patch and go to Administration -> Patron attribute
types. The 'Edit' and 'Delete' buttons should look correct and work
correctly.

Signed-off-by: Jan Kissig <jkissig@th-wildau.de>

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

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit ae4be45444)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2016-06-24 07:39:54 +02:00
Owen Leonard ef948191c6 Bug 16541 - Make edit and delete links styled buttons in cities administration
This patch modifies the cities administration page, converting edit and
delete links to Bootstrap buttons with Font Awesome icons.

To test, apply the patch and go to Administration -> Cities and towns.
The 'Edit' and 'Delete' buttons should look correct and work correctly.

Signed-off-by: rainer <archiv@a-bibliothek.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 51a11d2794)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2016-06-24 07:39:33 +02:00
Jonathan Druart 8971ff67b6 Bug 16456: Reintroduce wording "Delete tag"
"Delete tag" seems more appropriate than "Delete" on this tag, but I may
be wrong.

This patch also removes an extra space.

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

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 45fbcb9fda)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2016-06-24 07:38:53 +02:00
Hector Castro f941f67897 Bug 16456: Add Font Awesome icons to some buttons in Tools module, section Patrons and circulation
Add Font Awesome Icons to section Patrons and circulation in Tools module.
Also correct a error dialog in JQuery functions

To test:
-Apply patch
-Goto Tools -> Patron list -> my_list_saved -> Add patrons -> Remove selected patrons,
 Clear all, Select all.
-Add new patron list and add some patrons, notice about the trash icon.
-Make some comments in some bib records and goto Tools->Comments
 you will presented with two tabs "Approved comments" and
 "Comments awaiting moderation".
 See the three new buttons: Approve, Delete, Unapprove.
-Set syspref TagsModeration to Require. This will show all pending tags to review.
-Make some tags in bib records and goto Tools -> Tags.
-Notice about the new look.
-In the new screen look the icons in buttons "Apply filter(s)", "Test", "Approved",
 "Reject". Notice about the new header bar above the DataTable with options: Select all,
  Clear all, Select all pending.
-Play with filters; Check if terms exist or not in appoved/rejected lists
-Play with Terms summary and see if DataTable is working as expected
-Click in some term tag with multiple titles
-A table with titles tagged with the term is presented
-See the new button 'Remove'
-Verify if you can remove tag from a selected title.
-Verify that all tools work as expected

NOTE: The Tag and Comments tools has been revised to fit with others
interfaces in Koha.
Bug ammended according with QA comment 5
Bug rebased because bug 16005
Test plan amended for clarity
Clock icon for "Select all pending" removed (QA comment 23).
Fix some forbidden patterns (tab char) in review.tt according by IRC comment
by Marc Veron

Followed test plan, looks and 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 2a6a3de7c4)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2016-06-24 07:38:11 +02:00
Owen Leonard 43b4a740dc Bug 16127 - Add discharge menu item to patron toolbar
This patch changes the "Discharge" menu in the patron sidebar to read
"Discharges," and adds a "Discharge" menu item to the patron toolbar.

This adds some redunancy, but fits with the pattern of including "views"
in the sidebar and "actions" in the menu. The discharge feature can be
thought of either way.

To test you must have the 'useDischarge' system preference enabled.

- View the detail page for any patron.
- Confirm that the sidebar menu reads "Discharges."
- Confirm that the "More" menu contains a "Discharge" link which works
  correctly.

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 981302a473)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2016-06-24 07:33:16 +02:00
Jonathan Druart 5a39b1b3a2 Bug 16594: Fix obvious QA issues from bug 11371
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 64efee0b5c)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2016-06-24 07:30:29 +02:00
Hector Castro f9bb33c1cb Bug 16594: Orders by fund report has wrong link to css and other issues
Orders by fund has wrong link to css and other issues
-> The example in the wiki is wrong: <https://wiki.koha-community.org/wiki/DataTables_HowTo>
<link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" />
  [% INCLUDE 'datatables.inc' %]
-> Must be:
<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables.css" />
-> Missing <th></th> in <tfoot> tag
-> Wrong word used "Date deceived" should be "Date received"

NOTE: Wiki needs to be updated

To test:
-Look the code and notice about if else cluase without curly brackets
-Go to Reports > Orders by fund
-Play with: in filters 'All fund' Output: 'to screen into the browser'
-You will see a DataTable displayed in screen clutter
-Notice about 'Date deceived' and the foot of table
-Apply patch
-Refresh or execute again the report

Signed-off-by: Sinziana <s.paltineanu@berlin.bard.edu>

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

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit d4394d88ea)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2016-06-24 07:30:10 +02:00
Jonathan Druart 8ebe3a0a42 Bug 16717: Improve variable naming
$category was a categorycode, to help the readability it's better to
name it $categorycode or assign a Category to $category

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

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit f8b73deaec)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2016-06-24 07:29:30 +02:00
Marcel de Rooy 5321959b45 Bug 16717: Remove hardcoded category from Holds.t
There is actually no need to use the hardcoded patron category S in
this test.

Test plan:
Run t/db_dependent/Holds.t.

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

Test passes OK
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 a4690353d9)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2016-06-24 07:29:15 +02:00
Marcel de Rooy 739d44a6a2 Bug 16607: Remove CPL/MPL from two unit tests
Test t/db_dependent/Accounts.t:
This test created a MPL branch, but did not use it any more.

Test t/db_dependent/Items/AutomaticItemModificationByAge.t:
This test still used CPL/MPL branches. Now it uses two new branches.

Test plan:
[1] Run t/db_dependent/Accounts.t.
[2] Run t/db_dependent/Items/AutomaticItemModificationByAge.t.

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

Both tests pass OK
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 2d9c270886)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2016-06-24 07:28:45 +02:00
Marcel de Rooy 358f277017 Bug 16500: [QA Follow-up] Catch warning if branch MPL already exists
The current test had no warnings, when you have no MPL branch, and only
catches the warn from the second build on line 57. If you do have MPL,
a warning comes from line 56.

This patch fixes it by removing MPL from the test. A new branch is created
first and then we try to create it again.

Test plan:
Run the test.

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 63fbb336bd)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2016-06-24 07:28:31 +02:00
Marcel de Rooy 9cb9d3c306 Bug 16500: Catch two warns in TestBuilder.t with warning_like
When testing a wrong case in TestBuilder.t, two warns show up.
We can catch them with warning_like.

Test plan:
Run t/db_dependent/TestBuilder.t

Signed-off-by: Chris Cormack <chris@bigballofwax.co.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 395ac8835a)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2016-06-24 07:28:13 +02:00
Tomas Cohen Arazi c0d3e6db11 Bug 16720: Remove DBIx ActionLogs.pm
The update_dbix_class_files.pl script generates ActionLog.pm instead, which is
already on the source tree.

To test:
- Apply the patch
=> SUCCESS: Koha/Schema/Result/ActionLogs.pm is removed
- Run:
  $ mysql -uroot
  > CREATE DATABASE dbic; \q
  $ mysql -uroot dbic < kohaclone/installer/data/mysql/kohastructure.sql
  $ misc/devel/update_dbix_class_files.pl --db_name dbic --db_user root
=> SUCCESS: Koha/Schema/Result/ActionLogs.pm is not re-generated
- Run:
  $ git grep ActionLogs
=> SUCCESS: There's no code using it
- Sign off

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 b8c950a4c1)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2016-06-24 07:27:37 +02:00