koha.git
10 years agoLanguage update for 3.12-RC
D Ruth Bavousett [Thu, 16 May 2013 01:45:14 +0000 (22:45 -0300)]
Language update for 3.12-RC

10 years agoBug 10094 - koha-list should have a --disabled option switch v3.12.00-rc1
Tomas Cohen Arazi [Tue, 23 Apr 2013 13:14:37 +0000 (10:14 -0300)]
Bug 10094 - koha-list should have a --disabled option switch

This patch adds that (--disabled) option switch, Also revisits some of the code and docs.

To test:
- Apply the patch and create new packages (you might just drop the koha-list command somewhere)
- Create several instances (koha-create)
- Randomly set some as disabled, others enabled and enable email on some.
- Test all possible option switches combinations

Expected results:
- koha-list should abort with a proper message if mutually exclusive options selected (--email vs. --noemail, --enabled vs. --disabled)
- koha-list should show the exact instances you asked for

Regards
To+

P.S.: I wanted to add the --disabled option switch for the tab-completion work I'm doing, but as of bug 4876 I thought it would be ok to revisit the script to make it robust and clear.

Sponsored-by: Universidad Nacional de Córdoba
Signed-off-by: Robin Sheat <robin@catalyst.net.nz>
Does what it says, and cleans up the script at the same time.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit de275ec128d3b26e953c35778e6a37e5b85273f5)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
10 years agoBug 10146 - koha-stop-zebra error handling
Tomas Cohen Arazi [Mon, 29 Apr 2013 14:08:35 +0000 (11:08 -0300)]
Bug 10146 - koha-stop-zebra error handling

koha-stop-zebra now
- Checks the instance exists.
- Checks the instance is enabled.
- Checks if the zebra daemon is already running.

Regards
To+

Edit: Corrected the die message

Sponsored-by: Universidad Nacional de Córdoba
Signed-off-by: Robin Sheat <robin@catalyst.net.nz>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit 898e178c6ff3a79bf991defb60aec8ff58f107c6)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
10 years agoBug 10157 - koha-email-enable error handling
Tomas Cohen Arazi [Tue, 30 Apr 2013 13:05:44 +0000 (10:05 -0300)]
Bug 10157 - koha-email-enable error handling

koha-email-enable now
- Checks the instance exists.
- Checks if email is already enabled.

Regards
To+

Sponsored-by: Universidad Nacional de Córdoba
Signed-off-by: Robin Sheat <robin@catalyst.net.nz>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit 1126dd8bf3e3f386acfc007bc6e3310cc5320100)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
10 years agoBug 10159 - koha-rebuild-zebra error handling
Tomas Cohen Arazi [Tue, 30 Apr 2013 14:58:25 +0000 (11:58 -0300)]
Bug 10159 - koha-rebuild-zebra error handling

This patch makes koha-rebuild-zebra:
- Check for the existence of the instance
- Handle arbitrary amount of instance parameters
- Capture -a and -b (which made the script rebuild twice the chosen DB). It adds the extended version (--authorities and --biblios respectively) of the option switch. This makes the -a and -b switches work as "only do authorities" (or viceversa). They can be used concurrently, which is the default behaviour when no switch is provided.
- Handle -v (and --verbose) as koha-rebuild-zebra options, to ease the use for non-techie users.
- The rebuild_zebra.pl is wrapped inside an IF to return error values if we ever make rebuild_zebra.pl return error codes (this is pointed in the code).
- Added -h/--help switches and an 'usage' output :-D Please provide patches for any wording issues, or contact me to fix it.

To test:
- Apply the patch and create your packages (or just use the script from your branch)
- Run it in this scenarios / options
  - -h/--help to see the available option switches
  - Mix them with one or more instances, of which some could be fake
  - try -a/--authorities and -b/--biblios in all possible combinations
  - try -v/--verbose works

Regards
To+

Sponsored-by: Universidad Nacional de Córdoba
Signed-off-by: Robin Sheat <robin@catalyst.net.nz>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit 39d3b9088a34b464708e40d1fd20a954d4a6e702)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
10 years agoBug 6329 - patron categories should show which fields are required
Owen Leonard [Tue, 14 May 2013 19:09:14 +0000 (15:09 -0400)]
Bug 6329 - patron categories should show which fields are required

When entering a new patron category, required fields are not indicated
on the entry form. This patch adds the "required" class to the relevant
labels.

To test, add or edit a patron category. Confirm that the required fields
(category code, category type, description, and enrollment period) are
indicated as being required with a red label.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works nicely.
Template changes only, but no string changes.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit 85fd38e5969c083692fe0a5227c792c2ff07134d)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
10 years agoBug 10214 Add header to syspref po files
Frédéric Demians [Tue, 14 May 2013 11:01:56 +0000 (13:01 +0200)]
Bug 10214 Add header to syspref po files

With this patch, header is created when creating a new syspref .po file
for a new language (translate create), and is added if it doesn't
already exist when updating an existing language (translate update).

To test:

(1) Create a new language syspref file:

    ./translate create -p xx-XX

    Check that there is an header

(2) Update an existing syspref file without header:

    ./translate update fr-FR

    Check that fr-FR-pref.po has a header

(3) Update an existing syspref file with header:

    Modify fr-FR-pref.po. Add an email, or whatever.

    ./translate update fr-FR

    Check that fr-FR-pref.po has a header with the manual modification

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Comment: Work as described. No errors.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
All tests and QA script pass.
Also tested that updated pref files can still be installed correctly.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit 9ce862e451f56fdca7d368fd1a39e64e40fc678f)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
10 years agoBug 10108 - can't print more than one page of overdues
Owen Leonard [Fri, 10 May 2013 18:44:10 +0000 (14:44 -0400)]
Bug 10108 - can't print more than one page of overdues

Printing a report like overdues in Firefox results in a printout which
cuts off in the middle. I traced the cause to something in the YUI grid
system, although I'm not sure what specific definition is the cause.

This patch adds a "screen" parameter to the @import which loads the YUI
grid CSS file. This will disable YUI grid layouts in print views. The
main disadvantage to this, as far as I can tell, is that it will
"linearize" some layouts. For instance: the patron detail page
(moremember.pl) which on screen is divided into two columns. I think
this disadvantage is outweighed by the ability to make complete prints.

To test, apply the patch and clear your cache. Try printing various
reports from Firefox. Printouts should look correct and be complete.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
all tests pass

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
CSS only change, no strings involved.
Tested with a saved SQL report 'select * from borrowers'.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit fac9d5447abae5c2f3d9febd9ccaf42a4ed6030c)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
10 years agoBug 7593: Fix unit tests
Jonathan Druart [Mon, 13 May 2013 12:00:44 +0000 (14:00 +0200)]
Bug 7593: Fix unit tests

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit 94e00ac835568d82222bd2214df0bf19cbe0f82b)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
10 years agoBug 9575 - Serious Holds Problem with IndependantBranches
Kyle M Hall [Tue, 12 Mar 2013 18:30:48 +0000 (14:30 -0400)]
Bug 9575 - Serious Holds Problem with IndependantBranches

If IndependantBranches is enabled, all holds for an item display the
currently logged in library no matter what, and modifying the holds will
set all pickup locations for all the holds to that logged in library!

Test plan:
 1) Disable IndependantBranches
 2) Place 3 holds on a record with 3 different pickup locations
 3) Enable IndependantBranches
 4) Refresh the holds page for that record, all the holds show now
    show a pickup location of the logged in branch
 5) Modify the order of the holds
 6) Disable IndependantBranches
 7) Refresh the holds, verify the holds all now have a pickup
    location of the logged in branch
 8) Apply the patch
 9) Repeat steps 1-3
10) Refresh the holds page for that record, all the holds should
    now show the correct pickup branch, but it cannot be changed
    as IndependantBranches is enabled.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
In my tests the above test plan only worked out if my user
had no superlibrarian permission. But then behaviour for
independentbranches off/on was all correct.
All tests and QA script pass.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit 98b96c88d7ee97aa194cf7d2f1f69f1c5cabbb96)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
10 years agoBug 10233 - Toolbar background missing from staff client catalogue page
Owen Leonard [Mon, 13 May 2013 13:57:52 +0000 (09:57 -0400)]
Bug 10233 - Toolbar background missing from staff client catalogue page

The toolbar on the cataloging home page lacks the standard toolbar id,
resulting in an inconsistent appearance. This patch adds the correct id.

To test, apply the patch, clear your browser cache, and view the
cataloging home page (cataloguing/addbooks.pl). The toolbar should look
like other toolbars in Koha (for instance, members/members-home.pl).

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Template change only, no string changed involved.
Works as described.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit 17519118767f3b5d7977125844fae589e0dc4f1a)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
10 years agoBug 10196 - items table partially hidden in marc view in ccsr
Owen Leonard [Fri, 10 May 2013 20:00:51 +0000 (16:00 -0400)]
Bug 10196 - items table partially hidden in marc view in ccsr

In the CCSR theme's OPAC MARC view the table of items is truncated
because the container div is styled with "overflow:hidden." I think the
complete display of information is more important than not seeing a
horizontal scrollbar, so this patch removes the style.

To test, apply the patch and clear your browser cache. View a MARC
detail page for a title which has holdings and confirm that the entire
table can be seen. Test other pages to make sure no unwanted layout
changes have resulted.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
all tests pass

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Simple CSS change, no string changes.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit a52bedaeac14c8f82073f60f0d8632d53b7792d1)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
10 years agoBug 8840 - [SIGNED-OFF] Patch to solve false "All dependencies installed!"
Mark Tompsett [Mon, 17 Dec 2012 20:51:33 +0000 (15:51 -0500)]
Bug 8840 - [SIGNED-OFF] Patch to solve false "All dependencies installed!"

Reordered logic to accumulate MISSING_PATCHES variable and tweak
condition to be certain it was not failing.

Signed-off-by: Magnus Enger <magnus@enger.priv.no>
Works as advertised, see Bugzilla for details.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit 18b8f018c7f7fdcbac498ecea95d3da4baa0b8ff)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
10 years agoBug 8840 - [SIGNED-OFF] ubuntu-pkg-check.sh fix and extend functionality
Tomas Cohen Arazi [Fri, 28 Sep 2012 17:11:55 +0000 (01:11 +0800)]
Bug 8840 - [SIGNED-OFF] ubuntu-pkg-check.sh fix and extend functionality

First, reworked it into a newer script with parameters:
   ubuntu-packages.sh -r
This will generate output identical to the old script, except
that it is fixed for non-english setups.
   ubuntu-packages.sh -h
This adds a brief help, which all scripts should have.
   ubuntu-packages.sh -ic
This helps handle a multi-arch problem by printing out a
relevant command for installing missing dependencies.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Magnus Enger <magnus@enger.priv.no>
Works as advertised, see Bugzilla for details.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit 748c6e7f89310a3092ef202ece4547356ad90a95)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
10 years agoBug 10079 - HomeOrHoldingBranch should not control who can delete when IndependantBra...
Kyle M Hall [Fri, 19 Apr 2013 14:21:43 +0000 (10:21 -0400)]
Bug 10079 - HomeOrHoldingBranch should not control who can delete when IndependantBranches is enabled

Test Plan:
1) Enable IndependantBranches
2) Set HomeOrHoldingBranch to holding branch
3) Delete an item whose holding branch is your logged in branch, and
   whose home branch is not
4) Apply this patch
5) Repeat step 3, it should fail
6) Try to delete another items whose home branch is your logged in
   branch, and whose holding branch is a different branch. This
   deletetion should succeed.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
All tests and QA script pass.
Change is logical, only homebranch should determine if the item
can be deleted.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit f1d68112820483b8cc5e837f6ded6f9bebe83717)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
10 years agoBug 10100: adds a class to OPAC news dates
Adrien Saurat [Tue, 23 Apr 2013 07:40:33 +0000 (09:40 +0200)]
Bug 10100: adds a class to OPAC news dates

Adds a "newsfooter" class to allow CSS modification
of the date appearing as a footer on each news.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Adds a class, checked po files to make sure change is string safe.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit 8901374b934c087b458195d9d1e7828f35aa74e0)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
10 years agoBug 7593 : QA followup : restores deleted line in C4::Acquisition
Mathieu Saby [Tue, 30 Apr 2013 06:16:18 +0000 (08:16 +0200)]
Bug 7593 : QA followup : restores deleted line in C4::Acquisition

This patch restores the line exporting GetOrderNumber that I accidentally suppressed.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Restores a line that was deleted by the first patch.
Was not sure if patches should be squashed.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit 24f5525207c11401626f363faff90fa9436c1003)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
10 years agoBug 7593: Move orders on the destination record when merging 2 records
Mathieu Saby [Wed, 13 Mar 2013 15:12:03 +0000 (16:12 +0100)]
Bug 7593: Move orders on the destination record when merging 2 records

Revised patch according to QA comments. No more dependent from bz 9780.

At present, merging records breaks the link order/record, except
if an item of the deleted record is used in the order.
This is a serious issue for libraries creating items on receipt.
This patch moves existing orders from deleted record to destination record.
It creates a new function Acquisitions::GetOrdersByBiblionumber,
that could be used by other patches later.

To test :
Check the problem :
1. Set syspref AcqCreateItem = Create an item when receiving an order
1. Create a basket with one order
2. Put the record used by this order in a list
3. Put an other record in the list
4. Merge the 2 records, keeping as a reference the record NOT used in the order
5. In the order, you will see for that order "Deleted bibliographic information..."
6. Apply the patch
7. Repeat steps 1-4
8. In the order, you will see the title/author of the kept record.
9. Set syspref AcqCreateItem = Create an item when placing an order
10. Repeat steps 1-4 (an item will be created)
11. In the oreder, you will see the title/author of the kept record
    (it is already the case at present. the patch should not alter this behavior)

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Test plan, test suite and QA script pass.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit b1a52b29181137791784fe20313efe8bce98b1fa)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
10 years agoBug 9680 - cart aligned right in CCSR
Owen Leonard [Fri, 10 May 2013 16:12:11 +0000 (12:12 -0400)]
Bug 9680 - cart aligned right in CCSR

The CCSR theme sets a min-width of 1000px for windows which are more
than 700px wide. This caused the cart popup window to be given a
min-width of 1000px, resulting in a broken layout with unnecessary
horizontal scrolling.

This patch adds a class to the cart template and to other pop-up window
templates to ensure that a large min-width is not enforced and to give
consistent padding to those pages.

To test, set your theme to 'CCSR' and view the following pop-up pages:

- The Cart. From the cart, trigger:
  - The "send" window
  - The "download" window
- From a view of a List's contents trigger:
 - The "send" window"
 - The "download" window

Each of these pages should look correct with no horizontal scrolling.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
All tests pass

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Template and CSS changes only, but no string changes.
Save for inclusion in 3.12.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit db0fa0eacda5a448d9406a03fc92cdaff393ea52)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
10 years agoBug 10054 - When SingleBranchMode is enabled, allow superlibrarians to set logged...
Kyle M Hall [Mon, 15 Apr 2013 13:09:05 +0000 (09:09 -0400)]
Bug 10054 - When SingleBranchMode is enabled, allow superlibrarians to set logged in library

Currently, when SingleBranchMode is enabled, nobody can change the
logged in library in Koha. To change it requires disable
SingleBranchMode, switching the library, and re-enabling it. It seems
reasonable to allow superlibrarians to switch the logged in library even
if SingleBranchMode is enabled.

Test Plan:
1) Apply this patch
3) Enable SingleBranchMode
4) Log in as a superlibrarian
5) Attempt to change the logged in branch
   This change should succeed
6) Log in as a non-superlibrarian account
7) Attempt to change the logged n branch
   This should not be allowed, as per Koha's current behavior

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
I guess this doesn't do any harm even though the practical motivations
behind it, as described in the bug, seem otherwise solvable. If
SingleBranchMode is supposed to prevent librarians from switching their
logged in library why can they choose their library when they first log
in? Was SingleBranchMode supposed to only affect the OPAC originally? Or
should the login form be modified? This seems to be a band-aid on a
poorly-implemented feature.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Patch works as decribed. As this only adds a check for a superlibrarian
it seems safe and should not interfere with normal staff accounts.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit 218194fab0398e433651d5ba26634d79c63442f5)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
10 years agoBug 10225 - If an item isn't editable, don't show the onclick Edit/Delete menu
Owen Leonard [Thu, 9 May 2013 19:08:41 +0000 (15:08 -0400)]
Bug 10225 - If an item isn't editable, don't show the onclick Edit/Delete menu

The user should not be shown edit/delete links when clicking on a row in
additems which they cannot edit because of the IndependantBranches
setting. This patch adds a class to the row to exclude such rows in the
JavaScript onclick handler.

To test:

- Turn IndependantBranches on and edit items for a title which
  has holdings from various branches including your own.
- Click a row for an item which is held by your library. You should see
  the "Edit/Delete" links appear.
- Click a row for an item which is held by another library. No links
  should appear.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
All test pass

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
All tests and QA script pass.
Changes to the templates include no string changes.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit b36d3bc796fd1b0a4db32729c994287425f10326)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
10 years agoBug 10134 - set XSLT usage ON as default, for new Koha installs
Magnus Enger [Wed, 8 May 2013 09:10:27 +0000 (11:10 +0200)]
Bug 10134 - set XSLT usage ON as default, for new Koha installs

Currently, new installs are created with XSLT display set to "off",
but XSLT seems to be the preferred way to display records, so
having the default be "on" instead seems to make sense. This patch
will of course only affect new installs.

To test:
- Apply the patch
- Run through the webinstaller on an empty database
- Log in to the staff client and search for "xslt" in system
  preferences
- Verify that XSLTDetailsDisplay, XSLTResultsDisplay,
  OPACXSLTDetailsDisplay and OPACXSLTResultsDisplay are all set to
  "default"

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Passes test plan correctly.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Changes syspref.sql for new installations to use XSLT views
by default. No changes to existing installations, no
string changes.
Passes all tests.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit e7571a1a1c3054b738f4fd9f37c45750143544c5)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
10 years agoBug 9679 - can't place hold from cart in CCSR
Owen Leonard [Fri, 10 May 2013 13:50:51 +0000 (09:50 -0400)]
Bug 9679 - can't place hold from cart in CCSR

When the CCSR theme is enabled, selecting items in the cart and clicking
"place hold" triggers a JavaScript error and fails. This patch adds a
function missing from the CCSR version of basket.js.

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

- Enable the CCSR theme and put items into the OPAC cart.
- Open the cart, select one or more items, and click "place hold."

The cart should automatically close and the main window should redirect
to the holds screen showing your selections.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
All test passed

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Confirmed patch fixes the problem described.
All tests and QA script pass, JavaScript only change.
No strings involved, save for inclusion in 3.12.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit d0f93e67726ed242e1124d36ed00d1a4a3645701)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
10 years agoBug 10201 [Follow-up] Old OPAC patron update system should be removed
Owen Leonard [Tue, 7 May 2013 16:11:23 +0000 (12:11 -0400)]
Bug 10201 [Follow-up] Old OPAC patron update system should be removed

The previous patch missed removal of one template, kohaerror.tt, which
was used only by opac-userupdate.pl. This patch removes it.

To test, apply the patch and search Koha source files for references to
kohaerror. There should be none.

Signed-off-by: Mirko Tietgen <mirko@abunchofthings.net>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
All tests and QA script pass. Updating the German po files
with this patch applied no new strings appeared.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit 8aa2bb150ae384d4195bdcf178e82f495ede6a1b)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
10 years agoBug 10201 - Old OPAC patron update system should be removed
Owen Leonard [Mon, 6 May 2013 14:56:03 +0000 (10:56 -0400)]
Bug 10201 - Old OPAC patron update system should be removed

The old pages for viewing and updating patron details in the OPAC have
been superceded by the new script opac-memberentry.pl. This patch
removes he old scripts and templates and corrects links to them.

This patch also removes reference to opac-userupdate.tt from
opac-patron-image.pl  and replaces the authentication process with one
which uses check_cookie_auth, based on the example of opac-tags.pl.

To test, edit a patron record and set the "Gone no address" flag. Log in
to the OPAC with that account and view the patron details page. The
warning about out of date contact information should link to the new
update page.

Next, attempt to place a hold. You should see the same warning, and it
should also link to the new update page.

Test the display of patron images: Log in as a user who has an image
associated with their account and navigate to
/cgi-bin/koha/opac-patron-image.pl. Their patron image should display.

A search of Koha source files should return no results for the missing
scripts or templates.

Signed-off-by: Mirko Tietgen <mirko@abunchofthings.net>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Comments on second patch.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit 029c4b334de1d5c0727ee840a91f114072c52995)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
10 years agoBug 10217 - Make sure direct links to detail views work when there is no session
Magnus Enger [Wed, 8 May 2013 10:03:48 +0000 (12:03 +0200)]
Bug 10217 - Make sure direct links to detail views work when there is no session

To reproduce:
- Make sure you do not have a session for the OPAC you will be testing
  with. Delete the CGISESSID session cookie if you have one.
- Go directly to a detail view, e.g.:
  /cgi-bin/koha/opac-detail.pl?biblionumber=1
- Observe the error "Can't use an undefined value as a HASH
  reference at /home/magnus/scripts/kohadev/opac/opac-detail.pl line 445."

To test:
- Apply the patch
- Reload the page with the error
- You should now see the detail view of the record, as usual

Thanks to Chris Cormack who suggested the fix for this!

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Tested according to test plan, confirmed patch fixes the problem.
All tests and QA script pass.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit 51a1e8854830d72e42dbfe313a5082ccd5f48688)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
10 years agoBug 9681: Increment version number
Jared Camins-Esakov [Wed, 8 May 2013 14:03:26 +0000 (10:03 -0400)]
Bug 9681: Increment version number

Database update for bug 9681 has been given version 3.11.00.301
(cherry picked from commit 5a9a82dcc3ebdb3b7f130edbfb8c6ef67f97eb68)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
10 years agoBug 9681: Add some indexes in database
Paul Poulain [Mon, 6 May 2013 13:06:47 +0000 (15:06 +0200)]
Bug 9681: Add some indexes in database

Some table columns should have an index to speed SQL queries :
- statistics table has only one index (used to make heavy queries for reports)
- itemtype should have an index in items and biblioitems (this is used in circulation to check the number of existing issues of a specific item type)
- issue.branchcode and issue.issuingbranch

Test plan :
- Create a new database using kohastructure.pl
=> check there is no SQL error and that new indexes are present (mysql> show create table)
Apply update database on a master version
=> check there is no SQL error and that new indexes are present (mysql> show create table)

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Comment: Indexes created as described. No errors.
Fixing small merge conflict.
Test presence of new indexes on all affected tables.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit 68ff49bb7d982737c41a225cd697b8fb60d0b4ab)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
10 years agoBug 10185: Add missing columns in update 3.09.00.025
Julian Maurice [Mon, 6 May 2013 06:43:50 +0000 (06:43 +0000)]
Bug 10185: Add missing columns in update 3.09.00.025

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
SQL only changes fixing an important database update.

IMPORTANT: Patches must be backported to all versions containing
the database update 3.09.00.025.

I used the test plan provided by Julian with some additions:
1/ Do a fresh 3.8 install
2/ Do some reserves
3/ Check your old_reserves table is empty
4/ Update your sources to 3.10
5/ Run updatedatabase.pl
6/ Your reserves table is now empty!

I made sure I had item level and title level holds, also
suspended holds.

I repeated the test with entries in my old_reserves table
(cancelled and filled holds) to make sure this is also still
working correctly.

Before the patch we lost all suspended holds and when the
old_reserves table was empty also all holds in general.
After the patch the reserve_id is added but the other data
in both tables is not altered.

NOTE: Adding the reserve_id first to old_reserves and then
to reserves we are missing one id in between.
old_reserves: 1,2,3
reserves: 5,6
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit 30d067400e6d15cd86d8b35daed4bb10438d0e2e)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
10 years agoBug 10185: Fix update 3.09.00.025
Julian Maurice [Fri, 3 May 2013 15:20:17 +0000 (17:20 +0200)]
Bug 10185: Fix update 3.09.00.025

It can remove all reserves from reserves table when there is no entries
in old_reserves.
This is due to @ai which is set to NULL in
  SET @ai = ( SELECT MAX( reserve_id ) FROM tmp_reserves )
and reserve_id > NULL returns no results in
  INSERT INTO reserves SELECT * FROM tmp_reserves WHERE reserve_id > @ai

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Test plan and comments on second patch.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit 37c52367b08f30514483b02a387cb5a463ea15d0)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
10 years agoBug 10156 - Fix usr/bin/perl path for get_report_social_data.pl
David Cook [Wed, 8 May 2013 08:00:29 +0000 (18:00 +1000)]
Bug 10156 - Fix usr/bin/perl path for get_report_social_data.pl

Currently, the perl path for get_report_social_data.pl is "#!/bin/perl"
when it should be "#!/usr/bin/perl".

While I'm not entirely sure how to test this, rangi did mention:

23:47 (it wouldnt work on my debian install)
23:48  zsh: no such file or directory: /bin/perl

It's a pretty trivial change, so I'm not sure it needs much of a test
plan.

Signed-off-by: Magnus Enger <magnus@enger.priv.no>
Before the patch "grep -r '#!/bin/perl' in the misc dir shows one file
with this line, and it is indeed get_report_social_data.pl. After the
patch there are no occurrences left.
Passed-QA-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit 2e103a018cedc1c57d1c0db8acad6f93ab4ca428)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
10 years agoBug 8278: build the structure with to_json instead of manually.
Jonathan Druart [Mon, 22 Apr 2013 14:19:01 +0000 (16:19 +0200)]
Bug 8278: build the structure with to_json instead of manually.

Test plan:
Same as previously.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit bb1b15d93937677aa61dbee8fce8c19846acb4d8)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
10 years agoBug 8278 [Follow-up] Replace YUI autocomplete in UNIMARC 210c plugin
Owen Leonard [Mon, 15 Apr 2013 19:09:24 +0000 (15:09 -0400)]
Bug 8278 [Follow-up] Replace YUI autocomplete in UNIMARC 210c plugin

This follow-up corrects the heading of the plugin pop-up window to match
the UNIMARC field it targets.

To test, trigger the plugin and confirm that the pop-up window refers to
210c.

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Smple patch, fixes label. No errors.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit e75fd34e92c599da8daa7ab40ef0153acbf05bf6)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
10 years agoBug 8278 : Follow up, fixing the permissions on cataloguing/ysearch.pl
Chris Cormack [Tue, 2 Apr 2013 06:48:34 +0000 (19:48 +1300)]
Bug 8278 : Follow up, fixing the permissions on cataloguing/ysearch.pl

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Comment: Works. No errors.

Without patch and normal staff user, logged out
With patch, normal staff, valid output.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit 588cc04571bd4eab1878c4abcac883ebe3ad060e)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
10 years agoBug 8278 - Replace YUI autocomplete in UNIMARC 210c plugin
Owen Leonard [Fri, 8 Mar 2013 17:56:24 +0000 (12:56 -0500)]
Bug 8278 - Replace YUI autocomplete in UNIMARC 210c plugin

This plugin, for pseudo-authority-control of publisher information,
used YUI autocomplete to pull existing publisher data from the
biblioitems table. Despite its name it is not UNIMARC-specific.
It assumes publisher name data is saved in biblioitems.

This patch converts the autocomplete to jQueryUI. The search
script has been amended to return valid JSON. The template has
been modified to enable the jQueryUI autocomplete and to add
structure more consistent with other popups.

To test, link the publisher name field in your MARC structure to
the unimarc_field_210c_bis.pl plugin. Open a MARC record for
editing and click the "tag editor" link to launch the plugin.
Type the first few letters of a publisher which exists in your
database. You should get an autocomplete menu of publishers
which match your search. Select one and click the "choose"
button to fill the field in the MARC editor.

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Comment: work as described. No errors.

Test: link 260b to plugin. Edit record and search first letters
of present editors. Menú appears and can select and fill value.

Why plugin 210c_bis talk about field 225a?

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Plugin now works correctly for me, even when linked
to 260$b in a MARC21 installation. All tests and QA script
pass.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit 626c27baf993b8a19a7cdace902c03ae26f23da5)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
10 years agoBug 10204 - Patron image no longer appears in the OPAC
Owen Leonard [Mon, 6 May 2013 16:29:01 +0000 (12:29 -0400)]
Bug 10204 - Patron image no longer appears in the OPAC

With the addition of opac-memberentry.pl to the OPAC we lost a way to
display the image associated with a patron's account. This patch adds
display of the patron image to opac-memberentry.pl now that
opac-userdetails.pl and opac-userupdate.pl are deprecated.

To test:

1. Log into the OPAC as a patron who has an image associated with their
   account. View the "my personal details" tab and confirm that the
   patron image appears with and without OPACPatronDetails enabled.

2. Log into the OPAC as a patron who has no image associated with their
   account. View the "my personal details" tab and confirm that the
   layout looks correct.

3. Turn off OPACpatronimages and confirm that the "my personal details"
   page looks correct.

Signed-off-by: Mirko Tietgen <mirko@abunchofthings.net>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Tested with OpacPatronDetails and OpacPatronImags turned on/off
and it's working well.
Template only changes.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit afccbfcce7192c6e1fcd73f137135cb5289c3d3d)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
10 years agoBug 9961: Add truncation support to QP driver
Jared Camins-Esakov [Thu, 2 May 2013 15:53:36 +0000 (11:53 -0400)]
Bug 9961: Add truncation support to QP driver

The original implementation of QueryParser did not handle truncation
based on the QueryAutoTruncate system preference. This patch adds support.

To test:
1) Apply patch.
2) Turn on UseQueryParser.
3) Set QueryAutoTruncate to "automatically."
4) Search for "har". Note that it returns results with words
   like "Harry" (i.e. with right truncation).
5) Search for "har*". Note that it still returns results with right
   truncation.
6) Set QueryAutoTruncate to "only when * is added."
7) Search for "har". Note that it returns only records that have the
   exact word "har" in them (most likely there will be none unless you
   have Hebrew items).
8) Search for "har*". Note that once again it returns results for "Harry"
   (i.e. right truncated results).
9) Sign off.

This patch also reindents a hash in Koha/QueryParser/Driver/PQF.pm
because it was hard to read before.

Signed-off-by: Mirko Tietgen <mirko@abunchofthings.net>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
All tests and QA script pass.
Thx for fixing this Jared!
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit 8c6fe639b812665339a2cd84083f8c75d3957fdd)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
10 years agoBug 8896 QA Followup for regex
Marcel de Rooy [Thu, 11 Apr 2013 10:48:26 +0000 (12:48 +0200)]
Bug 8896 QA Followup for regex

Making sure that the regex does not kill more than it should.
Amended: does now only look at separating colons(;) not commas(,).
Amended: two index expressions in direct context replaced by same regex for
consistency.

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit e5b467e81f494857a0831fe0d4f9ad94127a91bb)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
10 years agoBug 8896: Delete serials no more missing from missinglist
Lyon3 Team [Mon, 8 Apr 2013 09:14:09 +0000 (11:14 +0200)]
Bug 8896: Delete serials no more missing from missinglist

When manual history is disabled in subscription history section
if a serial has been previously set as missing and is received
or set as expected, late or claimed, it will be deleted from missinglist

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Regex needs a followup. More comments on Bugzilla.

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit ccc7f535cb585352b2e933c1e5694e1d6e06d38b)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
10 years agoBug 10166: Increment holdable counter
Jared Camins-Esakov [Mon, 6 May 2013 12:35:00 +0000 (08:35 -0400)]
Bug 10166: Increment holdable counter

The $anyholdable variable was set to 0 or 1. However, as it is set in
a loop, and future changes to the opac-reserve.pl script may require
knowing how many items the patron is going to place a hold on, it makes
more sense to treat $anyholdable as a counter. This follow up turns it
into one.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit 5c9522382c83f078692051fa572c56b21b54fa77)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
10 years agoBug 10166 - Can't place holds on multiple titles if one or more are un-holdable
Owen Leonard [Wed, 1 May 2013 18:22:50 +0000 (14:22 -0400)]
Bug 10166 - Can't place holds on multiple titles if one or more are un-holdable

opac-reserve.pl tries to check whether all selected titles in a
multiple-hold batch are unavailable to be placed on hold. However, the
logic is flawed in such a way that if the last item in the batch cannot
be placed on hold the script assumes none can be placed on hold.

This patch modifies the way the script tracks the "no titles available
for holds" variable in order to correct the error.

To test, place multiple holds by selecting titles from a list of search
results. Test three conditions:

- All titles are available to be placed on hold

  You should see no onscreen warnings, and all titles should be
  selectable on the place hold screen. A "Place hold" button should
  appear at the bottom.

- Some titles can be placed on hold, some cannot

  The titles which can be placed on hold should be selectable.
  Titles which cannot be placed on hold should show a warning
  message. A "Place hold" button should appear at the bottom.

- No titles can be placed on hold

  "Sorry, none of these items can be placed on hold." should appear at
  the top of the page. All titles should appear with warning messages.
  There should be no "Place hold" button.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
All tests and QA script pass.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit 8016d2bd0d2d45ee0777469d28d988f2794575fb)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
10 years agoBug 10183: Remove single pixel on the serials collection page
Jonathan Druart [Fri, 3 May 2013 12:37:46 +0000 (14:37 +0200)]
Bug 10183: Remove single pixel on the serials collection page

Test plan:
Go on the serials collection page
Check that the single pixels before and after the table have
disappeared.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Pixels are removed, table functions work as before.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit d485dbe275a209816b82029924a4143a1d166949)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
10 years agoBug 10176: Solve the Invalid URLs in 'Refine Search Results' when it uses UNICODE...
Karam Qubsi [Sat, 4 May 2013 20:44:57 +0000 (23:44 +0300)]
Bug 10176: Solve the Invalid URLs in 'Refine Search Results' when it uses UNICODE symbols

I just add use utf8; to the Search.pm and the problem
was solved .

Test plan :
1- Add bib records with non-latin characters
2- search for some of these records
3- try to refine your search using Subject / Author

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Comment: Work fixing URLs in facets. Now they work correctly.
No errors.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Passes all tests and QA script.

I tested facets with the 22 Arabic records provided on
bug 9579 successfully. Before the patch the links are not
correct, after applying the patch the links work as
expected.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit 2d29440c5ade462bf6939f2ab32b5ec9c2c1b377)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
10 years agoBug 10084 - YUI path wrong in CCSR theme with packages
Tomas Cohen Arazi [Fri, 19 Apr 2013 18:14:17 +0000 (15:14 -0300)]
Bug 10084 - YUI path wrong in CCSR theme with packages

Bug 9052 fixed this for prog, CCSR was left aline in the dark (it's friday).

Regards
To+

Sponsored-by: Universidad Nacional de Cordoba
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Worked fine in my test package, good work Tomas
Signed-off-by: Mason James <mtj@kohaaloha.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit be1770ffccdff54f3140f3af7f7f1d026c46e05a)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
10 years agoBug 10150 - koha-email-disable error handling
Tomas Cohen Arazi [Mon, 29 Apr 2013 15:29:40 +0000 (12:29 -0300)]
Bug 10150 - koha-email-disable error handling

koha-email-disable now
- Checks the instance exists.
- Checks if email is already disabled.

Regards
To+

Sponsored-by: Universidad Nacional de Córdoba
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Mason James <mtj@kohaaloha.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 31b43ac1fe6830426c80988b93bc15d0fa88e79a)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
10 years agoIncrement version for 3.12.0-beta3 release v3.12.00-beta3
Jared Camins-Esakov [Thu, 2 May 2013 03:06:54 +0000 (23:06 -0400)]
Increment version for 3.12.0-beta3 release

10 years agoAdd release notes for 3.12.0-beta3
Jared Camins-Esakov [Thu, 2 May 2013 03:04:49 +0000 (23:04 -0400)]
Add release notes for 3.12.0-beta3

10 years agoBug 10044: Remove duplicate pagination on the pending orders page.
Jonathan Druart [Fri, 26 Apr 2013 11:59:18 +0000 (13:59 +0200)]
Bug 10044: Remove duplicate pagination on the pending orders page.

Test plan:
Check that there is just one pagination on the pending orders page.

Signed-off-by: Mathieu Saby <mathieu.saby@univ-rennes2.fr>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works and deletes the old pagination that was replaced by
datatables.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit 7b0b6e32d1462fab10257769c417f014b0819135)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
10 years agoBug 10070: revert previous changes
Jonathan Druart [Fri, 26 Apr 2013 13:43:58 +0000 (15:43 +0200)]
Bug 10070: revert previous changes

To test
1/ logout
2/ search "bar" (added to the history)
3/ search "féé" => history is empty

Apply patch
1/ logout
2/ search "bar" (added to the history)
3/ search "féé" => added to the history

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Passes tests and QA script.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
10 years agoBug 9250 - Followup to add koha-*-sip commands to koha-common.xml
Magnus Enger [Tue, 5 Mar 2013 12:49:11 +0000 (13:49 +0100)]
Bug 9250 - Followup to add koha-*-sip commands to koha-common.xml

The original patch for Bug 9250 did not add the new commands to
debian/docs/koha-common.xml, which functions as a sort of table
of contents for the real commands. This patch adds them.

Signed-off-by: Robin Sheat <robin@catalyst.net.nz>
Simple documentation patch
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit 38b1fd99c4e3a2ae3a944c5ba0b17189da3feef5)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
10 years agoBug 9250 - [SIGNED-OFF] provide commands to manage the SIP server
Robin Sheat [Mon, 10 Dec 2012 05:57:04 +0000 (18:57 +1300)]
Bug 9250 - [SIGNED-OFF] provide commands to manage the SIP server

This adds commands required to control the SIP server. These commands
are:
* koha-enable-sip - copies the SIP config to the sites directory
* koha-start-sip - starts the SIP server processes
* koha-stop-sip - stops the SIP server processes

It also calls these as appropriate from the koha-common init script.

To use:
1) sudo koha-enable-sip instancename
2) sudo vim /etc/koha/sites/instancename/SIPconfig.xml
   Do whatever is needed for your site's SIP configuration
3) sudo koha-start-sip instancename

To test:
1) Build packages with this patch
2) Ensure that sudo koha-start-sip instancename doesn't do anything
3) Run sudo koha-enable-sip instancename
4) Edit /etc/koha/sites/instancename/SIPconfig.xml if needed (probably
   not required for testing)
5) Run sudo koha-start-sip instancename
6) Note that the sip processes are now running
7) Run sudo koha-stop-sip instancename
8) Note that the sip processes have gone
9) Reboot your Koha server
10) Note that the sip processes are back

Sponsored-By: Waitaki District Council Libraries
Sponsored-By: South Taranaki District Council Libraries
Sponsored-By: Horowhenua District Council Libraries
Sponsored-By: Rangitikei District Council Libraries
Signed-off-by: Magnus Enger <magnus@enger.priv.no>
Works as advertised. koha-start-sip without a prior koha-enable-sip
does nothing. koha-enable-sip copies the SIP config file to the
instance directory. After koha-enable-sip, koha-start-sip and
koha-stop-sip works as expected. After a reboot, the SIP processes are
still running. I have not actually tested the SIP servers after they
have been started, but assume they work the same as always.
The man pages look good.

The new commands should also have been added to the man page for
koha-common. I'll do a followup for that.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit 3dc22e7fb27162b3a461477bc40f5c38a1739516)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
10 years agoBug 10041 - Provide a koha-translate script to aid package users on installing transl...
Tomas Cohen Arazi [Sun, 14 Apr 2013 00:10:33 +0000 (21:10 -0300)]
Bug 10041 - Provide a koha-translate script to aid package users on installing translations

Until we have solved the packaging of koha template translations, provide a command that manages the installed translations in a proper way.

To test, build a Debian package of current master+the patches from this bug :-D and try the many options running koha-translate --help provide.

The command itself can be grabbed from a git checkout with this patch applied to test the script's funcionality. If it (and its docs) fits the package building stuff, I'll test on monday when I can be back on my workstation.

Sponsored-by: Universidad Nacional de Córdoba
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Comment: Good adition. Work as described. No errors.
Copied to /usr/local/bin. No errors on install, update, remove, list and check.
Passed-QA-by: Mason James <mtj@kohaaloha.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit 2cd5afa9741ef432a9f3ecac939c98e20d5ebfc5)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
10 years agoBug 10101 - Follwup: fix param check
Tomas Cohen Arazi [Mon, 29 Apr 2013 18:18:17 +0000 (15:18 -0300)]
Bug 10101 - Follwup: fix param check

As Mason noted, there was an error on that line.

Sponsored-by: Universidad Nacional de Córdoba
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Mason James <mtj@kohaaloha.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit 7d09198659c92eda7046dee0f93e4caf2ec37096)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
10 years agoBug 10101 - make koha-enable more robust
Tomas Cohen Arazi [Tue, 23 Apr 2013 14:03:44 +0000 (11:03 -0300)]
Bug 10101 - make koha-enable more robust

koha-enable now:

- checks for the existence of the instance before any other action on it.
- checks if the instance is already enabled before changing stuff in the config files.
- only reloads apache if it is needed!
- handles more than one instance name as parameter (the code was there, a check for the cardinality of the args prevented it from working).
- documents this behaviour change in the docs
- doesn't break if the provided (invalid) instance name is a prefix/suffix of a real one (added -x to the relevant grep command).

To test:
- Aplpy the patch, build your packages
- Run koha-enable on
  - Non existent instance (try using a prefix or a suffix of an already created one too).
  - Already enabled existent instance name.
  - Disabled instance.

Regards
To+

Sponsored-by: Universidad Nacional de Córdoba
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Mason James <mtj@kohaaloha.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit 3bca90eb0c0fc91f64f3e479ac6ab25e54d4f1aa)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
10 years agoBug 10104 - Followup: fix param check
Tomas Cohen Arazi [Mon, 29 Apr 2013 18:22:09 +0000 (15:22 -0300)]
Bug 10104 - Followup: fix param check

As noted by Mason on bug 10101, the check was not working for zero arguments.

Sponsored-by: Universidad Nacional de Córdoba
Signed-off-by: Mason James <mtj@kohaaloha.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit ca118d57db383f5efebc4d53cba11ccc8af5c9a9)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
10 years agoBug 10104 - make koha-disable more robust
Tomas Cohen Arazi [Tue, 23 Apr 2013 16:29:02 +0000 (13:29 -0300)]
Bug 10104 - make koha-disable more robust

koha-disable now:

- checks for the existence of the instance before any actions on it.
- checks if the instance is already disabled before touching anything (warns otherwise)
- only reloads apache if needed
- handles more than one instance name.
- changed the docs to acknowledge the previous item.

To test:
- Apply the patch, build your package
- Run koha-disable on
  - Non existent instance (try names that are prefix and suffix of a valid one too please)
  - Already disabled instance name.
  - Enabled instance name.

It should work as expected and warn the user on the expected wrong cases.

Regards
To+

Sponsored-by: Universidad Nacional de Córdoba
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Mason James <mtj@kohaaloha.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit b055f7d86c7772cf52c4a20d04a7e1cb0c8c19c9)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
10 years agoBug 10144 - koha-start-zebra error handling
Tomas Cohen Arazi [Mon, 29 Apr 2013 13:30:08 +0000 (10:30 -0300)]
Bug 10144 - koha-start-zebra error handling

koha-start-zebra now
- Checks the instance exists.
- Checks the instance is enabled.
- Checks if the zebra daemon is already running.

Regards
To+

Sponsored-by: Universidad Nacional de Córdoba
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Mason James <mtj@kohaaloha.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit 98bde26d2571b43ecee07e017e36f45e1aa6e680)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
10 years agoBug 10149 - koha-restart-zebra error handling (rewording)
Tomas Cohen Arazi [Mon, 29 Apr 2013 14:54:27 +0000 (11:54 -0300)]
Bug 10149 - koha-restart-zebra error handling (rewording)

koha-restart-zebra now
- Checks the instance exists.
- Checks the instance is enabled.
- Checks if the zebra daemon is already running.

Regards
To+

Edit:
- changed some wording problems.
- fixed an error in parameter validation

Sponsored-by: Universidad Nacional de Córdoba
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Mason James <mtj@kohaaloha.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit cee6909c8a5c10cc534a1ebe35ec5b8cda522eab)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
10 years agoBug 6506: Correct CSS class name.
Peter Crellan Kelly [Tue, 9 Apr 2013 19:22:41 +0000 (07:22 +1200)]
Bug 6506: Correct CSS class name.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Mason James <mtj@kohaaloha.com>
http://bugs.koha-community.org/show_bug.cgi?id=6509
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit 79ea900b2c47caa71e995fa35d65e1a5c78d3a6d)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
10 years agoBug 6506: When AnonymousPatron not set, deletion of issue history silently failed.
Peter Crellan Kelly [Thu, 28 Mar 2013 08:00:47 +0000 (21:00 +1300)]
Bug 6506: When AnonymousPatron not set, deletion of issue history silently failed.

Remedied by:
- in Circulation.pm changing AnonymiseIssueHistory so that it returns ($rows, $err_history_not_deleted) instead of $rows
- consequential change to misc/cronjobs/batch_anonymise.pl to handle updated return value, and fail if there is an error
- consequential change to tools/cleanborrowers.pl although this still fails silently (raised as bug 9944)
- update of opac-privacy.pl to check return value and pass on error
- update of opac-privacy.tt to display error if appropriate

Note bug 9942 remains unfixed, which is a similar issue upon issue return.

To test:
1. OPAC
- enable privacy mode (preference OpacPrivacy)
- leave anonymous patron set to zero (preference AnonymousPatron)
- attempt to delete user history
- observe error
- check history - still there
- change anonymous patron to a valid user
- attempt to delete user history
- observe success message
- check history - gone

2. cleanborrowers.pl
- test it functions as before.  bug 9944 has been raised for it continuing to silently fail.

3. batch_anonymise.pl
- enable privacy mode (preference OpacPrivacy)
- leave anonymous patron set to zero (preference AnonymousPatron)
- run script (I use --days -1 for testing)
- script should fail with a Carp message
- change anonymous patron to a valid user
- run script as before
- script returns quietly
- check history - gone

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Mason James <mtj@kohaaloha.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit 571dab9c7cd7f79e936c28fa60d471e6c1288493)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
10 years agoBug 6506: Followup add warning in the system information tab.
Jonathan Druart [Tue, 9 Apr 2013 10:08:56 +0000 (12:08 +0200)]
Bug 6506: Followup add warning in the system information tab.

Add a warning in the system information tab of the about page.

Test plan:
Set OPACPrivacy = 1 and AnonymousPatron = 0 and go on the about page,
tab 'system information'. Check that the warning appears.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Mason James <mtj@kohaaloha.com>
http://bugs.koha-community.org/show_bug.cgi?id=6509
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit 4c709c600799392eae67f715cff1b5a2e574c042)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
10 years agoBug 7228: can't add items in an order with Modify
Christophe Croullebois [Thu, 18 Apr 2013 10:55:18 +0000 (12:55 +0200)]
Bug 7228: can't add items in an order with Modify

We have a message if we want to add items and we can't add, substract only.
It's ok if we choose to create items on ordering, in this case koha can't add items, just substract
and in this case we have to delete manually the items(s) in the catalog.
But if via the syspref AcqCreateItem we choose to create items when receiving this limitation is not usefull
The patch just checks if the syspref AcqCreateItem is on 'ordering'
if not the message is not shown and we can add items

Signed-off-by: Mathieu Saby <mathieu.saby@univ-rennes2.fr>
Here is the test I made for signing off :
after applying the patch
- syspref AcqCreateItem  : create items on RECEIVING
- in a basket, create an order (quantity = 1)
- save the order
- reopen the order
- change the quantity (2 instead of 1)
- save the order
=> changing quantity was not possible before the patch

- syspref AcqCreateItem  : create items on CATALOGING
- in a basket, create an order (quantity = 1)
- save the order
- reopen the order
- change the quantity (2 instead of 1)
- save the order
=> changing quantity was not possible before the patch

- syspref AcqCreateItem  : create items on ORDERING
- in a basket, create an order (click on "add" to add an item => quantity = 1)
- save the order
- reopen the order
- try to change the quantity (2 instead of 1), without clicking on "add" to create a new item => you cannot (alert message)
=> the behavior is the same as before the patch

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Copied test plan from bug report.
Template only change deactivating the Javascript that blocks
you from changing the quantity when AcqCreateItem is set to
something else than 'ordering'.
Passes all tests and QA script.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit 3269d358e55ca2d702be9f544749eca59f057206)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
10 years agoBug 10033 - dangerous query in _koha_modify_item
Fridolyn SOMERS [Fri, 12 Apr 2013 15:24:17 +0000 (17:24 +0200)]
Bug 10033 - dangerous query in _koha_modify_item

The SQL query build in C4::Items::_koha_modify_item performs an update on a row of items table identified by itemnumber.
Actually the query is build using a hash of datas :
    for my $key ( keys %$item ) {
        $query.="$key=?,";
        push @bind, $item->{$key};
    }
But this hash contains 'itemnumber' key, so you get an update including the primary key.
It is actually harmless but may be dangerous.

This patch simply skips itemnumber key in above loop.

Test plan :
Check you can create and modify items.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit 598dfe27224f517fafa06df75521c623992ecbe0)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
10 years agoBug 8419 - Suspended holds appear on the daily holds queue
Kyle M Hall [Mon, 15 Apr 2013 12:39:26 +0000 (08:39 -0400)]
Bug 8419 - Suspended holds appear on the daily holds queue

This bug was reintroduced by the patch for bu 5911: Transport Cost Matrix

Test Plan:
1) Place a hold on a record
2) Run build_holds_queue.pl
3) Verify the hold is showing in the holds queue
4) Suspend the hold
5) Re-run build_holds_queue.pl
6) Note the hold is still in the holds queue
7) Apply patch
8) Re-run build_holds_queue.pl
9) Note the hold is no longer in the holds queue

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Passes test plan and QA script.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit d098a7c298437b2fd6ced6a8237f98f3221b810f)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
10 years agoBug 7368: Small typo in history.txt
Marcel de Rooy [Mon, 29 Apr 2013 13:43:31 +0000 (15:43 +0200)]
Bug 7368: Small typo in history.txt

beomes becomes becomes :)

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Fixes a typo in a text file, no problems found.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit f6a10cffaba974182fa6bf0d2f51af687282ae2e)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
10 years agoBug 8300 - Add Test::WWW::Mechanize as an optional dependency
Magnus Enger [Wed, 20 Mar 2013 13:22:51 +0000 (14:22 +0100)]
Bug 8300 - Add Test::WWW::Mechanize as an optional dependency

This patch replaces an earlier patch by Marcel de Rooy, which
had become outdated because lots of new dependencies were
added since the patch was made.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit 508009c7a836375aaf2a5e18db10706ec73cff25)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
10 years agoBug 8300: Add mechanized unit test for batch import
Jared Camins-Esakov [Sat, 23 Jun 2012 20:55:43 +0000 (16:55 -0400)]
Bug 8300: Add mechanized unit test for batch import

This new unit test confirms that importing records via the Stage
MARC import tool still works by connecting to a Koha instance and
importing a record then reverting the import, checking at each step
of the way that everything is as it should be.

To test:
1. Install Test::WWW::Mechanize
> sudo apt-get install libtest-www-mechanize-perl
2. Set environment variables to reflect your Koha instance:
> export KOHA_USER=kohaadmin
> export KOHA_PASS=katikoan
> export KOHA_INTRANET_URL=http://localhost:8080
> export KOHA_OPAC_URL=http://localhost
3. Run the test:
> prove t/db_dependent/www/batch.t

This updated patch now handles both MARC21 and UNIMARC installations.

Signed-off-by: Magnus Enger <magnus@enger.priv.no>
All tests pass with marcflavour = MARC21 and NORMARC. Test #15 fails
when marcflavour = UNIMARC, but from what I can see, that is because
I'm testing on a MARC21 setup, missing the UNIMARC frameworks etc.
I'm signing off - QA folks, please ask for a proper UNIMARC signoff
if you feel it is needed.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Amended patch: Load the POSIX module (for the floor routine).
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit bc2ab3b5882e664d91ce086ce96dd32c7452dee4)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
10 years agoBug 7054 - NORMARC: Fix default for 000 position 17
Magnus Enger [Mon, 15 Apr 2013 17:02:46 +0000 (19:02 +0200)]
Bug 7054 - NORMARC: Fix default for 000 position 17

Someone at the library education in Oslo told me that it would be
better to have the default for 000/17 set to 1, instead of 2 as it
is today.

To reproduce:
- Run through the Web-installer in Norwegian and choose NORMARC as
  the MARC dialect
- Go to Home > Cataloging > Add MARC record and start to add a new
  record
- Click in the 000 field and it should be filled with:
  "     nam a22     2  4500"
- Reload the page, then open the value builder for 000 and click on OK
- 000 should get filled with the same string as above

To test:
- Apply the patch and repeat the steps from above. The default value
  for 000 should now be:
  "     nam a22     1  4500"

(Don't be confused by the 1s and the 2s. A value of 1 in position 17
means "level 2", and a value of 2 means "level 1" - that is how it
is defined in the "standard":
1 = Nivå 2, iflg. Katalogiseringsregler
2 = Nivå 1, iflg. Katalogiseringsregler)

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Small changes. Didn't test in a NORMARC installaton, but
trusting Magnus with this and seeing no reason why it
shouldn't work.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit 064fc8b5223b19a57c658e7ca3444df7c017a444)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
10 years agoBug 7055 - NORMARC: Fix 008 position 15-17 and 35-37
Magnus Enger [Mon, 15 Apr 2013 17:50:19 +0000 (19:50 +0200)]
Bug 7055 - NORMARC: Fix 008 position 15-17 and 35-37

This patch does several things:
- Set the default for 008/15-17 to "no " (yes, there is space at the end)
- Link from 008/15-17 in the value builder to NORMARC country codes
- Set the default for 008/35-37 to "nor" (by setting the
  DefaultLanguageField008 syspref)
- Link from 008/35-37 in the value builder to NORMARC language codes
- Fix a missing <tr> around field 35-37

To reproduce:
- Run through the Web-installer in Norwegian and choose NORMARC as
  the MARC flavour
- Go to Home > Cataloging > Add MARC record and add a new record
- Click in the field for 008. The default should look like:
  130415t        xxu||||| |||| 00| 0 eng d
                 ^^^                 ^^^
- Reload the page and open the value builder for 008. Problems:
  - The text for 15-17 links to MARC21 country codes
  - The default for 15-17 is xxu
  - The text for 35-37 links to MARC21 language codes
  - The default for 35-37 is eng
  - If you choose e.g. "Monografier" in the top dropdown then click
    on "OK" the window does not close

To test:
- Apply the patch and run through the Web-installer again, selecting
  Norwegian and NORMARC
- Go to Home > Cataloging > Add MARC record and add a new record
- Click in the field for 008. The default should look like:
  130415t        no ||||| |||| 00| 0 nor d
                 ^^^                 ^^^
- Reload the page and open the value builder for 008.
- Check that...
  - The default for 15-17 is "no " (with a space at the end)
  - The link goes to NORMARC country codes
  - The default for 35-37 is "nor"
  - The link goes to NORMARC language codes
- Select something from the top dropdown and click "OK". Check that the
  window closes and that the values that are entered into the 008 field
  matches what you chose in the popup window.

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Trusing Magnus is right, so testing for any regressions mainly, all good

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Only changes NORMARC specific plugin and system preferences
files. Changes all seem logical to me.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit 361e5f83e21fd94364e34af71e4a7fc64a03d2cb)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
10 years agoBug 10053: borrowers.branchcode cannot be null
Jonathan Druart [Mon, 15 Apr 2013 12:27:46 +0000 (14:27 +0200)]
Bug 10053: borrowers.branchcode cannot be null

The DB field borrowers.branchcode cannot be null (`branchcode`
varchar(10) NOT NULL default ''). However, an empty value can be selected
on creating/updating a patron.

Test plan:
- Add or edit a patron and choose the empty value for library
(branchcode).
- Save (pref BorrowerMandatoryField must not contain branchcode).
- Mysql raises an error.
- Apply the path.
- Check that you are not able to select no library.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit 09d36cee3c16b14acf0435531d1789486e0a0a44)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
10 years agoBug 10097 - Hide framework selection when importing staged authority records
David Cook [Tue, 23 Apr 2013 02:58:19 +0000 (12:58 +1000)]
Bug 10097 - Hide framework selection when importing staged authority records

Currently, when importing authority records using the "Manage staged
MARC records" tool, it will show the text "Add new bibliographic records
into this framework:" followed by a drop-down menu of possible frameworks.

Since these are bibliographic frameworks and we're importing authority
records which do not use them, we have no need to show this information.

I'm proposing just a little patch to display this info only for
bibliographic records. From my tests, everything seems to work fine
without this text and the drop-down, although I've only uploaded one
MARC21 authority record at a time.

--

Test Plan:

Before applying patch...

1) Find yourself an authority record. I recommend downloading your
favourite author from: http://authorities.loc.gov/
2) Stage MARC for import. Choose "Authority" as your record type.
3) Go to "Manage staged records"
4) Underneath the button "Import this batch into the catalog", you
should see the text "Add new bibliographic records into this framework:"
followed by a drop-down of the available frameworks.

Optionally) You can also try this for bibliographic records. You'll find
the same.

After applying the patch...

5) Repeat steps 2 and 3.
6) Underneath the button "Import this batch into the catalog", you
should just see a table listing your MARC record(s).
7) Stage MARC for import. Choose "Bibliographic" as your record type.
8) Go to "Manage staged records".
9) You should find step 4 still to be true (i.e. the "Add new
bibliographic..." text should still be there).

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Small template change, passes all tests.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit 01f7542f4bdbd9b31836ed8c3fc817b67086b8d2)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
10 years agoBug 9719 - Changing the rows per page on a custom report fails if it has user supplie...
Kyle M Hall [Wed, 27 Feb 2013 13:46:56 +0000 (08:46 -0500)]
Bug 9719 - Changing the rows per page on a custom report fails if it has user supplied parameters

If you create an SQL report that includes one or more parameters,
using the 'rows per page' pulldown does not work. Instead, it will
prompt for the parameters again and shows the first page of output.

Test Plan:
1) Create a new report from sql as follows:
    SELECT * FROM borrowers WHERE surname LIKE <<Last Name>> AND firstname LIKE <<First Name>>
2) Run this report
3) Change the 'Rows per page' and click 'Update'
4) This should kick you back to the start where the report asks you for your parameters
5) Apply the patch
6) Repeat step 3, this time is should work correctly

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works nicely now. All tests and QA script pass.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit 020b8a66bc1ea9173ede154678ff690fd5f67c1f)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
10 years agoBug 9957 - Missing cancel link on subfield editing page
Owen Leonard [Tue, 30 Apr 2013 18:39:48 +0000 (14:39 -0400)]
Bug 9957 - Missing cancel link on subfield editing page

The subfield edit page has an edit bottom at the top of the page. Almost
no other edit screens do this. It would be more consistent to put it at
the bottom. Also missing is a "cancel" link. This patch fixes both
issues.

The patch also adds "Default" to the breadcrumbs when editing a subfield
in the default framework.

To test, apply the patch and edit a subfield: MARC frameworks -> MARC
structure -> Subfields -> Edit. The "Save changes" button should appear
at the bottom of the page alonside a "Cancel" link. Both should work
correctly.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Template change only, improves consistency and works
nicely.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit 559ff89fd641df9a67fe6fc53efdc49854ccdd1c)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
10 years agoBug 9266 - Untranslated strings in tags moderation
Owen Leonard [Fri, 26 Apr 2013 18:20:49 +0000 (14:20 -0400)]
Bug 9266 - Untranslated strings in tags moderation

There are a couple of English strings in tags moderation JavaScript
which are not properly enclosed in the _() function enabling
translation. As a result, clicking a translated 'Approve' or
'Reject' button in the table of tags would change the button's
neighbor's label to the English string. This patch
corrects it.

To test, apply the patch and regenerate a translation to test with. Go
to Tools -> Tags and find a list of tags to moderate (pending, approved,
or rejected). When you click on an 'Approve' or 'Reject' tag in the
table of tags, the buttons in each Approve/Reject pair should retain
their correct translated label. For instance, looking at approved tags
in French:

[ Approuvé ] [ Rejeter ]

Clicking the "Rejetee" button should change the state to:

[ Approuver ] [ Rejetée ]

Clicking "Approuver" should return the buttons to the first state.

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Mason James <mtj@kohaaloha.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit acfbfcb7d9b6bef3186adc9b93ead44fc58ce420)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
10 years agoBug 7143: Add missing contributor to about page
Jared Camins-Esakov [Wed, 1 May 2013 11:14:44 +0000 (07:14 -0400)]
Bug 7143: Add missing contributor to about page
(cherry picked from commit 78d32cc138fda7f9872bceab36fe37d5bf39ee61)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
10 years agoBug 7143: Updating the About page with translation teams for Basque and Turkish
D Ruth Bavousett [Tue, 22 Jan 2013 18:44:33 +0000 (15:44 -0300)]
Bug 7143: Updating the About page with translation teams for Basque and Turkish

Text-change only, should require little QA and testing.
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Template change only, changes look correct to me.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit 80d926ea60baa0046bd11ae92346ef3f23ed41e3)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
10 years agoBug 7143 Followup for some new developers on about page
Marcel de Rooy [Mon, 29 Apr 2013 14:02:29 +0000 (16:02 +0200)]
Bug 7143 Followup for some new developers on about page

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Template change only - changes look correct to me.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit c641fd0b957e02e42b0ae389fa5e5b6ca114705b)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
10 years agoBug 10111 - Layout on basket summary page a bit inconsistent
Owen Leonard [Thu, 25 Apr 2013 13:34:17 +0000 (09:34 -0400)]
Bug 10111 - Layout on basket summary page a bit inconsistent

Some details in the summary of basket information were not marked up
consistently with others on the page. This patch makes the markup
consistent for a consistent appearance.

To test, view a basket in Acquisitions which is part of a basketgroup.
Information should be displayed consistently for baksets in both open
and closed basket groups.

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

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Template change only, works nicely.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit 72c95fa1ccd7fadadd5e5b73cf4e1a5623f18f89)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
10 years agoBug 6709 - marc21_field_006.xml and marc21_field_008.xml can't be translated
Bernardo Gonzalez Kriegel [Mon, 29 Apr 2013 16:07:11 +0000 (13:07 -0300)]
Bug 6709 - marc21_field_006.xml and marc21_field_008.xml can't be translated

This patch changes
1) structure and schema for xml files used in MARC21
006 and 008 value builders.
2) JavaScript functions used to show value builders.

Xml processing is enabled in previous patch

Any translatable string has been moved to an xml element,
those strings that no need translation remains as xml
attributes.

NOTE_1: I do not include as translatable material types
codes, because those values are restricted in schema
definition. But this restriction can be removed.

NOTE_2: Anyone with experience in XML/XSD please
check the new schema definition.

NOTE_3: Anyone with experience in the former and
JavaScript please check xmlControlfield.js

To test:
1) Apply the patch
2) Verify that 006 and 008 value builders show and work
properly
3) Update translation files for your favorite language,
a new set of strings must show up corresponding to
names and descriptions on value builders.

Note: messed up patches, sending again.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
All tests and QA script pass.

Did regression tests on the plugins for 006 and 008 and could
spot no differences in behavior of the plugins to before.

Also tested the translation process and found it working nicely.
Thank you for fixing this long standing translation bug!
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit b6518e632ddf1c2e97fe9f49d9dd307a3047266b)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
10 years agoBug 6709 : Patch for testing translating .xml files
Chris Cormack [Sun, 8 Apr 2012 08:10:19 +0000 (20:10 +1200)]
Bug 6709 : Patch for testing translating .xml files

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Comment on second patch.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit 3588e2820ebdada0befecbb698b93a9aadc8a510)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
10 years agoBug 10143 - Fixing license headers
Chris Cormack [Mon, 29 Apr 2013 10:31:58 +0000 (22:31 +1200)]
Bug 10143 - Fixing license headers

Some files have the old 59 Temple address instead of the 51 Franklin
street.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
I see lots more which will need to be corrected as well.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Corrects addresses in 3 files.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit c82facc01216f390a77de6268d75903c0eed7d42)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
10 years agoBug 10022 - Multiple tags moderation doesn't work on translated page
Fridolyn SOMERS [Wed, 10 Apr 2013 10:37:54 +0000 (12:37 +0200)]
Bug 10022 - Multiple tags moderation doesn't work on translated page

When using a translated intranet, tags moderation using checkboxes and a
submit button doesn't work. You get a message "Unknown Operation on x
Term(s)" (translated of course).

This patch corrects by using name="op-[operation]" instead of name="op"
in each submit input.

Test plan :
- Create a new tag on a record
- Go to tags moderation in Tools
=> You should see your tag in pending terms
- Click on checkbox
- Click on Approve or Reject submit button at the bottom of the table
=> Without patch the tag is still pending
=> With patch operation is well performed, tag is not pending
- Test "Check lists" form
- Test Approve and Reject buttons from "Actions" column

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Passes all tests and QA script.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit 86511b380f06f4b0f9c6a21332819c9614ac3b59)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
10 years agoBug 10017: Follow up handling with the multi libraries pref active
Karam Qubsi [Wed, 17 Apr 2013 10:16:00 +0000 (13:16 +0300)]
Bug 10017: Follow up handling with the multi libraries pref active

This Follow up patch will handle multi libraries pref
when it sets to "add" and enhance the way lists drop down menu appear

 Test plan for all patches ( the first one and  all follow ups )  :
 1- apply the patches ( from the first one and all follow up patches)
 2- use 3.10 po files and update it (for the master) "
    ../misc/translate/ perl translate update ar-Arab "
 3- install Arabic from the updated po files
    "perl translate install ar-Arab "
 4- set opac opacthemes pref to ccsr
 5- set OpacAddMastheadLibraryPulldown pref to add
 6- select the Arabic from the opaclanguages pref
 7- set opaclanguagesdisplay  to allow
 8- go to the opac and choose  arabic
 9- you will see all the directions from right to left
    (as you look at koha on a mirror ;) ))

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Comment: Work as decribed. No errors.
With all patches applied, we get a pretty RTL interface.
Well done!

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Changes are mostly CSS, one new image and a tiny template change.
Used po files from 3.8 for testing. Looks good!
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit 11820f3c17244a6b6d262bde30d4941d87f9fa5a)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
10 years agoBug 10017: Follow up OPAC-CCSR-Right-to-left-css
Karam Qubsi [Tue, 16 Apr 2013 15:56:34 +0000 (18:56 +0300)]
Bug 10017:  Follow up OPAC-CCSR-Right-to-left-css

This follow up patch will delete the "-moz-box-sizing"
property that I was add when I'm doing some tests on
the rtl css file and  I forgot to delete it

many thanks David Cook for your notes deleting that property will not effect  on the results

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Comment on last patch.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Comment on last patch.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit da5b3c0cdad485e7564b6ce1b2a0bdd5d06f14a1)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
10 years agoBug 10017: Fix CSS for right-to-left in CCSR theme
Karam Qubsi [Mon, 8 Apr 2013 12:17:30 +0000 (15:17 +0300)]
Bug 10017: Fix CSS for right-to-left in CCSR theme

This patch will add css file for the Opac CCSR
link this css file in the doc-head-close.inc
and add new image : arrow-left-grey-11x6.png
for the opposite direction of the right existing one.

the test plan is the same for the oldest patches
for opac prog and intranet ...

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Comment on last patch.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Comment on last patch.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit 2beeedafbe7c72c5b21fce9fffa6625f4fe99c3c)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
10 years agoBug 10083 - In Transit string doesn't get translated in the staff interface
Owen Leonard [Fri, 26 Apr 2013 19:18:12 +0000 (15:18 -0400)]
Bug 10083 - In Transit string doesn't get translated in the staff interface

For some reason this text inside a <td> isn't getting picked up by the
translator unless it's inside a <span>. This patch adds the span and
tidies up the text.

To test, apply the patch and "translate update" a translation. Searching
the po file for "In transit from" should return a result from detail.pl.

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Template only change fixing a translation problem.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit 284e3e0d31ac12cf03c024d42cb1ceb10e3c276d)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
10 years agoBug 10145: The acquisition details block is badly placed.
Jonathan Druart [Mon, 29 Apr 2013 14:01:56 +0000 (16:01 +0200)]
Bug 10145: The acquisition details block is badly placed.

Bug 5335 introduced a new "Acquisition details" block on the
subscription details page.
It is placed between to tabs and causes an ergonomic issue.

Test plan:
- Order a subscription.
- Go on the subscription detail page and select a tab.
- The "Acquisition details" block is moved from the bottom to the top of
the table.
- Apply the patch
- The "Acquisition details" block is always on the bottom of the table.

Signed-off-by: David Cook <dcook@prosentient.com.au>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Fixes display problem, passes all tests.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit 53cdc66a0e61783ab31ba5bbca0ed71b045bc334)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
10 years agoBug 10152: Default sorting wrong in parcels.pl
Jared Camins-Esakov [Mon, 29 Apr 2013 16:32:48 +0000 (12:32 -0400)]
Bug 10152: Default sorting wrong in parcels.pl

When you are receiving an order, the list of existing invoices should
appear in reverse chronological order. Unfortunately, right now it
appears in regular chronological order.

To test:
1) Make sure you have multiple invoices that have varying shipment
   dates for a vendor. We will assume this vendor is called "Example
   Vendor."
2) Choose the "Receive shipments" button on the Example Vendor page.
3) Note that the invoices are sorted by regular chronological order.
4) Apply patch.
5) Refresh "Receive shipment" page. Note that invoices are now sorted
   in reverse chronological order.
6) Sign off.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works as described.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit 23b9661efad0e0fd0deb3e3d025e08c8cfbc1fd3)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
10 years agoBug 10153 - Patron header search form is too wide
Owen Leonard [Mon, 29 Apr 2013 16:34:10 +0000 (12:34 -0400)]
Bug 10153 - Patron header search form is too wide

The patron header search form is now too wide to display correctly on
screens smaller than about 1110px. This patch groups the
previously shown-by-default choices with the hidden additional
search parameters.

To test, apply the patch and view any page which includes the patron
header search include, for example members/members-home.pl. Additional
search options should be hidden by default. Clicking "[+]" should show
all additional options: Search fields, search type, order by, library,
and category.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Works for me.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Passes all tests and QA script. I like this change.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit 065fe316ead0208bb562c953b798fc698e5b1f18)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
10 years agoAdd Edmund Balnaves to history
Jared Camins-Esakov [Wed, 1 May 2013 10:20:00 +0000 (06:20 -0400)]
Add Edmund Balnaves to history

Welcome, Edmund. You are the 210th committer to Koha!
(cherry picked from commit 898e8f131c53d3447359b3752475e96ba46dfb67)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
10 years agoBug 8264 - local cover images not working in IE8 [ prog ]
Edmund Balnaves [Mon, 15 Apr 2013 01:08:06 +0000 (11:08 +1000)]
Bug 8264 - local cover images not working in IE8 [ prog ]

[Patch submitted by David Cook]
Edmund, rather than myself, was the author of this patch,
so I'm not entirely sure about his code choices, but...it
looks like IE must process images differently than other
browsers.

It seems to me that the images are not appearing in IE,
because they're being regarded as incomplete or having
0/NULL natural width.

This patch simply introduces a try/catch hack where it
tries to add the image and remove any "no-image" elements
even nwhen the image is considered incomplete/width of
0/NULL. It won't do this if it catches any errors,
although I'm not sure that any errors would be caught
with this set up anyway...

It's certainly not the ideal solution, but it's a solution.

To Test:

Before applying the patch:
1) Use IE and FF/Chrome/other browser to view a record
   with local images attached
2) Note that the local images appear in FF/Chrome/other,
   but not in IE

Apply patch.

After applying the patch:
1) Repeat step 1 from above
2) Note that the local images now appear in all browsers
   as they should.

--

As I mentioned before, this seems like a real suboptimal
solution. Any ideas on why IE might be considering local
images to be incomplete or having 0/NULL natural width?

Signed-off-by: David Cook <dcook@prosentient.com.au>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
I did a regression test using Chromium and Firefox in
Ubuntu. I checked both prog and CCSR - covers displayed
nicely.
All tests and QA script pass.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Changed author of patch to reflect actual authorship.
(cherry picked from commit 7e293e20de5cf5639c161b46871f401ab950e841)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoBug 10088: FIX adding an order from a staged file.
Jonathan Druart [Thu, 25 Apr 2013 07:47:53 +0000 (09:47 +0200)]
Bug 10088: FIX adding an order from a staged file.

Bug 9902 introduced an issue in the C4::Items::PrepareItemrecordDisplay
routine. The existence of $defaulvalue hashref should be tested before
getting to the branchcode key.

Test plan:
Before applying the patch, an error occurred when you try to create an
order from a staged file.
After applying the patch, the error does not appear anymore.

Signed-off-by: Mathieu Saby <mathieu.saby@univ-rennes2.fr>
Signed-off-by: Mason James <mtj@kohaaloha.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit f2e44716f60578b9663862d7b2ba3b16f7067143)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoBug 2046: Increment version number
Jared Camins-Esakov [Sat, 27 Apr 2013 12:11:39 +0000 (08:11 -0400)]
Bug 2046: Increment version number

Database update for bug 2046 has been given version 3.11.00.203
(cherry picked from commit e1ecd7aa3fa5bbd6423255a4fc6585b946633eb1)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoBug 2046 - Suggestions: Title Field too small
Kristina D.C. Hoeppner [Fri, 29 Mar 2013 02:04:42 +0000 (15:04 +1300)]
Bug 2046 - Suggestions: Title Field too small

Increase both on staff and OPAC interface
from 80 to 255 characters to be saved in
the database. Shown will be 80 characters.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Clean patch, workes as described.

To test:
- Apply patch and run database update
- Check that the column in the database is now varchar(255)
- Enter a new suggestion in the OPAC
- Edit this suggestion in staff
- Confirm form has the new max value set
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit 7a5dc6eef546bfa4f9465e9f864bacdefe168cd5)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoAdd Stefano Bargioni to the history
Jared Camins-Esakov [Sat, 27 Apr 2013 11:21:25 +0000 (07:21 -0400)]
Add Stefano Bargioni to the history

Welcome, Stefano, you are the 209th developer with a patch in Koha!

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit 97596d94982ce8c7ea4f2e8a29f724cb97cc1613)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoBug 10093 - Typo in marc21_leader.tt
Stefano Bargioni [Fri, 26 Apr 2013 09:18:52 +0000 (11:18 +0200)]
Bug 10093 - Typo in marc21_leader.tt

fixed a typo in marc 21 leader builder about the value 'b', Serial component part

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Good catch.
Template change only.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit 9a449ce16ce00d667ff12ec262dc02e973a21cc2)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoBug 10110 Followup for Acquisition.pm
Marcel de Rooy [Thu, 25 Apr 2013 12:48:03 +0000 (14:48 +0200)]
Bug 10110 Followup for Acquisition.pm

Adding a FIXE at a line that uses $sth->{NAME} for possible utf8 problems.

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Adds a comment, no danger from that.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit 8084a70a3b13a87a516844ee7b7f3665aa8c1e95)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoBug 10110: Problems with diacritics in saved SQL reports
Marcel de Rooy [Thu, 25 Apr 2013 11:54:31 +0000 (13:54 +0200)]
Bug 10110: Problems with diacritics in saved SQL reports

Adds decoding for cgi params (for completeness).
Apparently, the NAME attribute of DBI statement handle has a UTF8 bug.
Fixing this by decoding the returned column names.
Did this in a shared routine.

http://bugs.koha-community.org/show_bug.cgi?id=10110
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Copying test plan from bug report:

Example SQL:
select
branchname as "Bibliothek (üöä)",
branchname "Bibiothek (üäa)",
branchname
from branches where branchcode = <<Bibliothekskürzel|branches>>

1) Create report with given example SQL or your own including
   some diacritics in the columnnames
2) Save the report and run it
3) Verify column names are broken before patch, but fixed after..

All tests and QA script pass.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit d050e557f4ac3d7a8b1a0fa573a8ca00aa0862a9)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoBug 9684 : Correct path to compact.xsl
Colin Campbell [Fri, 26 Apr 2013 16:11:37 +0000 (17:11 +0100)]
Bug 9684 : Correct path to compact.xsl

When try to display card view of retrieved record
error occurred as compact.xsl could not be found
script was constructing path as though it was opac

Also added fallback to en version if no xsl file
found under current lang as done in opac-showmarc.pl

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

* Set sys pref to use CCSR
* Do a Z39.50 Search
* Click 'card' on one of the results
* confirm that there is no error.

All test pass

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
I am astonished that opacthemes affects Z39.50 search in
staff so this might be fixing a bigger problem.

Checked that clicking on Card works for both themes now
correctly after I confirmed the bug.
Also all views in OPAC were checked for both themes.

All tests and QA script pass.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit 5b6f89714d58d4a7c33b621b2cefbc02523dafa3)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoBug 9659 follow-up: correct syntax for older Perl
Jared Camins-Esakov [Sat, 27 Apr 2013 01:32:49 +0000 (21:32 -0400)]
Bug 9659 follow-up: correct syntax for older Perl

A construction that was a syntax error in older versions of Perl was
causing problems for jenkins. This patch fixes it.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit 906bf789febd3e97bd23ed2cc1fcf3233bdfba9c)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>