koha.git
9 years agoBug 13144: Google transliteration does not work on bootstrap
Amit Gupta [Tue, 4 Nov 2014 16:03:36 +0000 (21:33 +0530)]
Bug 13144: Google transliteration does not work on bootstrap

To Test:
Use Google Indic Transliteration API to allow users to
transliterate english typed words into Indic languages.
http://git.koha-community.org/gitweb/?p=koha.git;a=commit;h=6ae7b60962e7d07aa00a45a7af692939a4ce7aa6

Signed-off-by: Frederic Demians <f.demians@tamil.fr>
I had been able to reproduce the bug (a regression), and I can confirm that
this patch fix it. But I had to create manualy GoogleIndicTransliteration
system preference, which doesn't exist in standard .pref file. It may be
necessary to add it. In my opinion, it shouldn't prevent to include this patch.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Fixes a somewhat 'hidden' feature, no problems found.

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
9 years agoBug 11425: Update DBIx
Tomas Cohen Arazi [Wed, 5 Nov 2014 11:32:14 +0000 (08:32 -0300)]
Bug 11425: Update DBIx

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
9 years agoBug 11425: (maniac followup) remove diag from tests
Tomas Cohen Arazi [Tue, 4 Nov 2014 22:22:07 +0000 (19:22 -0300)]
Bug 11425: (maniac followup) remove diag from tests

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
9 years agoBug 11425: (followup) fix number of tests
Tomas Cohen Arazi [Tue, 4 Nov 2014 22:20:34 +0000 (19:20 -0300)]
Bug 11425: (followup) fix number of tests

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
9 years agoBug 11425: DBRev 3.17.00.046
Tomas Cohen Arazi [Tue, 4 Nov 2014 22:19:02 +0000 (19:19 -0300)]
Bug 11425: DBRev 3.17.00.046

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
9 years agoBug 11425 [Template follow-up] Search form for items
Owen Leonard [Wed, 29 Oct 2014 13:48:39 +0000 (09:48 -0400)]
Bug 11425 [Template follow-up] Search form for items

This template followup makes several changes to markup and text:

- Replace "Bibliographic reference" with "Title"
- Replace "Callnumber" with "Call number"
- Replace "Home branch" with "Home library"
- Replace "Holding branch" with "Current location"
- Replace "Location" with "Shelving location"
- Replace "Issues" with "Checkouts"
- Replace "Indifferent" with "Ignore"
- Replace "&" with "&amp;" where necessary
- Correct page title and breadcrumbs
- Remove label "for" attribute from labels which do not directly target
  a form field
- Correct label "for" attribute on labels which should target a form
  field
- Correct date format hint

This patch also makes one change to the way the page display works:

The search results section is now in a separate div which uses a
different grid rule, allowing it to take up the full width of the
screen. To keep the page headers from looking weird I've changed the
markup so that each section has its own header.

To test, perform a variety of searches and confirm that the output in
both Screen and CSV views looks correct.

Confirm that search results which are output to the screen are formatted
nicely and that the "edit search" links work correctly to show the
search form. Submitting a new search after editing a search should hide
the form and redisplay the search results table.

Followed test plan, works as expected.
Signed-off-by: Marc Véron <veron@veron.ch>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works as described, improves display.

9 years agoBug 11425 [QA Followup] - Fix number of unit tests
Kyle M Hall [Fri, 24 Oct 2014 13:17:15 +0000 (09:17 -0400)]
Bug 11425 [QA Followup] - Fix number of unit tests

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
9 years agoBug 11425: Display location label instead of code
Julian Maurice [Wed, 23 Jul 2014 08:49:01 +0000 (10:49 +0200)]
Bug 11425: Display location label instead of code

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Minor conflicts solved
Last three patches signed
No koha-qa errors.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
9 years agoBug 11425: QA fixes
Julian Maurice [Tue, 6 May 2014 14:34:38 +0000 (16:34 +0200)]
Bug 11425: QA fixes

- Reword 'joker' to 'wildcard'
- Explain what wildcards do
- Reword 'Modify' to 'Edit'

Also fix jQuery plugin columnFilter path

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
9 years agoBug 11425: Get column names using DBIX
Jonathan Druart [Wed, 16 Apr 2014 10:25:23 +0000 (12:25 +0200)]
Bug 11425: Get column names using DBIX

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
9 years agoBug 11425: Add filter on items.notforloan column
Julian Maurice [Tue, 25 Mar 2014 10:26:26 +0000 (11:26 +0100)]
Bug 11425: Add filter on items.notforloan column

and display the 'Processing ...' box when datatables is loading new
data.

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Nice box

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
9 years agoBug 11425: Add unit tests
Julian Maurice [Fri, 29 Nov 2013 10:34:46 +0000 (11:34 +0100)]
Bug 11425: Add unit tests

package Koha::Item::Search::Field
function C4::SQLHelper::GetColumns
function C4::Items::SearchItems

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Tests run without error

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
9 years agoBug 11425: Add item search form in staff interface
Julian Maurice [Thu, 4 Jul 2013 14:52:58 +0000 (16:52 +0200)]
Bug 11425: Add item search form in staff interface

Item search is available at catalogue/itemsearch.pl (link is in
catalogue/search.pl)
It only uses SQL (not Zebra)
* Use DataTables and server-side processing to be able to filter on
  individual columns after the first search is done.
* Allow to export results in CSV
* With Javascript disabled, search form still works (and CSV export too)

There is the possibility to define "Custom search fields" in a new admin
page admin/items_search_fields.pl (link is in admin/admin-home.pl)
A custom item search field is defined by:
* a name: its unique identifier
* a label: the text displayed to the user
* a MARC field/subfield: the field/subfield to query (it uses
  ExtractValue)
* an authorised values list (optional): if defined the list is displayed
  in the search form

New Perl dependency: Template::Plugin::JSON::Escape

Test plan:
1/ Apply the patch and run updatedatabase.pl
2/ Go to advanced search (staff interface), then click on "Go to item
search"
3/ Play with the search form! :)
In the 3rd fieldset you can add as many fields as you want and combine them with
boolean operators (AND, OR). You can use SQL jokers characters (%, _)
You can output to screen (in a DataTables table) or to a CSV file.
4/ In the DataTables table, play with filters and try sorting columns.
5/ Disable Javascript (with Firefox: extensions NoScript or YesScript,
or in about:config 'javascript.enabled' = false
6/ Reload the search page and do some searches on screen output. (there
is no sorting or filtering features, but there is still pagination)
7/ Try again CSV output.
8/ You can re-enable Javascript.
9/ Go to Administration > Items search fields
10/ Add a new field. Example for title (in UNIMARC):
  Name: title
  Label: Title
  MARC field: 200
  MARC subfield: a
  Authorised values category: None
(add another field with an authorised values category to see the
difference).
11/ As you are there try to update and delete some fields.
12/ Go back to items search form. You can see in the 3rd fieldset that
your fields have appeared in the selects.
13/ Try searching on them.
14/ I think you're done :)

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Work as described. Good new option.
No koha-qa errors

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
9 years agoBug 11126: DBRev 3.17.00.045
Tomas Cohen Arazi [Tue, 4 Nov 2014 22:00:54 +0000 (19:00 -0300)]
Bug 11126: DBRev 3.17.00.045

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
9 years agoBug 11126: (RM followup) remove diags from tests
Tomas Cohen Arazi [Tue, 4 Nov 2014 21:59:42 +0000 (18:59 -0300)]
Bug 11126: (RM followup) remove diags from tests

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
9 years agoBug 11126: qa follow-up
Jonathan Druart [Fri, 10 Oct 2014 18:53:50 +0000 (20:53 +0200)]
Bug 11126: qa follow-up

- use Modern::Perl;
- fix a typo
- remove an old comment

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
9 years agoBug 11126 [QA Followup] - Make reserves returned by _Findgroupreserve sorted by priority
Kyle M Hall [Mon, 24 Feb 2014 16:32:39 +0000 (11:32 -0500)]
Bug 11126 [QA Followup] - Make reserves returned by _Findgroupreserve sorted by priority

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
9 years agoBug 11126 - Make the holds system optionally give precedence to local holds
Kyle M Hall [Wed, 23 Oct 2013 15:58:34 +0000 (11:58 -0400)]
Bug 11126 - Make the holds system optionally give precedence to local holds

This feature will allow libraries to specify that, when an item is returned,
a local hold may be given priority for fulfillment even though it is
of lower priority in the list of unfilled holds.

This feature has three settings:
* LocalHoldsPriority, which enables the feature
* LocalHoldsPriorityPatronControl, which selects for either tha patron's
  home library, or the patron's pickup library for the hold
* LocalHoldsPriorityItemControl, which selects for either the item's
  holding library, or home library.

So, this feature can "give priority for filling holds to
patrons whose (home library|pickup library) matches the item's
(home library|holding library)"

Test Plan:
1) Apply this patch
2) Run t/db_dependent/Holds/LocalHoldsPriority.t

Signed-off-by: Joel Sasse <jsasse@plumcreeklibrary.net>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
9 years agoBug 13170 Remove of prog theme broke the OPAC's "view plain" option for MARC details
Frédéric Demians [Sun, 2 Nov 2014 07:59:30 +0000 (08:59 +0100)]
Bug 13170 Remove of prog theme broke the OPAC's "view plain" option for MARC details

In the OPAC if you view the MARC details for a title (and have
OPACXSLTDetailsDisplay enabled) there is a "view plain" link which displays the
output of opac-showmarc.pl. This is broken in master: fixed by this patch.

Test plan:

(1) Set OPACXSLTDetailsDisplay to default
(2) Do a search on OPAC, then display a specific biblio record
(3) Click on MARC view tab. Then click on 'view plain' link. Nothing is
    displayed.
(4) Apply the patch. And refresh the MARC detail page.
(5) Click on 'view plain' link. Check that a plain text MARC record is
    displayed.

Signed-off-by: Chris <chris@bigballofwax.co.nz>
Note: This makes a small change to C4::Templates::themelanguage so that
it works with .xsl files too (They live in the xslt dir)

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works as described, passes tests and QA script.

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
9 years agoBug 10860: (RM followup) checkout-related sysprefs belong to the checkouts section
Tomas Cohen Arazi [Mon, 3 Nov 2014 14:53:33 +0000 (11:53 -0300)]
Bug 10860: (RM followup) checkout-related sysprefs belong to the checkouts section

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
9 years agoBug 13184 - Circulation template problems if OnSiteCheckouts is off but OnSiteCheckou...
Owen Leonard [Fri, 31 Oct 2014 18:00:23 +0000 (14:00 -0400)]
Bug 13184 - Circulation template problems if OnSiteCheckouts is off but OnSiteCheckoutsForce is on

Checks in the circulation template for on-site checkouts preferences did
not take into account the possibility that someone might have
accidentally turned OnSiteCheckouts off but left OnSiteCheckoutsForce
turned on. This patch amends the template logic so that it works
correctly for various combinations of settings.

To test, apply the patch and test the following combinations of
circumstances.

Testing using both a patron who is blocked (expired, restricted, etc)
and a patron who is not blocked, test with...

1. OnSiteCheckouts is on, OnSiteCheckoutsForce is on
2. OnSiteCheckouts is off, OnSiteCheckoutsForce is on
3. OnSiteCheckouts is off, OnSiteCheckoutsForce is off
4. OnSiteCheckouts is on, OnSiteCheckoutsForce is off

Confirm that the checkout form is shown or not shown correctly according
to the preferences you have set. Confirm that the "Only on-site
checkouts are allowed" message is only shown in case #1.

Note: This patch includes whitespace changes, so please diff
accordingly.

Signed-off-by: Nick Clemens <nick@quecheelibrary.org>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Tested on top of 10860 and 13179.
Works as described, adding more checks in the templates.

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
9 years agoBug 13179 - Circulation page layout problem when OnSiteCheckoutsForce is enabled
Owen Leonard [Fri, 31 Oct 2014 15:50:35 +0000 (11:50 -0400)]
Bug 13179 - Circulation page layout problem when OnSiteCheckoutsForce is enabled

The circulation page layout needs to work correctly for various
combinations of restrictions, no restrictions, and restrictions with
OnSiteCheckoutsForce enabled. This patch makes some minor accomodation
for all.

To test, load a patron for checkout under the following conditions:

1. OnSiteCheckoutsForce and patron is not blocked from checkout
2. OnSiteCheckoutsForce is off, patron is blocked from checkout (for
   being expired or restricted).
3. OnSiteCheckoutsForce is on and patron is not blocked from checkout
4. OnSiteCheckoutsForce is on and patron is blocked from checkout

The page layout should look correct for all these cases, with a clean
two-column layout of [ checkout form | messages ] in all cases except

Signed-off-by: Brendan Gallagher <brendan@bywatersolutions.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Applied on top of 10860. Works as described.

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
9 years agoBug 10860: Update DBIx
Tomas Cohen Arazi [Mon, 3 Nov 2014 14:21:19 +0000 (11:21 -0300)]
Bug 10860: Update DBIx

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
9 years agoBug 10860: DBRev 3.17.00.044
Tomas Cohen Arazi [Mon, 3 Nov 2014 13:36:01 +0000 (10:36 -0300)]
Bug 10860: DBRev 3.17.00.044

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
9 years agoBug 10860 [QA Followup] - Use Koha.Preference
Kyle M Hall [Fri, 31 Oct 2014 09:31:24 +0000 (05:31 -0400)]
Bug 10860 [QA Followup] - Use Koha.Preference

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
9 years agoBug 10860: Follow-up - fix some template variable issues
Katrin Fischer [Thu, 30 Oct 2014 19:33:35 +0000 (20:33 +0100)]
Bug 10860: Follow-up - fix some template variable issues

Fixing some simple display issues caused by missing/misnamed
variables, probably consequence of the renaming before.

Amended test plan:
- Make sure that if OnSiteCheckoutsForce is set, you can
  still perform onsite checkouts and only those.
- Check the detail page in staff says *currently in local use by*
  for an on-site checked out item
- Check the detail page in OPAC with OPACShowCheckoutName active
  for the same.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
9 years agoBug 10860 [QA Followup] - Rename system preferences
Kyle M Hall [Thu, 30 Oct 2014 15:07:50 +0000 (11:07 -0400)]
Bug 10860 [QA Followup] - Rename system preferences

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
9 years agoBug 10860: Follow-up - staff reading record
Katrin Fischer [Wed, 29 Oct 2014 23:10:00 +0000 (00:10 +0100)]
Bug 10860: Follow-up - staff reading record

- capitalization fix "Checked out"
- display new tabs only when feature is activated
- fixes a qa script complaint about POD in Items.pm

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
9 years agoBug 10860 [QA Followup] - Fix misc issues
Kyle M Hall [Wed, 22 Oct 2014 06:18:03 +0000 (02:18 -0400)]
Bug 10860 [QA Followup] - Fix misc issues

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
9 years agoBug 10860 - Change "in-house use" to "on-site checkout"
Kyle M Hall [Wed, 22 Oct 2014 05:04:25 +0000 (01:04 -0400)]
Bug 10860 - Change "in-house use" to "on-site checkout"

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
9 years agoBug 10860: In-House Use
Jonathan Druart [Wed, 18 Sep 2013 12:16:49 +0000 (14:16 +0200)]
Bug 10860: In-House Use

This patch implements the In-House Use feature for Koha.

It adds:
- 2 new sysprefs:
  'In-House Use' to enable/disable this feature
  'In-House Use Forced' to enable/disable the feature for *all* users.
- 2 new columns issues.inhouse_use and old_issues.inhouse_use
- Datatable on the circulation history pages (readingrec) at the OPAC
  and the intranet.

A new checkbox in the Circulation tab. If checked, the issue become a
in-house use (in the statistics and issues tables).
When you check it, the due date changes to the today date.

The syspref "In-House Use Force" allows to force the in-house use to
permit the checkout even if the borrower is debarred or others problems.

In the issue table, a new string (in red) marks the issue as "in-house use".

The circulation history contains 3 tabs : "all", "checkout" and
"in-house use" (OPAC and intranet).

The cronjob script:
If AutomaticItemReturn if off, a library would like not to do a transit
operation manually. This script (to launch each night) do returns
for a specific branches.

Test plan:
1/ Execute the updatedatabase entry
2/ Enable the 'In-House Use' pref.
3/ Checkout a biblio for a patron and check the 'in-house use' checkbox.
4/ Check that the due date is the today date (with 23:59) and is not modifiable.
5/ Click on the check out button and check that the new check out
appears in the table bellow with the "(In-house use)" string.
6/ Go on the circulation history pages (readingrec and opac-readingrec)
and try the 3 tabs. In the last one, your last checkout should appear.
7/ Check in.
8/ Check readingrec pages.
9/ Choose a debarred patron and check that you cannot checkout a biblio
for him.
10/ Switch on the 'In-House Use Forced' pref
11/ You are now allowed to checkout a biblio for the debarred patron.

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
9 years agoBug 13011: 0000-00-00 should not be considered as a valid date
Jonathan Druart [Tue, 30 Sep 2014 09:36:39 +0000 (11:36 +0200)]
Bug 13011: 0000-00-00 should not be considered as a valid date

When parsing the letter content, the 0000-00-00 should not be replaced,
it's not a valid date.

Test plan:
  prove t/db_dependent/Suggestions.t
should not return the following error:
0000-00-00 seems to be a date but an error occurs on generating it (The
'month' parameter ("0") to DateTime::new did not pass the 'an integer
between 1 and 12' callback

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Adds another check for 0000-00-00.
Passes tests and QA script.

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
9 years agoBug 13169: C4::Templates::themelanguage fails if the DB is not populated
Tomas Cohen Arazi [Fri, 31 Oct 2014 14:00:22 +0000 (11:00 -0300)]
Bug 13169: C4::Templates::themelanguage fails if the DB is not populated

With the aim to remove hardcoded themes the C4::Templates::themelanguage
got dependent on the DB being populated. This patch reintroduced the
hardcoded defaults as a last resort.

To test:
- Do a fresh install, clean your browser's cache, empty DB
- Open the staff interface
=> FAIL: A "Software error" screen shows "Template process failed: file error..."
- Apply the patch
- Reload
=> SUCCESS: The webinstaller prompts for login correctly.
- Sign off :-D

Regards

Signed-off-by: Nick Clemens <nick@quecheelibrary.org>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
9 years agoBug 13163: NORMARC DOM config missing <id> entry
Tomas Cohen Arazi [Wed, 29 Oct 2014 00:07:43 +0000 (21:07 -0300)]
Bug 13163: NORMARC DOM config missing <id> entry

This patch fixes the biblio-koha-indexdefs.xml for NORMARC, so
it includes the <id> element.

Because of how our DOM files work, the resulting biblio-zebra-indexdefs.xsl
for NORMARC picked the whole MARC record as ID, so every time the record
was edited, the id wouldn't match and a new record was created.

To test:
- Have a MARCXML record
- run:
  $ xsltproc etc/zebradb/marc_defs/normarc/biblios/biblio-zebra-indexdefs.xsl the_record | less
=> FAIL: verify the z:id property on the <z:record> line contains all subfields concatenated
- Apply the patch
- re-run the xsltproc line
=> SUCCESS: z:id contains the 999$c number
- Sign off :-D

Regards

Signed-off-by: Frederic Demians <f.demians@tamil.fr>
Known bug with DOM: Without <z:id> indexing biblionumber Zebra hasn't it record
unique ID, and so fails to identify existing records. Works as described. 999$c
is linked to biblionumber in default Normarc framework.

Signed-off-by: Magnus Enger <magnus@enger.priv.no>
I have applied the patch to my production server, and at least one customer has
confirmed that it fixes the problem with multiple copies of records in search
results.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Passes tests and QA script, fix matches what we have for the other MARC flavours.

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
9 years agoBug 11714: A fund is a top-level fund if it does not have any parent
Jonathan Druart [Mon, 18 Aug 2014 12:48:01 +0000 (14:48 +0200)]
Bug 11714: A fund is a top-level fund if it does not have any parent

Signed-off-by: Paola Rossi <paola.rossi@cineca.it>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
9 years agoBug 11714 - GetBudgetHierarchy needs optimization
Fridolin Somers [Fri, 7 Feb 2014 16:59:01 +0000 (17:59 +0100)]
Bug 11714 - GetBudgetHierarchy needs optimization

The method C4::Budgets::GetBudgetHierarchy() retreives from database budgets in an array containing a tree of budgets (parent -> children -> children, ...).
The code generating this tree with the SQL results needs optimization because when a lot of budgets exists, it can run during several minutes.

This patch rewites the code using a recurive method.

Test plan :
- Create a active budget "MyBudget" with 1000
- Click "Add found" on this budget
- Create a found "Parent" with 1000, set you has owner
- Click "Add child found" on found "Parent"
- Create a found "Child" with 100, set you has owner
- Click "Add child found" on found "Child"
- Create a found "Grand-child" with 10, set you has owner
|
- Create a new acquisition basket
- Add a new order with "Child budget"
- Select "Child" found and set all costs to 2
- Save order
- Add a new order with "Grand-Child budget"
- Select "Child" found and set all costs to 2
- Save order
- Close basket
- Perform the receive of the two orders
|
- Go to founds of "MyBudget"
=> You see a table with 3 founds
- in "Fund filters", select no library and uncheck "Show my funds only" and click on "Go"
=> You see a table with "Parent" found
- Click on small arrow left of the fund code of "Parent"
=> You see a new line with "Child" found
- Click on small arrow left of the fund code of "Child"
=> You see a new line with "Grand-Child" found
|
=> You see in "Grand-Child" row "Base-level spent" = 2 and "Total sublevels spent" = 2
=> You see in "Child" row "Base-level spent" = 2 and "Total sublevels spent" = 4
This confirms the founds are used in a hierarchie.

Signed-off-by: Paola Rossi <paola.rossi@cineca.it>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
9 years agoBug 12958 [Alt. label follow-up] Set a fund owner to a fund hierarchy
Owen Leonard [Tue, 28 Oct 2014 12:49:47 +0000 (08:49 -0400)]
Bug 12958 [Alt. label follow-up] Set a fund owner to a fund hierarchy

This alternate follow-up modifies the text of the label to
(hopefully) make it more clear. The markup has been revised someone to
make it more standard, and a warning has been added about overwriting
existing data.

Signed-off-by: Frederic Demians <f.demians@tamil.fr>
Looks good.

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Works as described, passes tests and QA script.

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
9 years agoBug 12958: Set a fund owner to a fund hierarchy
Jonathan Druart [Thu, 18 Sep 2014 10:13:08 +0000 (12:13 +0200)]
Bug 12958: Set a fund owner to a fund hierarchy

This patch adds the ability to set an owner to a fund hierarchy
On editing a fund, if it has children, a new checkbox appears "Set this
owner to all children funds".
If checked, all the fund hierarchy will herit to this owner.
This will facilitate the fund owner modifications.

Test plan:
- Verify that the new checkbox only appears if the fund has at least a child.
- Create a consistent fund hierarchy, something like:
    fund1
      fund11
        fund111
      fund12
    fund2
      fund21
- Try to modify a fund owner without checking the checkbox. Verify the
  children have not been modified.
- Try to modify a fund owner with checking the checkbox. Verify all fund
  hierarchy has been modified.

Signed-off-by: Frederic Demians <f.demians@tamil.fr>
It works as announced.

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
9 years agoBug 12956: Users are not linked to a fund
Jonathan Druart [Thu, 18 Sep 2014 10:40:21 +0000 (12:40 +0200)]
Bug 12956: Users are not linked to a fund

When creating a fund, if you add some users, they are not linked to the
fund.
Note that it works if you link them when editing the fund.

Test plan:
- Try to link users to a fund on creating it.
- On editing, you should see the linked user list.

Signed-off-by: Nick Clemens <nick@quecheelibrary.org>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
9 years agoBug 12955: The "show my funds only" should be take into account
Jonathan Druart [Thu, 18 Sep 2014 10:25:26 +0000 (12:25 +0200)]
Bug 12955: The "show my funds only" should be take into account

The "Show my funds only" is not take into account if the checkbox is not
checked.
So there is no way to show all funds.
This has been introduced by bug 11578.

The default is not "only mine". The default is "show all funds".

Test plan:
- Create fund where you are the owner and others where you are not.
- Go on the fund list view and verify the checkbox "show my funds only"
  is take into account.

Signed-off-by: Brendan Gallagher <brendan@bywatersolutions.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Passes tests and QA script.

Note: In order to test this make sure you have funds owned by
another staff user.

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
9 years agoBug 13065 - Receive shipment error message incorrectly styled
Owen Leonard [Fri, 10 Oct 2014 13:04:27 +0000 (09:04 -0400)]
Bug 13065 - Receive shipment error message incorrectly styled

If there is an error during the receive shipment process the error
message is incorrectly styled. This patch fixes it.

To test you can trigger the error by accessing the page with incorrect
or missing parameters:

/cgi-bin/koha/acqui/parcels.pl?op=confirm

This should trigger the message. Apply the patch and confirm that the
error is now styled consistently with others in the staff client.

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Small template change, works as described.

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
9 years agoBug 643 [Template follow-up] Allow override of 'debarred' status
Owen Leonard [Wed, 29 Oct 2014 15:17:56 +0000 (11:17 -0400)]
Bug 643 [Template follow-up] Allow override of 'debarred' status

This minor followup makes two changes:

- Replaced instances of "Debarment" with "Restriction"
- Moved the override button into the block where the "View restrictions"
  button is, making the section slightly more compact.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Some small template changes, no problems found.

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
9 years agoBug 643: QA Followup - server-side verification of permissions
Mark Tompsett [Tue, 23 Sep 2014 14:12:12 +0000 (10:12 -0400)]
Bug 643: QA Followup - server-side verification of permissions

Only allow $force_allow=1 if the logged in user has permissions.

TEST PLAN
---------
Attempt to intentionally override the checkout by passing an
appropriately handcrafted URL.
-- Regardless of the force_allow value, it should be not allowed
   for those lacking the force_checkout permission.

NOTE: I didn't test this. I figured Marc Veron could do that. :)
      (Sorry, couldn't easily get git bz to work with the accent)

Signed-off-by: Nick Clemens <nick@quecheelibrary.org>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
9 years agoBug 643: Followup: Display override button only if issuing staff member has force_che...
Marc Véron [Tue, 29 Jul 2014 19:46:26 +0000 (21:46 +0200)]
Bug 643: Followup: Display override button only if issuing staff member has force_checkout permission

To test:
Apply first patch
Apply this patch
Log in as superlibrarian
Go to Home > Patrons > Set permissions for issuing staff member
Disable circulate - force_checkout
Log in as issuing staff member
Try to checkout to a debarred patron
=> should not be possible
Log in again as superlibrarian
Enable circulate - force_checkout for issuing staff member
Log in as issuing staff_member
Try to checkout to a debarred person
=> You should get the button 'Override debarment temporarily'

Signed-off-by: Aleisha <aleishaamohia@hotmail.com>
Signed-off-by: Nick Clemens <nick@quecheelibrary.org>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
9 years agoBug 643: Allow override of 'debarred' status
Pasi Kallinen [Thu, 22 May 2014 11:38:33 +0000 (14:38 +0300)]
Bug 643: Allow override of 'debarred' status

Add a button to temporarily override patron debarment.

To test:
1) Go to patron check out page
2) If patron has been debarred (eg. due to having fees),
   there is no way to check out to that patron.
3) Apply patch
4) A debarred patron check out page now has a button for
   "Override debarment temporarily" - clicking on it
   should allow checking out to that patron.

Signed-off-by: Aleisha <aleishaamohia@hotmail.com>
Rebased because patch did not apply

Signed-off-by: Aleisha <aleishaamohia@hotmail.com>
Signed-off-by: Nick Clemens <nick@quecheelibrary.org>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Tested with/without force_checkout and superlibrarian permission.
Also checked crafting a URL is no longer working.
No regressions found.

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
9 years agoBug 11876 [Unit test] Add a diff view to staged MARC Records
simith [Thu, 30 Oct 2014 16:40:57 +0000 (12:40 -0400)]
Bug 11876 [Unit test] Add a diff view to staged MARC Records

Unit test added

http://bugs.koha-community.org/show_bug.cgi?id=11876
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
9 years agoBug 11876: (qa-followup) some minor changes
Jonathan Druart [Thu, 25 Sep 2014 11:59:44 +0000 (13:59 +0200)]
Bug 11876: (qa-followup) some minor changes

- GetImportBiblios: prepare the query is useless here
- use Modern::Perl
- Remove useless indentation level in pl file and redirect to 404 if
  required params are not given.

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
9 years agoBug 11876 [Follow-up] Add a diff view to staged MARC Records
Owen Leonard [Thu, 14 Aug 2014 18:52:34 +0000 (14:52 -0400)]
Bug 11876 [Follow-up] Add a diff view to staged MARC Records

This follow up makes some corrections to the previously added files and
adds some functionality to the diff: A Javascript diff plugin highlights
the differences between the records in the two columns.

Corrections made: Converted tab indentation to spaces, corrected GPL
statement.

File organization: Moved showdiffmarc.pl and .tt to /tools/ to match the
location of the page with which it functions,
tools/manage-marc-import.pl. Corrected permissions on showdiffmarc.pl
accordingly.

Updates to the template: Added standard includes inclucing header menu
and breadcrumbs; converted custom layout to YUI Grid standard.

To test, follow the test plan previously defined:

- Stage a MARC record batch which contains at least one record match for
  something already in your catalog.
- Locate the staged MARC record batch in Tools -> Manage staged records
  and click to view the contents.
- Find the record which matched an existing record and click the "View"
  link in the Diff column.
- The compare screen should include the header menu and breadcrumbs. The
  differences between your staged file and the existing record should be
  higlighted.
- You should be able to return to the MARC batch you were previously
  viewing by following the link in the breadcrumbs or the link at the
  bottom of the page.
- Confirm that the "About" page includes information about the new
  JavaScript plugin on the Licenses tab.

Signed-off-by: Nick Clemens <nick@quecheelibrary.org>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
9 years agoBug 11876 - Ommited files in last patch
mbeaulieu [Thu, 7 Aug 2014 17:21:58 +0000 (13:21 -0400)]
Bug 11876 - Ommited files in last patch

I forgot to include these files in the last patch

new file:   tools/showdiffmarc.pl
new file:   koha-tmpl/intranet-tmpl/prog/en/modules/tools/showdiffmarc.tt

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
9 years agoBug 11876 - Add a diff view for staged MARC records.
mbeaulieu [Thu, 7 Aug 2014 17:10:26 +0000 (13:10 -0400)]
Bug 11876 - Add a diff view for staged MARC records.

New patch should apply correctly.

modified:   C4/ImportBatch.pm
modified:   koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tt

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Bug 11876 - Diff column is now displayed.

If a match is found, a 'View' link appears in the Diff column.

Old patch was not implementing datatables, and therefore was not compatible with this version of Koha.
modified:   koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tt
modified:   tools/batch_records_ajax.pl

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
These patches have some issues but I'm going to submit a follow-up which
I think will address them all and offer some improvements as well.

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
9 years agoBug 11517: Braille and combination swapped in XSLT result lists
Katrin Fischer [Mon, 1 Sep 2014 21:39:12 +0000 (23:39 +0200)]
Bug 11517: Braille and combination swapped in XSLT result lists

http://www.loc.gov/marc/bibliographic/bd007f.html

- Catalog a record:
  * 007 - choose 'Tactile material'
  * Pos. 1 - choose b = Braille or C = combination
  * Reindex!
  * Verify the result list shows the format correctly.

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Problem exist, fixed with this patch.
No koha-qa errors

Signed-off-by: Brendan Gallagher <brendan@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
9 years agoBug 12995 - script update_totalissues.pl stops on corrupted record - UT
Admin User Koha [Mon, 20 Oct 2014 13:05:23 +0000 (15:05 +0200)]
Bug 12995 - script update_totalissues.pl stops on corrupted record - UT

This patch adds an unit test on C4::Biblio::UpdateTotalIssues method
call on non existing record

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
I can't comment on the correctness of the test other than to say it ran
successfully.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Improves CLI script, works as described.

Note: A small improvement would be to output the problematic biblionumber.

9 years agoBug 12995 - script update_totalissues.pl stops on corrupted record
Admin User Koha [Mon, 20 Oct 2014 13:07:29 +0000 (15:07 +0200)]
Bug 12995 - script update_totalissues.pl stops on corrupted record

When running update_totalissues.pl cronjob, it will stop on a corrupted
record.

This patch changes UpdateTotalIssues so that it return 1 if processing
record has succeded. Also, if mapping with biblioitems.totalissues does
not exist, the method has nothing to do so it stops and returns 1.

When processing a corrupted record, script now alerts about the error on
this biblionumber (if script is verbose) and process next record.
A total number of records with error will be printed at the end of the
script.

Test plan :
- Create a dabase with a few biblios and some issues
- Modify first biblio record (use direct sql update) : set empty value
  in biblioitems.marcxml
- Launch script : misc/cronjobs/update_totalissues.pl --use-stats --commit=1000 -v

=> Without patch : the script stops at first record
=> With patch : the script prints error for first record and processes
   all records

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
I was able to confirm the problem before the patch and successfully
follow the test plan.

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
9 years agoBug 13164: Incorrect ISSN visualization on the normal view if invalid/cancelled ISSN...
Tomas Cohen Arazi [Wed, 29 Oct 2014 19:24:49 +0000 (16:24 -0300)]
Bug 13164: Incorrect ISSN visualization on the normal view if invalid/cancelled ISSN present

Currently, 022$z (and 011$z for UNIMARC) occurences are not shown, but the XSLT
logic used introduces punctuation characters for those $z occurences.

This patch adds a check for the existence of subfield a, and only loops
on $a subfields.

To test:
- Create/have a record with 022$z (or 011$z on UNIMARC) but no 022$a (no 011$a on UNIMARC).
- Open the detail page for the record (on both OPAC and staff).
=> FAIL: the ISSN label and ';' and '.' characters incorrectly shown.
- Repeat mixing with 022$a occurences to notice the bug.
- Apply the patch, reload
=> SUCCES: ISSN label shows only on the presence of a $a, and $z are skipped.
           no matter how many ISSN fields you add.
- Sign off :-D

Regards
To+

Signed-off-by: Frederic Demians <f.demians@tamil.fr>
Works as described on an UNIMARC DB. Mimics what's done for ISBN field.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
9 years agoBug 13141: (QA Followup) Update number of unit tests
Kyle M Hall [Fri, 24 Oct 2014 13:42:37 +0000 (09:42 -0400)]
Bug 13141: (QA Followup) Update number of unit tests

While updating the number of unit tests from 12 to 13,
the number of tests to skip due to a outdated version
of DBD::Mock was missed.

This patch retains the test number change, and corrects
the number of tests.

TEST PLAN
---------
1) prove -v t/db_dependent/ReportsGuided.t
   -- on an UBUNTU git (lacks DBD::Mock >= 1.45)
2) prove -v t/db_dependent/ReportsGuided.t
   -- on a DEBIAN git (has DBD::Mock >= 1.45)
3) compare results.
   -- skipped tests should be 8 (2 individual tests + 6 in the loop)
      under Ubuntu.
   -- non-skipped tests should align.
   -- everything should be 13 tests.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
9 years agoBug 13141: Add ability for biblio_framework to be a dropdown in Guided Reports
Mark Tompsett [Fri, 24 Oct 2014 04:20:29 +0000 (00:20 -0400)]
Bug 13141: Add ability for biblio_framework to be a dropdown in Guided Reports

By tweaking the GetReservedAuthorisedValues function in
C4::Reports::Guided, biblio_framework can be added as a dropdown
list into the guided reports parameters.

The change in C4/Reports/Guided.pm required a test, which is
found in t/db_dependent/ReportsGuided.t

Code was then added to reports/guided_reports.pl to build the
appropriate hash to trigger the proper dropdown list.

TEST PLAN
---------
1) Apply patch
2) prove -v t/db_dependent/ReportsGuided.t
   -- all should pass, this confirms that both
      C4/Reports/Guided.pm and this test file work.
3) Log into staff client
4) Reports
5) Create from SQL
6) Enter appropriate information like:
Report name: Test 13141
-- no need to change Report group or Report is public or Notes or Type
SQL:
SELECT CONCAT('<a href=\"/cgi-bin/koha/catalogue/detail.pl?biblionumber=',
     biblio.biblionumber,'\">',biblio.biblionumber,'</a>') AS
     BiblioNumbers, title, author, frameworkcode
FROM biblio
WHERE frameworkcode=<<Enter the frameworkcode|biblio_framework>>

7) Save report
8) Run report
   -- The parameter entry page should have a drop down of
      framework codes.
9) Select a framework code, and click Run the report
   -- The displayed SQL should have a "frameworkcode=" portion
      matching the selected framework.
10) Run the koha qa test tool.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Test plan followed successfully.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
9 years agoBug 13174 : XSLT fails if, and only if you have an author, linked to an authority
Chris Cormack [Thu, 30 Oct 2014 23:54:04 +0000 (12:54 +1300)]
Bug 13174 : XSLT fails if, and only if you have an author, linked to an authority

And only in MARC21

To test:

Only for MARC21 with XSLT on for detail

1/ Find a record that has an authority linked author in it
2/ View the detail page in the opac
3/ Notice bibliographic data is missing
4/ Apply patch
5/ Refresh notice bibliographic data is back

Signed-off-by: David Cook <dcook@prosentient.com.au>
Works as described.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works as describe, the details are back!

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
9 years agoBug 13173 - remove some operations that are no longer needed
Robin Sheat [Thu, 30 Oct 2014 22:38:07 +0000 (11:38 +1300)]
Bug 13173 - remove some operations that are no longer needed

Build was failing because some files that it expected had vanished.

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
9 years agoBug 13172 t/Koha_Email.t was database dependent
Chris Cormack [Thu, 30 Oct 2014 22:15:17 +0000 (11:15 +1300)]
Bug 13172 t/Koha_Email.t was database dependent

To test
1/ Stop your database server
2/ run t/Koha_Email.t
3/ Notice the errors
4/ Apply patch
5/ run t/Koha_Email.t again
6/ No errors

(Don't forget to restart your db server after)

Signed-off-by: Robin Sheat <robin@catalyst.net.nz>
Verified that it fixes a package build.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works as described, tests pass now without database connection.

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
9 years agoBug 13105: Columns misplaced in member search result
Rafal Kopaczka [Fri, 17 Oct 2014 14:22:04 +0000 (16:22 +0200)]
Bug 13105: Columns misplaced in member search result

When staff member, without manage_patron_lists permissions, search for
patrons on result page, he gets table with additional column in head
table.
Test plan:
Log in as staff member without manage_patron_lists permissions, search
for any patron.
Check that table with results is fine now.

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Fixes problem by adding a permission check to the template.

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
9 years agoBug 3186 [QA Followup] - Don't return undef, just return
Kyle M Hall [Fri, 29 Aug 2014 14:38:31 +0000 (10:38 -0400)]
Bug 3186 [QA Followup] - Don't return undef, just return

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
9 years agoBug 3186 - invalid or uninstalled SMSSendDriver (or bad number format) causes process...
Olli-Antti Kivilahti [Wed, 27 Aug 2014 12:43:59 +0000 (15:43 +0300)]
Bug 3186 - invalid or uninstalled SMSSendDriver (or bad number format) causes process_message_queue to fail

This patch wraps the SMS::Send Driver initialization and sending process into an eval block
  and gracefully causes the sending to fail, instead of crashing the process and preventing
  emails and good sms' from being sent.

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
9 years agoBug 7162: Update DBIx
Tomas Cohen Arazi [Thu, 30 Oct 2014 04:05:11 +0000 (01:05 -0300)]
Bug 7162: Update DBIx

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
9 years agoBug 7162: DBRev 3.17.00.043
Tomas Cohen Arazi [Thu, 30 Oct 2014 04:02:36 +0000 (01:02 -0300)]
Bug 7162: DBRev 3.17.00.043

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
9 years agoBug 7162: (RM followup) fix the number of tests
Tomas Cohen Arazi [Thu, 30 Oct 2014 03:47:13 +0000 (00:47 -0300)]
Bug 7162: (RM followup) fix the number of tests

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
9 years agoBug 7162: (follow-up) Add unit tests for DelOrder
Jonathan Druart [Tue, 15 Jul 2014 12:00:25 +0000 (14:00 +0200)]
Bug 7162: (follow-up) Add unit tests for DelOrder

The unit tests did not take into account the new DB field.

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Passes all tests and QA script. Also all Acquisition related
patches.

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
9 years agoBug 7162: Remove "(Y)" and "(N)" from buttons text
Julian Maurice [Mon, 21 Jul 2014 09:29:52 +0000 (11:29 +0200)]
Bug 7162: Remove "(Y)" and "(N)" from buttons text

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
9 years agoBug 7162: Factorize code for order cancellation (QA fixes)
Julian Maurice [Mon, 7 Jul 2014 07:27:58 +0000 (09:27 +0200)]
Bug 7162: Factorize code for order cancellation (QA fixes)

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
9 years agoBug 7162: Add unit tests for DelOrder
Julian Maurice [Fri, 13 Jun 2014 10:55:44 +0000 (12:55 +0200)]
Bug 7162: Add unit tests for DelOrder

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
9 years agoBug 7162; Factorize code for order cancellation (QA fixes)
Julian Maurice [Tue, 20 May 2014 11:49:57 +0000 (13:49 +0200)]
Bug 7162; Factorize code for order cancellation (QA fixes)

* Remove tab characters in acqui/addorder.pl
* Remove FIXME in acqui/cancelorder.pl
* Fix typos: "canceled" -> "cancelled", "occured" -> "occurred"
* Replace "Click here" link by "OK"
* Add a column to aqorders to store cancellation reason instead of
  having it in aqorders.notes, to avoid having untranslatable strings in
    database

Signed-off-by: Paola Rossi <paola.rossi@cineca.it>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
9 years agoBug 7162 [Follow-up] Fix referrer URL when coming from parcel.pl
Julian Maurice [Tue, 19 Mar 2013 15:15:51 +0000 (15:15 +0000)]
Bug 7162 [Follow-up] Fix referrer URL when coming from parcel.pl

Signed-off-by: Corinne Bulac <corinne.hayet@bulac.fr>
Signed-off-by: Paola Rossi <paola.rossi@cineca.it>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
9 years agoBug 7162: Factorize code for order cancellation
Julian Maurice [Sat, 5 Nov 2011 06:59:25 +0000 (12:29 +0530)]
Bug 7162: Factorize code for order cancellation

Some code was duplicated, all is now in cancelorder.pl
Added possibility to provide a reason for cancellation (or other things,
this is saved in aqorders.notes)

Signed-off-by: Corinne Bulac <corinne.hayet@bulac.fr>
Signed-off-by: Paola Rossi <paola.rossi@cineca.it>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
9 years agoBug 13161 - Report name should be mandatory when editing saved reports
Owen Leonard [Wed, 29 Oct 2014 17:34:03 +0000 (13:34 -0400)]
Bug 13161 - Report name should be mandatory when editing saved reports

When Bug 2969 made report name required for SQL reports, it did so only
for new reports. This patch makes the same requirement true when editing
existing reports.

Other changes:

- Removed unused "type" setting from edit screen (already removed from
  creation form).
- Added form field size attribute to report name field to match creation
  form.
- Moved SQL textarea into its own fieldset and marked it as required,
  matching the report creation form.

To test, apply the patch and edit an existing saved SQL report. You
should be prevented from saving your report with either the report name
or SQL field blank. Test with JavaScript enable and disabled.

Confirm that after entering valid data your report runs correctly.
Compare the new SQL report form with the update SQL report form. They
should be structured the same.

Signed-off-by: Nick Clemens <nick@quecheelibrary.org>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Passes tests and QA script. Works as described.

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
9 years agoBug 12916 - Use of uninitialized values $max and $min in C4/Tags.pm
Mark Tompsett [Thu, 23 Oct 2014 00:51:22 +0000 (20:51 -0400)]
Bug 12916 - Use of uninitialized values $max and $min in C4/Tags.pm

When the stratify_tags function is called without any tags, the
$min and $max variables are left undefined, which triggers a
warning message about uninitialized values in the subtraction.

TEST PLAN
---------
1) prove -v t/db_dependent/Tags.t
   -- should succeed, but there is no test for empty tags.
2) Make sure that you have no tags
3) In Opac, go to 'Tag cloud'
4) Check the opac error log file
   (e.g. ~/koha-dev/var/log/koha-opac-error_log) for entries
   regarding uninitialized values $max and $min in C4/Tags.pm
5) apply this patch
6) prove -v t/db_dependent/Tags.t
   -- should still succeed, though no tests are added.
7) Reload page 'Tag cloud'
   -- Result: No additional warnings in opac error log file.

Signed-off-by: Chris <chris@bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
New and old tests pass. Works as described.

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
9 years agoBug 12916 - Missing Test to demonstrate warnings.
Mark Tompsett [Wed, 22 Oct 2014 19:50:08 +0000 (15:50 -0400)]
Bug 12916 - Missing Test to demonstrate warnings.

Modifying C4/Tags.pm should have tests.

TEST PLAN
---------
1) Apply this test patch only.
2) prove -v t/db_dependent/Tags.t
   -- should see two warnings.
3) Apply the first patch.
4) prove -v t/db_dependent/Tags.t
   -- no warnings.

Signed-off-by: Chris <chris@bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
9 years agoBug 12901: (QA followup) correct copy and paste error
Tomas Cohen Arazi [Tue, 28 Oct 2014 21:10:33 +0000 (18:10 -0300)]
Bug 12901: (QA followup) correct copy and paste error

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Works as described now, no problems found.

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
9 years agoBug 12901: (consistency followup) add buildBiblioDefaultViewURL to MARC21 XSLT
Tomas Cohen Arazi [Mon, 15 Sep 2014 13:44:16 +0000 (10:44 -0300)]
Bug 12901: (consistency followup) add buildBiblioDefaultViewURL to MARC21 XSLT

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
http://bugs.koha-community.org/show_bug.cgi?id=9828

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
9 years agoBug 12901: BiblioDefaultView doesn't do anything with NORMARC or UNIMARC XSLT
Tomas Cohen Arazi [Mon, 15 Sep 2014 13:43:39 +0000 (10:43 -0300)]
Bug 12901: BiblioDefaultView doesn't do anything with NORMARC or UNIMARC XSLT

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
http://bugs.koha-community.org/show_bug.cgi?id=9828

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
9 years agoBug 13028: Followup adding a -partial flag for partial compares
Marcel de Rooy [Wed, 8 Oct 2014 12:27:40 +0000 (14:27 +0200)]
Bug 13028: Followup adding a -partial flag for partial compares

If you compare the database with a partial pref file, you may not be
interested in lots of lines saying that a pref is not in the file. You
were already aware of that ;)
If you add the -partial flag, these lines will be skipped.

Test plan:
Do as described above.

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Works as described, passes tests and QA script.

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
9 years agoBug 13028: Resolve uninitialized value in string eq at cmp_sysprefs.pl line 194
Marcel de Rooy [Mon, 6 Oct 2014 12:09:53 +0000 (14:09 +0200)]
Bug 13028: Resolve uninitialized value in string eq at cmp_sysprefs.pl line 194

If you use the restore option with a partial pref file not containing a version, you will have this error. Also the count of updated prefs will be one too high.

This is corrected by a better test of the hash value in the CheckVersionPref subroutine.

Test plan:
[1] Create a small pref file and remove the version pref (if present). You
could for instance do a pref backup and remove most lines.
[2] Use the restore option with and without this patch.
    So, something like:
        maintclone/misc/maintenance/cmp_sysprefs.pl -c r -f 9999crucial.pref
[3] Check on the error message and the pref count.

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
9 years agoBug 13145 UNIMARC 610 tag isn't displayed in OPAC when there is no $9 subfield
Frédéric Demians [Sat, 25 Oct 2014 12:09:34 +0000 (14:09 +0200)]
Bug 13145 UNIMARC 610 tag isn't displayed in OPAC when there is no $9 subfield

On OPAC detail page, subject fields are not displayed when they are not linked
to authorities ($9 subfield). This is due to a misplelling in UNIMARC XSL
detail page.

TO TEST:

(1) On a Koha UNIMARC, find out a biblio record with a 610 field, without $9
    subfield. Something like:

    610 1 $a Aliment -- Approvisionnement -- Europe -- Histoire

    Or add such a field to an existing record.

(2) Check that OPACXSLTDetailsDisplay is set to 'default'

(3) See this record on OPAC detail page. You must see 'Subject: ' => nothing
    after the 'Subject' label. If your record contains several 610 fields
    without $9, the | character will appear, separating no content.

(4) Apply the patch.

(5) Reload the page seen at step (3): subject is displayed now.

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works as described, tested on a UNIMARC installation.
Small XSLT change.

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
9 years agoBug 12653: remaining prog reference in t/db_dependent/SuggestionEngine_ExplodedTerms.t
Tomas Cohen Arazi [Thu, 30 Oct 2014 02:37:54 +0000 (23:37 -0300)]
Bug 12653: remaining prog reference in t/db_dependent/SuggestionEngine_ExplodedTerms.t

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
9 years agoBug 10433 - colspan calculation done by opac/opac-reserve.pl should be moved to template
Owen Leonard [Fri, 18 Jul 2014 12:55:00 +0000 (08:55 -0400)]
Bug 10433 - colspan calculation done by opac/opac-reserve.pl should be moved to template

Since the bootstrap OPAC's place hold interface doesn't use tables
there is no use for the colspan calculation being done in the script.
This patch removes it.

To test, place one or more holds in the OPAC and confirm that there are
no display problems. The OPAC error logs should show no associated
error.

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
No display problems, no related errors on log, no koha-qa errors

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Passes tests and QA script, no regressions found.

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
9 years agoBug 12494: DBRev: 3.17.00.042
Tomas Cohen Arazi [Thu, 30 Oct 2014 01:07:57 +0000 (22:07 -0300)]
Bug 12494: DBRev: 3.17.00.042

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
9 years agoBug 12494 - Remove yuipath system preference
Owen Leonard [Fri, 27 Jun 2014 13:11:21 +0000 (09:11 -0400)]
Bug 12494 - Remove yuipath system preference

With the OPAC prog template going away, the only remaining use of the
yuipath preference is on the basketgroups template. The yuipath
preference should be removed and the local path hard-coded.

This patch:
  - removes yuipath handling from C4/Templates.pm
  - removes the preference from sysprefs.sql
  - deletes the preference via updatedatabase.pl
  - removes the preference from the staff client preferences file
  - removes unused references to the YUI assets from the help file
    header include
  - adds the local YUI asset path to acqui/basketgroup.tt

To test, apply the patch and run the database update. View some online
help pages and confirm that they function correctly. View the
basketgroups page (Acquisition -> Vendor -> Basket groups), edit a
basket group, and confirm that basket drag and drop operations work
correctly.

Signed-off-by: Aleisha <aleishaamohia@hotmail.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Passes all tests and QA script.
Online help and basket group drag&drop functionality still work correctly.

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
9 years agoBug 12535 - PROG/CCSR Deprecation: Make opac translation theme independent
Bernardo Gonzalez Kriegel [Mon, 7 Jul 2014 01:11:14 +0000 (22:11 -0300)]
Bug 12535 - PROG/CCSR Deprecation: Make opac translation theme independent

This patch makes opac translation files theme independent
A side effect is that current prog translation file is
renamed.

But the renaming is not added, that gives a patch of ~60M!

Current list of languages are now obtained from pref files.

To test:
1) Apply the patch

2) For your preferred language, rename opac prog file
from 'xx-YY-i-opac-t-prog-v-3006000.po' to 'xx-YY-opac-prog.po'

3) Update that language, there must be no errors
cd misc/translation
./translate update xx-YY [-v]
Check updated po files

4) Install any language, there must be no errors
./translate install xx-YY
Check prog theme for that language

5) Create translation files. Remove a language or create new lang files
./translate create zz-WW
ls -l po/zz-WW*po
check there are 3 files (and *~) for opac

6) Check updated pod for LangInstaler.pm and translate script

When PROG/CCSR themes are removed, I'll add a Bug to remove
corresponding files.

Perhaps RM could add a followup to rename all files,
cd misc/translator/po
for old in $(ls *opac-t*); do
    new=$(echo $old | sed 's/-i-opac-t-prog-v-3006000/-opac-prog/');
    git mv $old $new;
done

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works as described, no problems found.

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
9 years agoBug 11346: DBRev 3.17.00.41 (deprecate the PROG and CCSR themes)
Tomas Cohen Arazi [Wed, 29 Oct 2014 23:50:36 +0000 (20:50 -0300)]
Bug 11346: DBRev 3.17.00.41 (deprecate the PROG and CCSR themes)

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
9 years agoBug 12653: (RM followup) Fix the test count
Tomas Cohen Arazi [Wed, 29 Oct 2014 23:40:37 +0000 (20:40 -0300)]
Bug 12653: (RM followup) Fix the test count

Bug 12233 removed the prog and CCSR theme directories, so the number
of tests needs to be fixed.

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
9 years agoBug 12233: change opacthemes syspref from {prog|ccsr} to bootstrap MM-OPAC/theme_dep
Tomas Cohen Arazi [Sun, 10 Aug 2014 13:37:26 +0000 (10:37 -0300)]
Bug 12233: change opacthemes syspref from {prog|ccsr} to bootstrap

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
9 years agoBug 12233: Remove the prog and ccsr themes files
Tomas Cohen Arazi [Sun, 10 Aug 2014 13:26:00 +0000 (10:26 -0300)]
Bug 12233: Remove the prog and ccsr themes files

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
9 years agoBug 12653: Text file clean up
Mark Tompsett [Mon, 20 Oct 2014 14:41:13 +0000 (10:41 -0400)]
Bug 12653: Text file clean up

_README.txt has 4 newlines removed.
_COPYING.txt has 2 empty lines at the end of the file removed.
This was done by copying the smallest file in an existing theme
directory.

TEST PLAN
---------
1) Compare files.
diff koha-tmpl/intranet-tmpl/prog/img/itemtypeimg/crystal-clear/_COPYING.txt koha-tmpl/opac-tmpl/prog/itemtypeimg/crystal-clear/_COPYING.txt
diff koha-tmpl/intranet-tmpl/prog/img/itemtypeimg/crystal-clear/_COPYING.txt koha-tmpl/opac-tmpl/ccsr/itemtypeimg/crystal-clear/_COPYING.txt
diff koha-tmpl/intranet-tmpl/prog/img/itemtypeimg/crystal-clear/_COPYING.txt koha-tmpl/opac-tmpl/bootstrap/itemtypeimg/crystal-clear/_COPYING.txt
diff koha-tmpl/intranet-tmpl/prog/img/itemtypeimg/crystal-clear/_README.txt koha-tmpl/opac-tmpl/prog/itemtypeimg/crystal-clear/_README.txt
diff koha-tmpl/intranet-tmpl/prog/img/itemtypeimg/crystal-clear/_README.txt koha-tmpl/opac-tmpl/ccsr/itemtypeimg/crystal-clear/_README.txt
diff koha-tmpl/intranet-tmpl/prog/img/itemtypeimg/crystal-clear/_README.txt koha-tmpl/opac-tmpl/bootstrap/itemtypeimg/crystal-clear/_README.txt
-- there will be differences.
2) Apply patch
3) Compare files again.
diff koha-tmpl/intranet-tmpl/prog/img/itemtypeimg/crystal-clear/_COPYING.txt koha-tmpl/opac-tmpl/prog/itemtypeimg/crystal-clear/_COPYING.txt
diff koha-tmpl/intranet-tmpl/prog/img/itemtypeimg/crystal-clear/_COPYING.txt koha-tmpl/opac-tmpl/ccsr/itemtypeimg/crystal-clear/_COPYING.txt
diff koha-tmpl/intranet-tmpl/prog/img/itemtypeimg/crystal-clear/_COPYING.txt koha-tmpl/opac-tmpl/bootstrap/itemtypeimg/crystal-clear/_COPYING.txt
diff koha-tmpl/intranet-tmpl/prog/img/itemtypeimg/crystal-clear/_README.txt koha-tmpl/opac-tmpl/prog/itemtypeimg/crystal-clear/_README.txt
diff koha-tmpl/intranet-tmpl/prog/img/itemtypeimg/crystal-clear/_README.txt koha-tmpl/opac-tmpl/ccsr/itemtypeimg/crystal-clear/_README.txt
diff koha-tmpl/intranet-tmpl/prog/img/itemtypeimg/crystal-clear/_README.txt koha-tmpl/opac-tmpl/bootstrap/itemtypeimg/crystal-clear/_README.txt
-- there will be no differences.
4) git reset --hard origin/master
5) Apply the patch affecting the .t files.
6) Prove things.
prove xt/author/icondirectories.t xt/author/translatable-templates.t xt/author/valid-templates.t xt/single_quotes.t xt/tt_valid.t
-- expecting xt/author/icondirectories.t to fail
7) Apply this patch.
8) Prove things.
prove xt/author/icondirectories.t xt/author/translatable-templates.t xt/author/valid-templates.t xt/single_quotes.t xt/tt_valid.t
-- expecting success.

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
This patch fixes some issues with files on itemtypes dirs.
No koha-qa erros.

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
9 years agoBug 12653: PROG/CCSR deprecation: Correct hard-coded opac-tmpl/prog path in tests
Bernardo Gonzalez Kriegel [Thu, 16 Oct 2014 22:35:52 +0000 (19:35 -0300)]
Bug 12653: PROG/CCSR deprecation: Correct hard-coded opac-tmpl/prog path in tests

This patch removes explicit references of themes from

  xt/author/icondirectories.t
  xt/author/translatable-templates.t
  xt/author/valid-templates.t
  xt/single_quotes.t
  xt/tt_valid.t

For xt/author/icondirectories.t it fixes a small difference on
two bootstrap files, previously unchecked, crystal-clear/_COPYING.txt
and crystal-clear/_README.txt

Some updates to license information

To test:
1. Apply the patch
2. Run each test, all must pass
prove xt/author/icondirectories.t xt/author/translatable-templates.t xt/author/valid-templates.t xt/single_quotes.t xt/tt_valid.t

3. Try to fail each test

a) xt/author/icondirectories.t
create a new file on any of icon dirs, e.g.
touch koha-tmpl/opac-tmpl/bootstrap/itemtypeimg/newfile.png
test must fail

b) xt/author/translatable-templates.t
change the name of 'en' dir on any theme opac or staff
test must fail

Add following line to any template file
<span [% IF ( value ) %]name="name"[% ELSE %] js="_('">TEST [% INCLUDE 'fail.inc' %]</span>

c) xt/author/valid-templates.t must fail
d) xt/single_quotes.t must fail
e) xt/tt_valid.t must fail

Signed-off-by: Mark Tompsett <mtompset@hotmail.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
9 years agoBug 12655 [Revised] PROG/CCSR deprecation: Correct hard-coded opac-tmpl/prog path...
Owen Leonard [Tue, 12 Aug 2014 14:09:57 +0000 (10:09 -0400)]
Bug 12655 [Revised] PROG/CCSR deprecation: Correct hard-coded opac-tmpl/prog path in XSLT

Two XSL files in the bootstrap theme contain hard-coded paths to the
prog theme directory. This patch adds a query of the opacthemes system
preference and builds the path based on the returned value.

To test in a MARC21 system:

Create or locate a record which contains a subject which is linked to an
authority record. View the detail page for that record in the bootstrap
OPAC and confirm that there is a magnifying class icon next to the link
for that subject heading. Inspect or right-click the image and "View
image" [FF. "Open image in new tab" in Chrome] to verify that the image
being shown is from the bootstrap theme directory.

Also modified: The NORMARC XSL for the detail page which has been
changed in the same way. I did not test it in a NORMARC catalog.

Edit: Fixed copy-and-paste error causing duplicate image.
Signed-off-by: Brendan Gallagher <brendan@bywatersolutions.com>
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
9 years agoBug 12657 - remove references to prog and ccsr from the packages
Robin Sheat [Fri, 25 Jul 2014 04:09:49 +0000 (16:09 +1200)]
Bug 12657 - remove references to prog and ccsr from the packages

To test:
* Build a package and install it, and verify that there are no errors.
* Play around with koha-translate, listing, adding, and removing
  languages.

Note: one reference to prog and ccsr remains in koha-translate. This is
to allow it to remove any pre-existing translations on an upgrade.

Note 2: prog translations are still being installed, I think this is due
to the underlying translation system doing it.

Signed-off-by: Brendan Gallagher <brendan@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
9 years agoBug 12539: Follow up to fix fallback theme
Bernardo Gonzalez Kriegel [Sun, 3 Aug 2014 12:41:37 +0000 (09:41 -0300)]
Bug 12539: Follow up to fix fallback theme

The is a problem in the logic, fallback must be:
1. Requested (theme, lang, tmpl)
a. return    (theme, lang, tmpl), if not
b. return    (fallback, lang, tmpl), if not
c. return    (theme, 'en', tmpl), if not as last resort
d. return    (fallback, 'en', tmpl)

Previous patch missed option 'c', worked for CCSR
but not bootstrap, sorry.

Signed-off-by: Petter Goksoyr Asen <boutrosboutrosboutros@gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
9 years agoBug 12539: PROG/CCSR deprecation: Remove hardcoded theme from C4/Templates.pm
Bernardo Gonzalez Kriegel [Mon, 7 Jul 2014 18:30:02 +0000 (15:30 -0300)]
Bug 12539: PROG/CCSR deprecation: Remove hardcoded theme from C4/Templates.pm

This patch removes hardcoded 'prog' from themelanguage on C4/Templates.pm
It adds a new syspref OPACFallback to hold the prefferred fallback
theme for new themes with minimal changes.

This does not brake CCSR if new syspref value is 'prog',
using 'bootstrap' works somehow, but with strange results.

To test:
1) Apply the patch
2) Run updatedatbase.pl
3) CCSR, prog & bootstrap must work as usual
4) Need to test theme/language fallback
 a) translate for your preferred language (xx-YY)
 b) enable language on opac
 c) go to opac, select that language
 d) login on opac, go to personal details
 e) remove koha-tmpl/opac-tmpl/bootstrap/xx-YY/modules/opac-memberentry.tt
 d) reload page, must load in English
 f) click other member options, must load on translated language
(can use other pages, ccsr, prog or bootstrap)
5) Do a similar test but for a staff page, enable lang, switch to it,
rm koha-tmpl/intranet-tmpl/prog/xx-YY/modules/admin/admin-home.tt,
any page must be translated except for admin home.

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Petter Goksoyr Asen <boutrosboutrosboutros@gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
9 years agoBug 12245 - PROG/CCSR deprecation: Remove OPACMobileUserCSS system preference
Owen Leonard [Tue, 1 Jul 2014 15:42:30 +0000 (11:42 -0400)]
Bug 12245 - PROG/CCSR deprecation: Remove OPACMobileUserCSS system preference

With CCSR now deprecated there is no longer a need for the
OPACMobileUserCSS system preference. This patch removes it.

To test, apply the patch and run updatedatabase. Check that the
preference can no longer be found in system preferences.

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Preference removed, no koha-qa errors.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
9 years agoBug 12246 - PROG/CCSR deprecation: Remove OpacMainUserBlockMobile system preference
Owen Leonard [Tue, 1 Jul 2014 15:56:28 +0000 (11:56 -0400)]
Bug 12246 - PROG/CCSR deprecation: Remove OpacMainUserBlockMobile system preference

With CCSR having been deprecated there is no longer a use for the
OpacMainUserBlockMobile system preference. This patch removes it.

To test, apply the patch and run updatedatabase. Check that the
preference can no longer be found in system preferences.

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Preference removed, no koha-qa errors

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
9 years agoBug 12513 - PROG/CCSR deprecation: Remove OpacShowLibrariesPulldownMobile system...
Owen Leonard [Tue, 1 Jul 2014 16:18:12 +0000 (12:18 -0400)]
Bug 12513 - PROG/CCSR deprecation: Remove OpacShowLibrariesPulldownMobile system preference

With CCSR having been deprecated there is no longer a use for the
OpacShowLibrariesPulldownMobile system preference. This patch removes
it.

To test, apply the patch and run updatedatabase. Check that the
preference can no longer be found in system preferences.

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Preference removed, no koha-qa errors.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
9 years agoBug 13088: (RM followup) add missing pref mock
Tomas Cohen Arazi [Tue, 28 Oct 2014 15:07:46 +0000 (12:07 -0300)]
Bug 13088: (RM followup) add missing pref mock

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>