Commit Graph

24257 Commits

Author SHA1 Message Date
Jonathan Druart e7af53a4db Bug 15968: Unnecessary loop in C4::Templates
From C4::Templates::output

     # add variables set via param to $vars for processing
     for my $k ( keys %{ $self->{VARS} } ) {
         $vars->{$k} = $self->{VARS}->{$k};
     }

This loop is not necessary, we could do the same with

     $vars = { %$vars, %{ $self->{VARS} } };

After a quick benchmark, it gains 100 microseconds when we pass 170 vars
to the template.

Test plan:
Do some clicks on the interface, everything should be ok.

Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
  Perl idiosyncratic way of merging hash, clearer, if not quicker (not
  verified)

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

Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit 9be221b14e)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit 1543db81c7)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2016-03-15 09:54:03 +01:00
Nick Clemens bab470c780 Bug 15697 - [QA Followup] Apply change to NORMARC
This patch switches from UNLESS MARC21 to IF UNIMARC - this way changes
apply to MARC21 and NORMARC and UNIMARC remains unaffected

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

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 566daf8c24)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit 70efd64b47)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2016-03-15 09:51:48 +01:00
Nick Clemens e0b2ffd187 Bug 15697: Unnecessary comma between title and subtitle on opac-detail.pl
To test:
1 - Go to Administration->Keyword to MARC mapping
2 - Add a mapping (or ensure it exists)
    Field name: subtitle
    MARC field: 245
    MARC subfield: b
3 - View a record with a subtitle in the opac
4 - Note in MARC 21 you have "Title of record:, subtitle of record"
5 - Apply patch
6 - View the record again and note the comma is no longer present.

Note: this patch removes the comma only for MARC21 where subtitle is not
repeatable. UNIMARC seems to be repeatable and does not include
punctuation so I believe this may be needed there.

Signed-off-by: Hector Castro <hector.hecaxmmx@gmail.com>
Works as described. Comma removed from title of the window and breadcrumb
section

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

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit e19db8ca32)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit 889a2f7a6c)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2016-03-15 09:51:28 +01:00
Owen Leonard 69f9570ecd Bug 15940 - Remove unused JavaScript from authorities MARC subfield structure
The authorities MARC subfield structure template contains some unused
JavaScript, "function displayMoreConstraint()" This patch removes it.

To test, apply the patch and go to Administration -> Authority types ->
MARC structure -> Subfields -> Edit subfields and confirm that there are
no JavaScript errors and tab switching works correctly.

A search of the source code should show no instances of
"displayMoreConstraint."

Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
  No regression, no JS warning.

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

Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit 3f70b4660b)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit 3c9ed309ba)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2016-03-15 09:48:51 +01:00
Nicole C Engard f23d74c2be Bug 15926: Add help for item search fields admin
This patch will add the missing help file to the item
search fields admin page.

To test:
* Go to administration > Item search fields
* Click Help
* Confirm help is there and correct.

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
(cherry picked from commit ac3e13248a)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit e9b25fb1a1)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2016-03-15 09:47:59 +01:00
Owen Leonard 73dad06484 Bug 15884 - Vendor contract deletion warning is incorrectly styled
When deleting a contract in  Acquisitions -> Vendor -> Contracts, the
deletion confirmation message is not styled with the standard "dialog
alert" <div>. This patch modifies the confirmation markup to match the
standard.

To test, apply the patch and go to Acquisitions -> [ a vendor] ->
Contracts

- Try deleting a contract. The confirmation box should have the standard
  "dialog alert" class.
- Test the 'confirm' and 'cancel' actions and make sure both complete
  correctly.

Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit a4f1103e41)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2016-03-15 09:46:38 +01:00
Marc Véron d3c1dfcc49 Bug 15808 - Remove "Return to where you were before" from sysprefs
This patch removes the link 'return to where you were before' from
syspref search result page after failing search.

To test:
- Apply patch
- Go to System preferences in staff client, do a search
  with something that does not exist
- Verify that a message pops up that does not contain the link.

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

Signed-off-by: Brendan Gallagher brendan@bywatersolutions.com
(cherry picked from commit 34b79932f7)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit 4cbc77e639)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2016-03-15 09:45:37 +01:00
Owen Leonard 3f0313253d Bug 15804: Use standard dialog style for confirmation of MARC subfield deletion
When deleting a MARC framework subfield, the confirmation message is not
styled. This patch modifies the template to style the confirmation
message like similar ones.

To test, apply the patch and go to Administration -> MARC framworks.

 - Click 'MARC structure' for a framework you can edit.
 - Click 'subfields' for a tag you can edit.
 - Click 'Delete' for a subfield you can delete. You should see a
   confirmation dialog styled like other "alert" type dialogs.
 - Test both canceling and confirming deletion to confirm that both
   function correctly.

Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit 8323259d84)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2016-03-15 09:44:56 +01:00
Owen Leonard 9fe4546dc1 Bug 15784: Library deletion warning is incorrectly styled
When deleting a library in Administration ->  Libraries and groups, the
deletion confirmation message is not styled with the standard "dialog
alert" <div>. This patch modifies the confirmation markup to match the
standard.

To test, apply the patch and go to Administration -> Libraries and
groups.

- Try deleting a library. The confirmation box should have the standard
  "dialog alert" class.
- Test the 'confirm' and 'cancel' actions and make sure both complete
  correctly.

Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit cfb46e45cb)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2016-03-15 09:43:16 +01:00
Tomas Cohen Arazi 3e756ef808 Bug 15721: (QA followup) pick the most probable first
Signed-off-by: Tomas Cohen Arazi <tomascohen@unc.edu.ar>

Signed-off-by: Brendan Gallagher brendan@bywatersolutions.com
(cherry picked from commit 16548d3984)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit 5edc50888d)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2016-03-15 09:42:37 +01:00
Marc Véron 8d8dd2ebae Bug 15721: (followup) Add apache2ctl to C4::Context::get_versions
See comment #6

Signed-off-by: Tomas Cohen Arazi <tomascohen@unc.edu.ar>

Signed-off-by: Brendan Gallagher brendan@bywatersolutions.com
(cherry picked from commit 019634fc5b)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit f4272b467c)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2016-03-15 09:42:14 +01:00
Marc Véron a084fee0a6 Bug 15721: About page does not display Apache version
This patch changes about.pl to get version information from
C4::Context where applicable and fixes missing display of
the Apache version e.g. for Apache/2.2.22

To test:
- Without patch, open about page in staff client
- Remember contents of tab 'Server information'
  (e.g. make a screenshot)
- Apply patch
- Verify, that the About page displays the same information
  as before rsp. additionally displays Apache version if
  it was missing without patch.

Signed-off-by: Hector Castro <hector.hecaxmmx@gmail.com>
Works as described
Signed-off-by: Tomas Cohen Arazi <tomascohen@unc.edu.ar>

Signed-off-by: Brendan Gallagher brendan@bywatersolutions.com
(cherry picked from commit c2fe13c13a)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit 62bf20ad39)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2016-03-15 09:41:41 +01:00
Mark Tompsett af4e2c6041 Bug 15719: Silence warning in C4/Language.pm during web install
This problem was discovered the hard way:
- Drop DB
- Create DB
- Webinstaller run until the screen is:
We are ready to do some basic configuration.
Please install basic configuration settings to continue the installation.
-- The error log file will end with an error about splitting
   an uninitialized value.

TEST PLAN
---------
0) First patch already applied
1) prove -v t/Languages.t
   -- success, but warn prints
2) Apply this patch
3) prove -v t/Languages.t
   -- success without warning messages
4) run koha qa test tools

Signed-off-by: Hector Castro <hector.hecaxmmx@gmail.com>
Works as described. QA test tools run OK

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

Signed-off-by: Brendan Gallagher brendan@bywatersolutions.com
(cherry picked from commit a84264c92f)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit 9449b27198)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2016-03-15 09:40:22 +01:00
Mark Tompsett 03e133ba26 Bug 15719: Silence warning in C4/Language.pm during web install - tests
Test empty database case.

TEST PLAN
---------
1) prove -v t/Languages.t
   -- success (because test case is missing)
2) Apply this patch
3) prove -v t/Languages.t
   -- success, but warning printed.
4) run koha qa test tools

Signed-off-by: Hector Castro <hector.hecaxmmx@gmail.com>
Works as advertised. QA test tools rus OK

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

Signed-off-by: Brendan Gallagher brendan@bywatersolutions.com
(cherry picked from commit 701f427587)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit 9719f02801)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2016-03-15 09:39:39 +01:00
Nick Clemens 74b1b26691 Bug 15699 [QA followup] - Only display firstname if present
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Brendan Gallagher brendan@bywatersolutions.com
(cherry picked from commit ad63a6b8da)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit fa632a7a20)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2016-03-15 09:38:31 +01:00
Nick Clemens 7f787efafa Bug 15699 - Course reserves instructors should be in form "Surname, Firstname" for sorting purposes
This patch changes the order of the name fields and adds a span class around
each in case of library wanting to customize further

To test:
1 - Enable course reserves
2 - Add some courses with instrcutors
3 - Note they are of form "Firstname Surname"
4 - Apply patch
5 - Note the change
6 - Note span tags
7 - Note you can hide firstname by adding to intranet user js: $(".instr_firstname, instr_separator").hide();

Sing-off note: This patch displays the names as advertised on cgi-bin/koha/opac-course-reserves.pl Sorting
the names would need some more actions but seems not to be intended by this patch.
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
(cherry picked from commit 4dba088549)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit f232ce8bdc)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2016-03-15 09:38:05 +01:00
Frédéric Demians 74b4011eb8 Bug 15667 RMaint followup 2016-03-15 09:36:46 +01:00
Marc Véron 80a750e6af Bug 15667: Fix date and branch formatting of messages in patron account display
This patch fixes the date and branch formatting of messages in patron
account display.

To verify:
Add a new message to a patron account from the 'checkouts' tab in staff,
the displayed date is not correctly formatted and the branch displays as code
instead as branch name

To test:
Apply patch, verify that the messages and branch names are properly formatted.

Signed-off-by: Hector Castro <hector.hecaxmmx@gmail.com>
Works as described. The message dates in checkouts tab follow dateformat sypref

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

Signed-off-by: Brendan Gallagher brendan@bywatersolutions.com
(cherry picked from commit 015e20138a)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit 1f5305d264)
2016-03-15 09:26:51 +01:00
Marc Véron a8e33e33e7 Bug 15658: Browse system logs: Add more actions to action filter list
The following actions were missing in the action filter list on
cgi-bin/koha/tools/viewlog.pl:

'ADDCIRCMESSAGE'
'CHANGE PASS'
'DELCIRCMESSAGE'
'RENEW'
'Run'

To test:
- Apply patch
- Go to Tools > Logs (viewlog.pl)
- Verify that the actions appear in the list 'Actions'
- Verify that the new entries filter the list as appropriate (in
  combination with Modules: All or with a meaningful selection in
  list 'Modules')

Note for testing: You have to set a date in 'Display from' to get results

Signed-off-by: Hector Castro <hector.hecaxmmx@gmail.com>
Logs work as advertised, translated in bug 13474

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
"Run" could be more explicit.

Signed-off-by: Brendan Gallagher brendan@bywatersolutions.com
(cherry picked from commit 7ce721ebef)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit 7ee6148166)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2016-03-15 09:26:12 +01:00
Aleisha cf9ab25656 Bug 13474: Adding untranslatable log actions to viewlog.tt
Added 'Run'

Signed-off-by: Aleisha <aleishaamohia@hotmail.com>

(Amended to remove tab chars to make qa tools happy)
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
(cherry picked from commit 4c87b50ac3)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit 955c245684)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2016-03-15 09:25:15 +01:00
Owen Leonard 6e2e638949 Bug 15881 - Serials new numbering pattern link should be a toolbar button
This patch converts the "new numbering pattern" link to a
Bootstrap-styled toolbar button for consistency with other pages in
Koha. This patch also includes minor markup corrections:

- Standardizing on the phrase "Numbering patterns" by eliminating the
  occasional use of "number patterns."
- Removing mistaking closing slash on <select>
- Using standard "Cancel" link instead of a button.
- Adding a colon and space after labels.
- Fixing of "no existing patterns" message.

To test, apply the patch and go to Serials -> Numbering patterns

- Confirm that the "New numbering pattern" button looks correct and
  works correctly.
- Confirm that the entry form looks correct and that the cancel link
  works as expected.

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
(cherry picked from commit 0058a977c6)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit 54d3ee5758)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2016-03-15 09:22:04 +01:00
Owen Leonard 390e106781 Bug 15880 - Serials new frequency link should be a toolbar button
This patch converts the "new frequency" link to a Bootstrap-style
toolbar button in order to maintain consistency. Also included in this
patch are some other minor markup corrections:

- A colon and space after labels
- A 'Cancel' link instead of a button.
- "Required" classes for a required field.

To test, apply the patch and go to Serials -> Manage frequencies.

- Test the "New frequency" button
- Confirm that the changes to the entry form look correct.

Followed test plan, displays 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
(cherry picked from commit 3b838ac251)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit 3b15abed9b)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2016-03-15 08:55:27 +01:00
Jonathan Druart e6fad0c786 Bug 15833: item.biblioitemnumber returns a biblioitem DBIx::Class object
2 links are wrong on the renew page, because item.biblioitemnumber does
not return the biblioitemnumber as expect the template.

Test plan:
Renew an item and check the item link.
It should contain a valid biblioitemnumber for the 'bi' parameter.

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

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Link repaired. At first glance, I am wondering if biblioitemnumber is
of actual use here; is it only passed back and forth between script and
template?

Signed-off-by: Brendan Gallagher brendan@bywatersolutions.com
(cherry picked from commit 1302f91755)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit e339492974)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2016-03-15 08:54:29 +01:00
Owen Leonard e7604dd4b8 Bug 15790 - Don't delete a MARC framework if existing records use that framework
If a MARC framework is in use by any records it should not be possible
to delete it. Deleting a framework which is in use will leave the
deleted framework code in those records.

This patch modifies the deletion confirmation dialog so that it will not
let the user confirm the deletion if there are records using it.

To test, apply the patch and go to Administration -> MARC frameworks

1. Try to delete a framework which is in use by 1 or more records. The
   resulting confirmation dialog should prevent you from proceeding.
2. Try to delete a framework which is not in use. Test both canceling
   and confirming that deletion to make both function correctly.

Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit 18820b6c8f)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2016-03-15 08:54:29 +01:00
Owen Leonard 9fc70f8a0c Bug 15691: Show card number minimum and maximum in visible hint when adding a patron
The CardnumberLength system preference defines card number minimum and
maximum allowed values when adding a patron. This information is
currently hidden in a title attribute on the card number input field.

This patch moves the information into a <div class="hint">, matching
other fields in the entry form which offer details about entry
guidelines.

To test, apply the patch and open the new patron entry form. Test for
various values of CardnumberLength, and with 'cardnumber' mandatory or
not mandatory as defined in BorrowerMandatoryField.

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

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

Signed-off-by: Brendan Gallagher brendan@bywatersolutions.com
(cherry picked from commit 9f172a3c1b)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit 276b59e5bc)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2016-03-15 08:54:29 +01:00
Jonathan Druart bfd565089e Bug 15674: Make "Column visibility" translatable
The "Column visibility" text button was not translatable, now it is.

Test plan:
1/ Update the template for a given language and translate the "Column
visibility" string
2/ Go on admin/currency.pl
=> The string should be translated.

Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit 2c186dd5a0)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2016-03-15 08:54:29 +01:00
Jonathan Druart d2111ff7cf Bug 15605: Remove the cursor:pointer style.
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Brendan Gallagher brendan@bywatersolutions.com
(cherry picked from commit effe1e2781)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit 8d58579d6b)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2016-03-15 08:54:28 +01:00
Natasha cef4759604 Bug 15605 - Accessibility: Can't tab to add link in serials routing list add user popup
To Test -
1. Go to Serials and search for a title and then click on it.
2. Click routing list and then Add recipients.
3. Search for a patron.
4. Using the tab key try to navigate onto the Add link.
5. Notice it skips Add.
6. Apply the patch and then repeat steps 1-4, notice the Add link can now be accessed through using the keyboard.

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
(cherry picked from commit c76549dd7b)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit da966cef92)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2016-03-15 08:54:28 +01:00
Jonathan Druart ce80123c2f Bug 14244: Does not display patron's info in the checkout history if not authorised
The librarian needs CAN_user_circulate_circulate_remaining_permissions
to see the checkouts patron's information.

Test plan:
The "Patron" column of the checkout history page should only be
displayed of you have the circulate > circulate_remaining_permissions
permission.

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

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

Signed-off-by: Brendan Gallagher brendan@bywatersolutions.com
(cherry picked from commit 818b187151)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit fd65d2264e)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2016-03-15 08:54:28 +01:00
Thomas Misilo fd51df2ccf Bug 14244: viewing a bib item's circ history requires circulation permissions
On issuehistory.pl you have:

 flagsrequired   => { circulate => "circulate_remaining_permissions" },

But that really doesn't make sense. People should be able to view the history of circulation without having permission to circulate items themselves

This patch changes the required permissions from circulate to catalogue.

Test Plan:
1. Login as user without the circulate_remaining_permissions
2. Attempt to view Circulation History of an Item
3. Does not work
4. Apply Patch
5. Attempt to view circulation history with a user that has access to the staff side.
6. Can view circulation history now

Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Marc Véron <veron@veron.ch>

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

Signed-off-by: Brendan Gallagher brendan@bywatersolutions.com
(cherry picked from commit e8c5fb11fb)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit a835060b9c)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2016-03-15 08:54:28 +01:00
Frédéric Demians f019897718 Bug 15736 DB rev 3.20.09.001 2016-03-15 08:54:21 +01:00
Kyle M Hall 56f83da393 Bug 15736 [QA Followup] - Make add more details to the syspref description
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>

Signed-off-by: Brendan Gallagher brendan@bywatersolutions.com
(cherry picked from commit f92ef6207b)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit 59d2298865)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2016-03-15 07:48:13 +01:00
Jonathan Druart 7827be93a7 Bug 15736: Add ShowAllCheckins pref to control the display of checked-in item list on checking
Bug 14821 removed the items which were not checked out, but some
libraries considered it as a bug.
So let's add a new pref to control this behavior.

Test plan:
0/ Execute the updatedb entry and set ShowAllCheckins to "Do not show"
(default)
1/ Check an item in.
If the item was not checked out, it won't be listed
2/ Turn the pref to "Show"
3/ Check an item in
If the item was not checked out, it should be listed

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

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

Signed-off-by: Brendan Gallagher brendan@bywatersolutions.com
(cherry picked from commit ce6c3bb88b)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit 21ebaf949e)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2016-03-15 07:47:48 +01:00
Julian Maurice 7edf8ec28b Bug 15998 - svc/holds: use holdingbranch instead of holding_branch
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
2016-03-09 12:13:00 +01:00
Frédéric Demians 87db809936 Version 3.20.9 2016-03-01 18:05:08 +01:00
Frédéric Demians 8ce3e5dbae Translations for 3.20.9 2016-03-01 17:59:56 +01:00
Mark Tompsett 47c6719f27 Bug 15795: C4/Members.pm is floody (Norwegian Patron DB)
From the mailing list:
"I'm working on 3.22.02 and my logs are FILLED with the following warnings:

Members.pm: Unable to load Koha::NorwegianPatronDB at /blurred/C4/Members.pm line 46., referer: http://blurred/cgi-bin/koha/acqui/booksellers.pl
admin-home.pl: Unable to load Koha::NorwegianPatronDB at /blurred/C4/Members.pm line 46., referer: http://blurred/cgi-bin/koha/admin/preferences.pl"

I agree. Looking at C4/Members.pm other warns are all prepended with $debug.

TEST PLAN
---------
1) rm Koha/NorwegianPatronDB.pm
   -- quickest and dirtiest way to get the load to fail.
2) echo > ~/koha-dev/var/log/koha-error_log
   -- so it will be easy to spot the log changes.
   -- back up the log file if you really want it.
3) log into the staff client and go to patrons.
   -- Check the log file. "Unable to load ..." will be there.
4) echo > ~/koha-dev/var/log/koha-error_log
5) sudo vi /etc/apache2/sites-enabled/{your koha site file}
   -- Find your staff client entry in your apache
      configuration file and add:
       SetEnv DEBUG 1
6) sudo service apache2 restart
7) apply the patch
8) refresh the patron page
   -- "Unable to load..." will still be there.
9) change the DEBUG value in your apache config to 0
10) sudo sevice apache2 restart
11) echo > ~/koha-dev/var/log/koha-error_log
12) refresh the patron page
    -- "Unable to load..." will NOT be there.
13) git checkout origin/master -- Koha/NorwegianPatronDB.pm
    -- to bring it back.
14) refresh the patron page
    -- "Unable to load..." will still not be there.
15) run koha qa test tools

Signed-off-by: Philippe Blouin <philippe.blouin@inlibro.com>
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>

Signed-off-by: Brendan Gallagher brendan@bywatersolutions.com
(cherry picked from commit b52cbecbfd)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit 410b567a4c)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2016-03-01 15:46:42 +01:00
Gus f13b3d5a95 Bug 15622 - Spelling mistake in printfeercpt.pl writen -> written
Search the file for writen, when not found change sucsessful

Signed-off-by: Mirko Tietgen <mirko@abunchofthings.net>
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>

Signed-off-by: Brendan Gallagher brendan@bywatersolutions.com
(cherry picked from commit fdd66bc830)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit 71e8855f1e)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2016-03-01 15:46:09 +01:00
Aleisha aa35dbb2fc Bug 15416: Warns on guided_reports.pl
Initialising $phase variable to be '' if not defined.

To test:
1) Go to Reports -> Guided Reports Wizard
2) Notice warns
3) Apply patch
4) Refresh page
5) Confirm warns are gone and page still works as it should

Signed-off-by: Hector Castro <hector.hecaxmmx@gmail.com>
Warns are gone. Page still works as expected

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Amended patch:
-my $phase = $input->param('phase');
-$phase //= '';
+my $phase = $input->param('phase') // '';

Signed-off-by: Brendan Gallagher brendan@bywatersolutions.com
(cherry picked from commit 17c7c685f1)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit fef0f0c367)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2016-03-01 15:45:35 +01:00
Julian Maurice 559a8dbb59 Bug 15743: Allow plugins to embed Perl modules
This patch allows plugins to embed Perl modules by ignoring Perl modules
in plugins directory that don't inherit from Koha::Plugins::Base

TEST PLAN
---------
1) Edit koha-conf.xml to have enable_plugins set to 1, and
   the pluginsdir set to a particular path.
2) Create a dummy plugin file. (e.g. {that path}/Koha/Plugin/Kaboom.pm)

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

Signed-off-by: Brendan Gallagher brendan@bywatersolutions.com
(cherry picked from commit 2a43195322)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit 5f96cbd933)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2016-03-01 15:41:14 +01:00
Marcel de Rooy fe690be6b6 Bug 15652: Allow current date in datepicker on opac-reserve
If you enable AllowHoldDateInFuture (and its OPAC variant), you get
an additional "Hold starts on date". In that field and in "Hold not
needed after" it was not possible to enter the current date.

Although it does not really make any difference if you leave the startdate
empty or put the current date in it, we concluded that it still makes
a psychological difference. Some patrons were confused when placing a
hold because the first date to select was tomorrow. Instead of telling
them "Yes, but you can leave it empty", we should just allow the current
date as well.

The expiration date ("not needed after") also started on tomorrow. (This
field can really be empty.) But there is actually no reason not to allow
today here too. If the patron only wants it today, why force tomorrow?

How is this arranged? Well, this is one of the simplest Koha patches ever
written. It only changes the minDate option of both date pickers in one
line from 1 to 0.

Test plan:
[1] Allow future hold dates via systempreferences.
[2] Verify that you can enter today in both fields.
[3] Put today in start and expiration date. Place the hold and verify that
    you can confirm the hold, check out and check in again.

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 Gallagher brendan@bywatersolutions.com
(cherry picked from commit 904a358da3)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit ae2c66c601)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2016-03-01 15:40:44 +01:00
Juan Romay Sieira c18f4e3c29 Bug 11937 - opac link doesn't open in new window
Signed-off-by: Juan Romay Sieira <juan.sieira@xercode.es>

Patch works as expected. From a biblio detail page, the link
'OPAC view: Open in new window' opens a new browser window.
Signed-off-by: Marc Veron <veron@veron.ch>

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

Signed-off-by: Brendan Gallagher brendan@bywatersolutions.com
(cherry picked from commit d1ead7313c)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit e6cab05555)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2016-03-01 15:39:14 +01:00
Jonathan Druart 8c94406111 Bug 15746: Same fix for "write off"
Same fix as before for the "Write off" button next to the "Pay" button.

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

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

Signed-off-by: Brendan Gallagher brendan@bywatersolutions.com
(cherry picked from commit efad45a0e3)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit 9973f0e986)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2016-03-01 15:36:58 +01:00
Jonathan Druart 7212c515ac Bug 15746: Do not record individual payments with randomly picked libraries
When a payment is made individualy, the library used to record this
payment is randomly picked from the library list.
This is because C4::Branch::GetBranch looks at 1. the $branch variable
sent by the template, wich does not exist, then 2. the branchname
cookie, which does not exist neither, then 3. get the first branchcode
from a list of keys (non ordered).

To reproduce:
- Create a manual invoice for a patron
(members/maninvoice.pl?borrowernumber=XXXX)
- Pay this fine using the "Pay" button of the corresponding line from
  the members/pay.pl?borrowernumber=XXXX page
Look at the statistics table:
select * from statistics order by datetime desc limit 10;

The branch value of the first line might not correspond to the library
you were using to pay the payment.

Test plan:
Apply this patch, repeat the steps above and confirm that the library
picked is now the one used to pay.

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

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

Signed-off-by: Brendan Gallagher brendan@bywatersolutions.com
(cherry picked from commit 80a690588c)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit f2c6d5ad4f)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2016-03-01 15:36:44 +01:00
Kyle M Hall 841642e77c Bug 15742 [QA Followup] - Tidy script
Script does not appear to have any other modifying patches at this
time based on bz splitter. This is a perfect time to clean up this
script!

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

Signed-off-by: Brendan Gallagher brendan@bywatersolutions.com
(cherry picked from commit 0277c545b0)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit 63230f6bfe)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2016-03-01 15:36:04 +01:00
Jonathan Druart c891576cfc Bug 15742: Remove unnecessary loop in j2a cronjob
If no branchcode is given, all the libraries are retrieved and the same
query (so without using the libraries loop) is executed for each
library.

Test plan:
Use the j2a.pl cronjob to change the category of a child patron
If a branchcode is passed to the script, only the children from this
branchcode should be updated.
But if it is not passed, all children of the DB should be updated.

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

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

Signed-off-by: Brendan Gallagher brendan@bywatersolutions.com
(cherry picked from commit cf04724789)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit 93c5535eb5)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2016-03-01 15:35:40 +01:00
Frédéric Demians 705b67016a Bug 15517 Fix test for 3.20 2016-03-01 15:02:18 +01:00
Brendan Gallagher 3ca00cdaac Bug 15517: Update DB rev (3.20.08.004)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit e06c67044e)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2016-03-01 15:01:09 +01:00
Jonathan Druart 7dd1ba3053 Bug 15517: Change wording for tests
Signed-off-by: Brendan Gallagher brendan@bywatersolutions.com
(cherry picked from commit 100d800060)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit 9329290fc5)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2016-03-01 14:57:09 +01:00
Jonathan Druart e62d542914 Bug 15517: deleted* tables won't never differ anymore!
These tests will ensure that the 4 deleted* tables won't never differ
anymore.

Test plan:
0/ Do not execute the update DB entry
1/ prove t/db_dependent/db_structure.t
should fail
2/ Execute the update DB entry and update the schema with
misc/devel/update_dbix_class_files.pl
3/ prove t/db_dependent/db_structure.t
should now be happy

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

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

Signed-off-by: Brendan Gallagher brendan@bywatersolutions.com
(cherry picked from commit 8b2573e24e)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit 3a64f9c847)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2016-03-01 14:56:32 +01:00