koha.git
8 years agoMerge branch 'bug_7678' into 3.12-master
Jared Camins-Esakov [Tue, 22 Jan 2013 23:35:22 +0000 (18:35 -0500)]
Merge branch 'bug_7678' into 3.12-master

8 years agoBug 7678: Adds extended patron attributes in patron reports
Julian Maurice [Mon, 10 Dec 2012 11:23:09 +0000 (12:23 +0100)]
Bug 7678: Adds extended patron attributes in patron reports

Fix bug that prevented zero values to be shown in the results.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Fixes the problem with differentiating 0 and NULL values.
Passes all tests.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
8 years agoBug 7678: follow-up to pass QA
Julian Maurice [Mon, 20 Aug 2012 06:57:42 +0000 (08:57 +0200)]
Bug 7678: follow-up to pass QA

Check input parameters to avoid SQL injection
Rewrite a for loop for readability

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
All tests pass, perlcritic is unchanged.

Test plan
- Verify ExtendedPatronAttributes hides/shows new patron attribute
  search criteria
- Verify patron attribute show up correctly
  - pull down list for attributes linked to authorized values
  - input field for other attributes
- Verify search works correctly
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
8 years agoBug 7678: Adds extended patron attributes in patron reports
Matthias Meusburger [Fri, 20 Apr 2012 15:36:17 +0000 (17:36 +0200)]
Bug 7678: Adds extended patron attributes in patron reports

This patch allows to choose row and column amongst extended patron
attributes and to filter on them in reports/borrower_stats.pl

Signed-off-by: Marc Veron <veron@veron.ch>
Great, I was looking for such a feature.
Patch works as expected.

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>
8 years agoMerge branch 'bug_9116' into 3.12-master
Jared Camins-Esakov [Mon, 21 Jan 2013 13:55:47 +0000 (08:55 -0500)]
Merge branch 'bug_9116' into 3.12-master

8 years agoBug 9116: Remove some useless tmp variables
Jonathan Druart [Tue, 20 Nov 2012 14:57:13 +0000 (15:57 +0100)]
Bug 9116: Remove some useless tmp variables

Some variables are useless in C4::Items::PrepareItemrecordDisplay.

This patch removes its.

Test plan:
Syspref AcqCreateItem = "receive an order" and try to receive an order.
Check there is no regression.

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>
8 years agoMerge branch 'bug_9236' into 3.12-master
Jared Camins-Esakov [Mon, 21 Jan 2013 13:40:47 +0000 (08:40 -0500)]
Merge branch 'bug_9236' into 3.12-master

8 years agoBug 9236 : Redirect to the parcel page after deleting an item/order
Jonathan Druart [Wed, 12 Dec 2012 14:14:08 +0000 (15:14 +0100)]
Bug 9236 : Redirect to the parcel page after deleting an item/order

Signed-off-by: mathieu saby <mathieu.saby@univ-rennes2.fr>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
1) Receive shipment for a previously created basket with
  multiple order lines
2) Verify 'Delete order' links only have 2 parameters and
  when you delete an order, you are not redirected to the
  basket.
3) Verify the same is true for 'Delete order and catalog
  record'.
4) Apply both patches from Bug 9236.
5) Redo tests and verify page redirects correctly now.
  Links now also show the basket number as third parameter.

Also: make sure orders/items and records are deleted correctly.

Passes all tests and QA script.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
8 years agoBug 9236: FIX delete order when receiving
Jonathan Druart [Tue, 11 Dec 2012 13:24:40 +0000 (14:24 +0100)]
Bug 9236: FIX delete order when receiving

Before this patch the "delete order" links were broken on the receiving
page (parcel.pl)

Signed-off-by: mathieu saby <mathieu.saby@univ-rennes2.fr>
Before applying the patch, when recieving a parcel,
if you delete an order line, Koha tries to open the
page of the basket linked to that order, but can
not find it. Koha displays "Vendor not found".
With the patch, Koha finds the right basket.

I Sign off this patch, to be applied with the other patch ("Redirect to the parcel page after deleting an item/order")

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
8 years agoMerge branch 'bug_9364' into 3.12-master
Jared Camins-Esakov [Sat, 19 Jan 2013 00:15:47 +0000 (19:15 -0500)]
Merge branch 'bug_9364' into 3.12-master

8 years agoBug 9364: fixes billing/delivery addresses for new baskets
Adrien Saurat [Tue, 8 Jan 2013 11:18:18 +0000 (12:18 +0100)]
Bug 9364: fixes billing/delivery addresses for new baskets

Corrects the parameters used for the NewBasket call, when
creating a new basket.

Signed-off-by: Mathieu Saby <mathieu.saby@univ-rennes2.fr>
Signed-off-by: Elliott Davis <elliott@bywatersolions.com>
I am passing this with a warning.  You must go back and resave the locations.
After just rereshing I got the same results but upon resubmitting the form I got the result described in the test plan.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
8 years agoMerge branch 'bug_9357' into 3.12-master
Jared Camins-Esakov [Sat, 19 Jan 2013 00:10:34 +0000 (19:10 -0500)]
Merge branch 'bug_9357' into 3.12-master

8 years agoBug 9357: Missing 'c' option in MARC21 LEADER_18 value builder
Bernardo Gonzalez Kriegel [Mon, 7 Jan 2013 16:01:21 +0000 (13:01 -0300)]
Bug 9357: Missing 'c' option in MARC21 LEADER_18 value builder

This patch adds option 'c' to the position 18
of the leader value builder.
Also corrects label for option 'i'

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Elliott Davis <elliott@bywatersolions.com>
Works as described
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
8 years agoMerge branch 'bug_9348' into 3.12-master
Jared Camins-Esakov [Fri, 18 Jan 2013 18:47:52 +0000 (13:47 -0500)]
Merge branch 'bug_9348' into 3.12-master

8 years agoBug 9348 - Format dates in HOLD notices consistently
Kyle M Hall [Fri, 4 Jan 2013 13:04:25 +0000 (08:04 -0500)]
Bug 9348 - Format dates in HOLD notices consistently

Right now notices for holds awaiting pickup read something like this:

You have a hold available for pickup as of 2011-02-12.
This hold will expire if it is not picked up before: 02/22/2011.
If you no longer need this item or have any questions please contact us

Both dates should be formatting based on the dateformat system preference.

Test Plan:
1) Apply patch
2) Set the HOLD notice to the following:
    <<reserves.waitingdate>> / <<reserves.expirationdate>>
3) Place a hold for a patron
4) Enable the HOLD notice via email for that patron ( requires EnhancedMessaging )
5) Check the item in
6) Go to the borrower's Notices tab, check the body of the new HOLD notice,
   it should have two dates separated by a '/' in the format set by the dateformat
   system preference.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Patch works as advertised according to the test plan.

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Tested also with the HOLD_PRINT notice.

8 years agoMerge branch 'bug_9276' into 3.12-master
Jared Camins-Esakov [Fri, 18 Jan 2013 03:10:48 +0000 (22:10 -0500)]
Merge branch 'bug_9276' into 3.12-master

8 years agoBug 9276 - Display of biblio-level auth vals on OPAC search broken
Owen Leonard [Wed, 12 Dec 2012 16:43:27 +0000 (11:43 -0500)]
Bug 9276 - Display of biblio-level auth vals on OPAC search broken

If you have your MARC framework configured to link a biblio-level
field with an authorized value, and that value is linked to an
image, and the AuthorisedValueImages system preference is turned on,
the OPAC is supposed to display that image in search results
much like item type images are displayed if item-level itemtypes
are enabled. The switch to Template::Toolkit broke this feature
with a variable scope error.

This patch corrects the variable scope of the sytem preference check
and adds a check for the existence of the image so that the template
doesn't try to display broken images.

To test:

1. Turn on the AuthorisedValueImages system preference.
2. If necessary, create or configure an authorized value with images.
3. Configure a MARC framework to link a field to the authorized value. I
   chose an arbitrary field, 942e.
4. Edit a bibliographic record and set a value for the MARC field
   you configured.
5. Make sure Zebra has reindexed, and perform an OPAC search which
   will include the record you edited. With AuthorisedValueImages
   ON, you should see the correct authorized value image.
6. With AuthorisedValueImages OFF, you should see no image.
7. Turn AuthorisedValueImages back on. Edit the authorized value again
   and configure it with no image. Perform your search again. You should
   see no image.

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
8 years agoMerge branch 'bug_9108' into 3.12-master
Jared Camins-Esakov [Fri, 18 Jan 2013 02:59:34 +0000 (21:59 -0500)]
Merge branch 'bug_9108' into 3.12-master

8 years agoBug 9108: Followup: send the dateformat value from C4::Auth
Jonathan Druart [Tue, 20 Nov 2012 10:44:39 +0000 (11:44 +0100)]
Bug 9108: Followup: send the dateformat value from C4::Auth

- the dateformat value is send to all templates (from
  C4::Auth::get_template_and_user)
- remove all assignment of dateformat in all .pl files
- the DHTMLcalendar_dateformat variable is unused

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Fixed conflicts:
 - opac/sco/sco-main.pl
 - reports/acquisitions_stats.pl
 - tools/cleanborrowers.pl

All tests pass, perlcritic problems appeared in some files
before and after these patches were applied.

Checked sorting in following pages:
- acqui/addorderiso2709.tt - list of staged imports in acq
- acqui/histsearch.tt - sorting of dates in acq search result list
- acqui/invoices.tt - billing date in list of invoices in acq
- acqui/lateorders.tt - list of late orders in acq
- acqui/ordered.tt - ordered titles and estimated costs for a fund
- acqui/parcels.tt - receive shipment page
- acqui/spent.tt - received titles and actual costs for a fund
...
- serials-search.tt - subscription search result list
...
- opac/sco/sco-main.tt - due dates in list of checked out items
- reports/acquisitions-stats.tt - date searches, display of dates
- tools/cleanborrowers.tt
- tools.holidays.tt - different views of dates library is closed,
  adding dates

Checked dates display according to system preference everywhere and
searching, entering dates etc. still worked as expected.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
8 years agoBug 9108 - Add uk/euro date sort filter to pages which require it
Owen Leonard [Mon, 19 Nov 2012 20:06:33 +0000 (15:06 -0500)]
Bug 9108 - Add uk/euro date sort filter to pages which require it

This patch adds the JS required to enable correct sorting
of dates in DD/MM/YYYY format to pages which require it.

To test, set your dateformat accordingly and confirm on the
affected pages that dates are sorted correctly.

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Resolved conflict in serials/serials-search.tt.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
8 years agoMerge branch 'bug_9310' into 3.12-master
Jared Camins-Esakov [Fri, 18 Jan 2013 02:54:10 +0000 (21:54 -0500)]
Merge branch 'bug_9310' into 3.12-master

8 years agoBug 9310 - Patron image upload template corrections
Owen Leonard [Mon, 26 Nov 2012 13:41:57 +0000 (08:41 -0500)]
Bug 9310 - Patron image upload template corrections

This patch fixes some template structure problems and makes some
improvements:

- Correct grid structure so that page isn't narrower than it needs
  to be.
- Move image upload messages out of message/error dialog and into
  table so that lines are distinct and legible.
- Expand breadcrumbs specificity
- Capitalization corrections

To test: Upload patron images using both single images and zip files.
Test zip file upload with a file which contains valid and invalid
contents (non-existant patron numbers, invalid image files, etc). In all
cases image uploads should work correctly and errors should be legibly
displayed.

Signed-off-by: Marc Veron <veron@veron.ch>
With patch, error messages are displayed  in a nice table.

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Tested with zip and png files. Works great.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
8 years agoMerge branch 'bug_9147' into 3.12-master
Jared Camins-Esakov [Fri, 18 Jan 2013 02:12:38 +0000 (21:12 -0500)]
Merge branch 'bug_9147' into 3.12-master

8 years agoBug 9147: OPAC hidden fields are not hidden in ISBD view
Fridolyn SOMERS [Mon, 26 Nov 2012 14:15:18 +0000 (15:15 +0100)]
Bug 9147: OPAC hidden fields are not hidden in ISBD view

When in framework a subfield has a number > 0 in hidden, it his hidden in MARCview.
It should be hidden also in ISBD view.

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Does what it says, hides hidden fields on the OPAC

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

To test:
1) Hide 245$b or another field from ISBD view in your MARC
   framework by assigning a hidden value greater 0
2) Check the different views in OPAC, the field should be hidden now from
  - Labelled MARC view (as it was before this patch)
  - ISBD view
   It will still show up for plain MARC and XSLT views.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
8 years agoMerge branch 'bug_9376' into 3.12-master
Jared Camins-Esakov [Fri, 18 Jan 2013 02:08:59 +0000 (21:08 -0500)]
Merge branch 'bug_9376' into 3.12-master

8 years agoBug 9376: extend HTML fix to moremember-brief.tt
Galen Charlton [Wed, 16 Jan 2013 17:09:56 +0000 (09:09 -0800)]
Bug 9376: extend HTML fix to moremember-brief.tt

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
8 years agoBug 9376: Problem with dateexpiry display in moremember.tt
Vitor FERNANDES [Thu, 10 Jan 2013 16:24:07 +0000 (16:24 +0000)]
Bug 9376: Problem with dateexpiry display in moremember.tt

There is a problem that brokens the interface of moremmeber when
displaying the date expiry when renewing a patron.
In the first comment I said that the line that causes the error
should be:

<span class="reregitryinfo">[% dateexpiry %]</span>

but the correct way should be:

<strong class="reregitryinfo">[% dateexpiry %]</strong>

This way the date expiry after renew a patron appears in bold.

Test plan:

- before applying the patch try to renew a patron and check
  that almost everything went bold
- apply the patch
- renew a patron and only the expiration date is bolder.
- Note that the bug doesn't manifest in master because
  the patch for bug 6261 causes the invalid HTML to never
  be reached; it *does* affect 3.10.x and earlier.

Sponsored-by: KEEP SOLUTIONS
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
8 years agoMerge branch 'bug_9229' into 3.12-master
Jared Camins-Esakov [Fri, 18 Jan 2013 02:02:58 +0000 (21:02 -0500)]
Merge branch 'bug_9229' into 3.12-master

8 years agoBug 9229 - branch code instead of name in subscription-detail.pl
Kyle M Hall [Fri, 14 Dec 2012 16:09:08 +0000 (11:09 -0500)]
Bug 9229 - branch code instead of name in subscription-detail.pl

This patch corrects the problem by using the KohaBranchName plugin.

Test plan:
Go in a subscription detail page.
Check that the "Library" information is changed from the branchcode to
the branchname

Signed-off-by: Fridolyn SOMERS <fridolyn.somers@biblibre.com>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
8 years agoMerge branch 'bug_9398' into 3.12-master
Jared Camins-Esakov [Fri, 18 Jan 2013 01:58:23 +0000 (20:58 -0500)]
Merge branch 'bug_9398' into 3.12-master

8 years agoBug 9398 - [ ? ] Link Lacks Context for All General Users (Accessibility) [Contexual...
Corey Fuimaono [Tue, 15 Jan 2013 22:23:46 +0000 (11:23 +1300)]
Bug 9398 - [ ? ] Link Lacks Context for All General Users (Accessibility) [Contexual Help]

testing procedure:
1. see that [ ? ] has simply been changed to 'Help'

Signed-off-by: Liz Rea <liz@catalyst.net.nz>
I like this change, the context is improved even for sighted individuals, and it helps screen reader users a great deal.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
The new 'Help' doesn't take up a lot more space than the old '[ ? ]'
and makes it easier to undertand what will happen when you click on it.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
8 years agoMerge branch 'bug_8401' into 3.12-master
Jared Camins-Esakov [Fri, 18 Jan 2013 01:55:47 +0000 (20:55 -0500)]
Merge branch 'bug_8401' into 3.12-master

8 years agoAdd Fred Pierre to history
Jared Camins-Esakov [Fri, 18 Jan 2013 01:55:20 +0000 (20:55 -0500)]
Add Fred Pierre to history

Welcome, Fred Pierre! You are the 201st committer to Koha.

8 years agoBug 8401 : Highlighting of search terms in preference causes loss of data
Fred Pierre [Thu, 17 Jan 2013 18:50:23 +0000 (13:50 -0500)]
Bug 8401 : Highlighting of search terms in preference causes loss of data

To test:

1/ Go to system preferences
2/ Go to SCOUserCSS
3/ Add #self
4/ Search for self
5/ Open SCOUserCSS
6/ Note it now contains only # (Do not click save)
7/ Apply the patch
8/ Refresh the page, and check SCOUserCSS and note it now says #self
9/ Rejoice!

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works nicely and passes all tests.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
8 years agoMerge branch 'bug_9413' into 3.12-master
Jared Camins-Esakov [Fri, 18 Jan 2013 01:49:10 +0000 (20:49 -0500)]
Merge branch 'bug_9413' into 3.12-master

8 years agoBug 9413: fix sample notice SQL for en
Galen Charlton [Wed, 9 Jan 2013 00:49:02 +0000 (16:49 -0800)]
Bug 9413: fix sample notice SQL for en

Fix two different errors that prevented sample notices
from being loaded into a fresh English Koha database.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Hugh Davenport <hugh@davenport.net.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
English sample_notices.sql installs correctly after this
patch is applied. Web installer completes without any errors.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
8 years agoMerge branch 'bug_9179' into 3.12-master
Jared Camins-Esakov [Thu, 17 Jan 2013 23:31:03 +0000 (18:31 -0500)]
Merge branch 'bug_9179' into 3.12-master

8 years agoAdd Corey Fuimaono to history
Jared Camins-Esakov [Thu, 17 Jan 2013 23:30:25 +0000 (18:30 -0500)]
Add Corey Fuimaono to history

Welcome, Corey Fuimaono! You are the 200th developer to have a patch
committed to Koha.

8 years agoBug 9179 - Incorrect capitalization in serials-collection.pl
Corey Fuimaono [Tue, 15 Jan 2013 02:12:38 +0000 (15:12 +1300)]
Bug 9179 - Incorrect capitalization in serials-collection.pl

testing procedure:
1. Make Subscription for Valid/Test Item
2. Look at Serial Collection Information and catagorize Item as "Arrived"
3. Click "Generate next". Observe Capitalization is Correct.

Signed-off-by: Liz Rea <wizzyrea@gmail.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Fixes capitalization for 'Generate next' button.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
8 years agoMerge branch 'bug_9062' into 3.12-master
Jared Camins-Esakov [Thu, 17 Jan 2013 23:24:03 +0000 (18:24 -0500)]
Merge branch 'bug_9062' into 3.12-master

8 years agoAdd Hugh Davenport to history
Jared Camins-Esakov [Thu, 17 Jan 2013 23:23:19 +0000 (18:23 -0500)]
Add Hugh Davenport to history

Welcome, Hugh Davenport! You are the 199th developer to have a patch committed
to Koha.

8 years agoBug 9062 Fix spacing next to tax rate
Hugh Davenport [Wed, 16 Jan 2013 21:42:14 +0000 (10:42 +1300)]
Bug 9062 Fix spacing next to tax rate

On the supplier view screen, there was a space after the discount
and before the % sign, but there was none for the tax rate.

This patch adds in a patch, so they look similar.

Signed-off-by: Hugh Davenport <hugh@davenport.net.nz>
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Tiny follow-up, fixes spacing.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
8 years agoBug 9062 Fix format for discount rate for vendors
Hugh Davenport [Wed, 16 Jan 2013 21:07:59 +0000 (10:07 +1300)]
Bug 9062 Fix format for discount rate for vendors

On the vendor display and edit screens, the tax rate information was
formatted to 1 decimal point, while the discount rate was not.

This patch adds a format string to the discount information so that
it is formatted in the same way.

Signed-off-by: Hugh Davenport <hugh@davenport.net.nz>
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Makes display on vendor detail page more consistent and
passes all tests.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
8 years agoMerge branch 'bug_8443' into 3.12-master
Jared Camins-Esakov [Wed, 16 Jan 2013 03:11:16 +0000 (22:11 -0500)]
Merge branch 'bug_8443' into 3.12-master

8 years agoBug 8443: Suggestions publication year and copyright date (follow-up 2) Cosmetic...
Fridolyn SOMERS [Tue, 6 Nov 2012 11:10:46 +0000 (12:10 +0100)]
Bug 8443: Suggestions publication year and copyright date (follow-up 2) Cosmetic changes and perltidy formatting

Cosmetic patch :

Manual editions :
- use of () for qw
- use of q{} or qq{} in SQL queries
- replacing $${key} by $->{key}
- formatting SQL queries (easier to read)
- in suggestion.tt reducing date input size to allow calendar icon on same line

+ Formatting with perltidy

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
All tests were done with all 3 patches from this bug applied:

1) Add suggestion from OPAC, check copyright date is saved
2) Add suggestion in intranet, check copyright date is saved
3) Edit suggestion, check change is saved correctly
4) Check date filters work as expected, using single dates, date ranges
   and multiple filters at once:
  - Accepted on
  - Managed on
  - Suggested on
5) Check copyright date search works correctly.

Passes all tests and QA script.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
8 years agoBug 8443: Suggestions publication year and copyright date (follow-up 1) Comments...
Fridolyn SOMERS [Tue, 6 Nov 2012 08:52:06 +0000 (09:52 +0100)]
Bug 8443: Suggestions publication year and copyright date (follow-up 1) Comments corrections

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
8 years agoBug 8443: Suggestions publication year and copyright date
Fridolyn SOMERS [Tue, 6 Nov 2012 08:50:48 +0000 (09:50 +0100)]
Bug 8443: Suggestions publication year and copyright date

Main patch correcting suggestions search :
- allow filtering on copyrightdate, manageddate and accepteddate
- entered dates remains in filter during search
- empty and null values are in the same tab
- null/empty values are not present in filers comboboxes

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
8 years agoMerge branch 'bug_9309' into 3.12-master
Jared Camins-Esakov [Wed, 16 Jan 2013 03:02:22 +0000 (22:02 -0500)]
Merge branch 'bug_9309' into 3.12-master

8 years agoBug 9309 - Make OPACurlOpenInNewWindow be respected for 856$u
Robin Sheat [Thu, 20 Dec 2012 02:45:33 +0000 (15:45 +1300)]
Bug 9309 - Make OPACurlOpenInNewWindow be respected for 856$u

If a biblio record contained a URL, and the OPAC was using the "normal"
(non-XSLT) display for records, then these links would never open a new
window. With this patch, they will.

Test plan:
1) have a biblio containing an 856$u link
2) set OPACurlOpenInNewWindow to "true"
3) do not use XSLT for displaying the detail pages in the OPAC
4) view the record, click the link, and note that it opens in the
   current window.
5) apply the patch
6) reload the detail page, click the link, and note that it opens a new
   window.

Sponsored-By: National Institute of Water and Atmospheric Research
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
8 years agoMerge branch 'bug_9306' into 3.12-master
Jared Camins-Esakov [Wed, 16 Jan 2013 02:55:01 +0000 (21:55 -0500)]
Merge branch 'bug_9306' into 3.12-master

8 years agoBug 9306: Update descriptions for the 4 SeparateHoldings prefs
Nicole C. Engard [Fri, 28 Dec 2012 14:33:49 +0000 (09:33 -0500)]
Bug 9306: Update descriptions for the 4 SeparateHoldings prefs

Patch updates the text of the SeparateHoldings and OpacSeparateHoldings
preference descriptions to be more readable.

To test, apply the patch and check the text of the preferences.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Description and test plan added.

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
8 years agoMerge branch 'bug_7657' into 3.12-master
Jared Camins-Esakov [Wed, 16 Jan 2013 02:52:04 +0000 (21:52 -0500)]
Merge branch 'bug_7657' into 3.12-master

8 years agoBug 7657 - Google and OpenLibrary image conflict
Owen Leonard [Thu, 3 Jan 2013 17:53:23 +0000 (12:53 -0500)]
Bug 7657 - Google and OpenLibrary image conflict

The JavaScript files which output Google and OpenLibrary cover images
each assumes it is the only source for cover images running. Each script
isn't specific enough to filter out markup generated by the other. This
patch corrects the specificity of the selector looking for markup
related to Google and OpenLibrary covers.

To test, enable both Google and OpenLibrary cover images in the OPAC.
Perform a search which will return results which include titles which
have covers from both services. Confirm that these covers appear
correctly and that "no cover" information still works correctly.

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>
Added corrected Javascript to CCSR theme.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
8 years agoMerge branch 'bug_8883' into 3.12-master
Jared Camins-Esakov [Wed, 16 Jan 2013 01:05:02 +0000 (20:05 -0500)]
Merge branch 'bug_8883' into 3.12-master

8 years agoBug 8883: 'opacsmallimage' doesn't work in ccsr theme
Martin Renvoize [Mon, 31 Dec 2012 13:07:02 +0000 (13:07 +0000)]
Bug 8883: 'opacsmallimage' doesn't work in ccsr theme

This patch makes it possible to customize the CCSR theme using the
opacsmallimage system preference. It also enables the LibraryName
preference for opacsmallimage alt text.

To test, set the opacsmallimage preference and switch to the CCSR
theme. Your custom image should appear. Set the LibraryName preference
and confirm that the alt attribute of the custom logo changes
accordingly.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
This patch works correctly, although it lacked a description and test
plan, which I have added. I would have used IF instead of UNLESS because
to me that seems more readable, but it's not a deal-breaker.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
8 years agoMerge branch 'bug_9215' into 3.12-master
Jared Camins-Esakov [Tue, 15 Jan 2013 04:28:50 +0000 (23:28 -0500)]
Merge branch 'bug_9215' into 3.12-master

8 years agoBug 9215 - non translatable string in manage-marc-import
Owen Leonard [Mon, 31 Dec 2012 16:41:19 +0000 (11:41 -0500)]
Bug 9215 - non translatable string in manage-marc-import

Status information about staged MARC record batches was being pulled
directly from the import_batches table where they are stored as English
strings. This patch puts a check on the status value into the template
so that translatable strings can be embedded.

To test, apply the patch and view both the table of staged MARC record
batches and details about individual batches. In the default 'en'
translation you should see import statuses displayed with a capital
letter ("Staged"). This indicates that the status is now being pulled
from the template.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
8 years agoMerge branch 'bug_9182' into 3.12-master
Jared Camins-Esakov [Tue, 15 Jan 2013 04:24:02 +0000 (23:24 -0500)]
Merge branch 'bug_9182' into 3.12-master

8 years agoBug 9182: fix on sortable columns on Saved reports
Adrien Saurat [Fri, 4 Jan 2013 16:07:40 +0000 (17:07 +0100)]
Bug 9182: fix on sortable columns on Saved reports

When displaying the Saved reports, since 3.10 the number of columns is
higher but the datasorter parameters have not been changed accordingly.
It's thus impossible to sort on the author or the creation date, for
example.

TEST PLAN :
1) Check sortable columns before applying : some useful columns are not
sortable, while the last columns are sortable (but don't need to be).

2) Once the patch is applied, the "non sortable" columns are the correct
ones.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Colums for saved reports are all sortable correctly now.
All tests and qa script pass.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
8 years agoMerge branch 'bug_7143' into 3.12-master
Jared Camins-Esakov [Tue, 15 Jan 2013 04:22:17 +0000 (23:22 -0500)]
Merge branch 'bug_7143' into 3.12-master

8 years agoBug 7143 updating history and about page
Chris Cormack [Thu, 27 Dec 2012 20:51:46 +0000 (09:51 +1300)]
Bug 7143 updating history and about page

Signed-off-by: Liz Rea <liz@catalyst.net.nz>
Changes look to be correct

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
8 years agoMerge branches '3.12-master' and 'bug_7143' into bug_7143
Jared Camins-Esakov [Tue, 15 Jan 2013 04:21:29 +0000 (23:21 -0500)]
Merge branches '3.12-master' and 'bug_7143' into bug_7143

8 years agoMerge branch 'bug_6574' into 3.12-master
Jared Camins-Esakov [Tue, 15 Jan 2013 04:17:25 +0000 (23:17 -0500)]
Merge branch 'bug_6574' into 3.12-master

8 years agoBug 6574 - js error in en-GB and en-NZ translations due to improper quoting
Liz Rea [Fri, 28 Dec 2012 00:24:45 +0000 (13:24 +1300)]
Bug 6574 - js error in en-GB and en-NZ translations due to improper quoting

To replicate:

* install en-NZ translation (or en-GB)
* activate the new language, and select it for use
* pretend you are going to issue a book to a member (search for a member from "check out" in header)
* without the patch, the toolbar will be incorrect. The toolbar will also be incorrect on moremember.pl.

To test:
* apply the patch
* re-generate the en-NZ or en-GB translation
* activate the new language, or select it for use
* pretend you are going to issue a book to a member (search for a member from "check out" in header)
* with the patch, the toolbar will appear to be correct. It will also be correct on moremember.pl.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
8 years agoMerge branch 'bug_8557' into 3.12-master
Jared Camins-Esakov [Tue, 15 Jan 2013 04:08:49 +0000 (23:08 -0500)]
Merge branch 'bug_8557' into 3.12-master

8 years agoBug 8557 - Unexpected behavior with scanners
Liz Rea [Wed, 12 Dec 2012 02:09:27 +0000 (15:09 +1300)]
Bug 8557 - Unexpected behavior with scanners

This is an alternative to the original implementation - this one works in chrome as well as firefox.

To test:

1)
Set syspref 'AcqCreateItem' to 'Create Item when receiving an order.'

2)
Create a basket for a vendor, add an order line.

3)
Search for this vendor using Vendor search

4)
Receive Shipment for this vendor and choose the title you ordered in 2)

5) You will get the dialog to create related item(s)

6)
Fill in Item 0 through o (see screenshot)

7)
Scan Barcode for field p - Barcode

7)
Result: Scanner sends a [return], form closes and you had no chance to fill in fields t - z

Signed-off-by: Marc Veron <veron@veron.ch>
Tested with Chrome Version 23.0.1271.97 m  and Firefox 17.0.1, both behave as expected.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Tested with Firefox and Chromium in Ubuntu.

Additional test done:
1) Add a new subscription, choose 'receive adds items'
2) Receive an issue, fill out $p with a barcode
3) Make sure hitting enter in the barcode field does not send the form.

All tests pass and QA script pass.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
8 years agoMerge branch 'bug_9126' into 3.12-master
Jared Camins-Esakov [Tue, 15 Jan 2013 04:01:15 +0000 (23:01 -0500)]
Merge branch 'bug_9126' into 3.12-master

8 years agoBug 9126: Do not return from Check too early.
Julian Maurice [Wed, 21 Nov 2012 16:38:28 +0000 (17:38 +0100)]
Bug 9126: Do not return from Check too early.

If there is no errors, it should continue instead of returning true.

+ move a block of code at the end of Check function. This avoid
detaching and re-attaching a HTML block if there are errors.

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
The following queries show us the issues:
select count(*) from items;
select * from aqorders_items where ordernumber=XX;

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
To test:

AcqCreateItem = receive
UniqueItemFields = barcode

1) Create a new basket
2) Create a new order with quantity > 1
3) Close the basket and create a new invoice/shipment
4) Receive only 1 item.
   - Fill out the first item form with item type only. Click add.
   - Don't change second item form at all.
   - Click save.

Before patch:
2 items are created on the record, both with the selected itemtype.

After patch:
Only 1 item is created, which is correct.

Signed-off-by: Elliott Davis <elliott@bywatersolions.com>
Seems to work as described by the test plan
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
8 years agoMerge branch 'bug_9360' into 3.12-master
Jared Camins-Esakov [Tue, 15 Jan 2013 03:53:01 +0000 (22:53 -0500)]
Merge branch 'bug_9360' into 3.12-master

8 years agobug 9360 - Clean borrowers tool wording and layout problematic
Liz Rea [Tue, 8 Jan 2013 03:51:45 +0000 (16:51 +1300)]
bug 9360 - Clean borrowers tool wording and layout problematic

To test:

Verify that the text has been changed to "Batch patron deletion/anonymization in the following places:

* tools-home
* the page title
* the heading on cleanborrowers
* the menu on cleanborrowers

Verify that the tool still works as intended.

This (finally) fixes the things Owen pointed out.
changes check-out to checkout per Galen.

Signed-off-by: Marc Veron <veron@veron.ch>
Behaves as expected.

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Fix indentation and tabulations characters
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
8 years agoMerge branch 'bug_8433' into 3.12-master
Jared Camins-Esakov [Sun, 13 Jan 2013 13:42:53 +0000 (08:42 -0500)]
Merge branch 'bug_8433' into 3.12-master

8 years agoBug 8433 Remove unused 'use English'
Colin Campbell [Thu, 12 Jul 2012 16:11:14 +0000 (17:11 +0100)]
Bug 8433 Remove unused 'use English'

Adding a use English to mosules which dont may
waste a few CPU cycles and bytes of storage
but doesnt add anything to the sum of human happiness

Remove unnecessary use English's
Removed already commented out but equally unnrcessary
use Exporter in same modules

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>
8 years agoMerge branch 'bug_9292' into 3.12-master
Jared Camins-Esakov [Sun, 13 Jan 2013 13:39:00 +0000 (08:39 -0500)]
Merge branch 'bug_9292' into 3.12-master

8 years agoBug 9292 - Remove dead code related to 'publictype'
Kyle M Hall [Fri, 14 Dec 2012 19:40:14 +0000 (14:40 -0500)]
Bug 9292 - Remove dead code related to 'publictype'

This patch removes the superflous code related to 'publictype' which
is a key set for item hashes in some perl files. This key is never
used or stored.

Test Plan:
1) Apply patch
2) Test catalogue/detail.pl, opac/opac-detail.pl and opac/opac-user.pl
3) You should not see any changes in behavior

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
8 years agoMerge branch 'bug_9065' into 3.12-master
Jared Camins-Esakov [Sun, 13 Jan 2013 13:32:21 +0000 (08:32 -0500)]
Merge branch 'bug_9065' into 3.12-master

8 years agoBug 9065 - set correct permission for upload local cover image
Fridolyn SOMERS [Wed, 9 Jan 2013 09:40:24 +0000 (10:40 +0100)]
Bug 9065 - set correct permission for upload local cover image

This patch fixes a problem where if a staff user has the
upload_local_cover_images permission (and is not a superlibrarian
and does not have all of the tools permissions), trying to use the
"Tools -> Upload local cover image" will fail with "You do not have
permissions [...]".

To test after applying the patch:

- Create a staff uesr that has just the catalogue and
  upload_local_cover_images permission.
- Log in as that staff user.
- Go to "Tools -> Upload local cover image".
- Verify that one is given the form to upload a cover image.
- Without the patch, one will be presented with the login
  form instead.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
mysql> select * from permissions where code="upload_cover_images";
Empty set (0.00 sec)

mysql> select * from permissions where code="upload_local_cover_images";
+------------+---------------------------+---------------------------+
| module_bit | code                      | description               |
+------------+---------------------------+---------------------------+
|         13 | upload_local_cover_images | Upload local cover images |
+------------+---------------------------+---------------------------+
1 row in set (0.00 sec)

"git grep upload_cover_images" returns 0 result.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
8 years agoMerge branch 'bug_8977' into 3.12-master
Jared Camins-Esakov [Wed, 9 Jan 2013 13:18:34 +0000 (08:18 -0500)]
Merge branch 'bug_8977' into 3.12-master

8 years agoMerge branch 'bug_9076' into 3.12-master
Jared Camins-Esakov [Tue, 8 Jan 2013 03:02:20 +0000 (22:02 -0500)]
Merge branch 'bug_9076' into 3.12-master

8 years agoBug 9076 - QA Followup - Rename GetBorrowersWhoHaveNotBorrowedSince to GetBorrowersTo...
Kyle M Hall [Tue, 11 Dec 2012 19:07:48 +0000 (14:07 -0500)]
Bug 9076 - QA Followup - Rename GetBorrowersWhoHaveNotBorrowedSince to GetBorrowersToExpunge

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
8 years agoBug 9076: Followup: FIX ergonomic issues
Jonathan Druart [Tue, 20 Nov 2012 13:34:09 +0000 (14:34 +0100)]
Bug 9076: Followup: FIX ergonomic issues

If no criteria is given, the form was submitted.
Labels were wrong

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>
8 years agoBug 9076 - Followup - Perltidy cleanborrowers.pl
Kyle M Hall [Wed, 14 Nov 2012 16:41:07 +0000 (11:41 -0500)]
Bug 9076 - Followup - Perltidy cleanborrowers.pl

Signed-off-by: Liz Rea <liz@catalyst.net.nz>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
8 years agoBug 9076 - Add ability to delete borrowers by expiration date and category code to...
Kyle M Hall [Wed, 14 Nov 2012 16:40:21 +0000 (11:40 -0500)]
Bug 9076 - Add ability to delete borrowers by expiration date and category code to cleanborrowers.pl

Signed-off-by: Liz Rea <liz@catalyst.net.nz>
Tested per plan, works. Staff category is not shown, and patch passes automated testing.

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
8 years agoMerge branch 'bug_9335' into 3.12-master
Jared Camins-Esakov [Tue, 8 Jan 2013 02:13:11 +0000 (21:13 -0500)]
Merge branch 'bug_9335' into 3.12-master

8 years agoBug 9335 - humanMsg popups don't disapear in webkit browsers
Martin Renvoize [Mon, 31 Dec 2012 16:50:22 +0000 (16:50 +0000)]
Bug 9335 - humanMsg popups don't disapear in webkit browsers

The popup message that appears after saving changes to system
preferences should dissapear upon any user actions (i.e mouse
click, mouse move, typing) but this does not happen in modern
webkit based browsers since jQuery was updated.

This patch adds the suggested fix to the jQuery plugin code as
suggested on https://code.google.com/p/humanmsg/issues/detail?id=9

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Tested with Google Chrome on Windows 7

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Tested with Google Chrome 22 and Firefox on Debian
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Tested with the following browsers:
  Mac: Chrome 23, Firefox 16.0.2, Opera 11.61, Safari 5.1.7
  Windows: IE8, Firefox 3.6.26

8 years agoMerge branch 'bug_9141' into 3.12-master
Jared Camins-Esakov [Tue, 8 Jan 2013 01:49:12 +0000 (20:49 -0500)]
Merge branch 'bug_9141' into 3.12-master

8 years agoBug 9141 - Untranslatable strings on "pay an amount..." page
Owen Leonard [Mon, 26 Nov 2012 01:30:57 +0000 (20:30 -0500)]
Bug 9141 - Untranslatable strings on "pay an amount..." page

Moving text of an error message from the script into the
template. To test, submit an amount which is greater
than the amount due. You should see an error message
displayed correctly with a properly-formatted currency
amount.

Signed-off-by: Marc Veron <veron@veron.ch>
Patch behaves as expected.

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
8 years agoMerge branch 'bug_9346' into 3.12-master
Jared Camins-Esakov [Tue, 8 Jan 2013 01:47:41 +0000 (20:47 -0500)]
Merge branch 'bug_9346' into 3.12-master

8 years agoBug 9346 - acqui/neworderempty.pl ignores exchange rates and destroys user data on...
Dobrica Pavlinusic [Thu, 3 Jan 2013 22:38:17 +0000 (23:38 +0100)]
Bug 9346 - acqui/neworderempty.pl ignores exchange rates and destroys user data on page load

This restores behaviour of new order form before BugĀ 5335 merge

Test scenario:

1. load Receipt summary for existing customer
2. take note of Unit cost and Order cost
3. open existing order line and verify that Replacement cost,
   Budgeted cost and Total are not re-calculated on page load
4. change currency and verify that costs are updated
   (change currency to system default and all values should become
   same as vendor price)
5. change Quantity, get alert "You can't add a new item, please create a new order line"
   and verify that Total still reflects correct value

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Elliott Davis <elliott@bywatersolions.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
8 years agoMerge branch 'bug_9331' into 3.12-master
Jared Camins-Esakov [Tue, 8 Jan 2013 01:35:47 +0000 (20:35 -0500)]
Merge branch 'bug_9331' into 3.12-master

8 years agoBug 9331 - Untranslatable strings in ajax.js
Owen Leonard [Mon, 31 Dec 2012 15:59:59 +0000 (10:59 -0500)]
Bug 9331 - Untranslatable strings in ajax.js

This patch moves untranslatable strings from ajax.js into the template
where they can be picked up by the translation script.

To test that preference-related error messages continue to work,
open the system preferences editor in two tabs. Log out in one tab and
try to save a system preference in the other. You should see correct
error messages.

To test that error strings are now translatable, run "perl translate update
 <lang>" from misc/translator, then check if the affected strings shows
up in the po file.

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Still works, and is now translatable

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
8 years agoMerge branch 'bug_8984' into 3.12-master
Jared Camins-Esakov [Fri, 4 Jan 2013 13:40:00 +0000 (08:40 -0500)]
Merge branch 'bug_8984' into 3.12-master

8 years agoBug 8984: make Zebra more UNIMARC compliant
Mathieu Saby [Thu, 6 Dec 2012 18:00:07 +0000 (19:00 +0100)]
Bug 8984: make Zebra more UNIMARC compliant

This patch makes the following changes to record.abs, biblio-koha-indexdefs.xml and biblio-zebra-indexdefs.xsl :
- adding new (sub)fields to Identifier-standard index : 011f/g ; 012a ; 013a/z ; 014a/z ; 015a/z ; 016a/z ; 017a/z, 040a/z, 071z, 072z, 073z
- adding 1 new subfield to Publisher index : 071b (may contain the name of a music publisher)
- adding new (sub)fields to Author and  Identifier-standard index (for the $9) : 716, 72X, 730 - adding new (sub)fields to Note : 334$a (award note)
- correcting 207 and 208
- suppressing 308a and 328a in Note (useless as complete fields are indexed in same index)
- adding (sub)fields to Title index : 411t, 421-425t, 433-437t, 442-444t, 446-456t, 462-463t, 470-488t, 560
- adding (sub)fields to Subject and  Identifier-standard index (for the $9) : 608, 615, 616, 617, 620, 621
- adding some classifications index : 670, 675, 686 - adding some comments (to make easier further modifications and to identify non unimarc fields : 414-420, 603, 630-636, 646)

To test :
- take a record and fill some of the missing fields (e.g 488t, 608, 720, 012a) with some data as "field488", "field608" etc
- try to find the record => not possible
- apply the patch, copy the new record.abs in etc/zebradb/biblios/etc and rebuild zebra
- try to find the record => should be ok
- check nothing else is broken...
- same test with DOM indexing activated

http://bugs.koha-community.org/show_bug.cgi?id=8984
Signed-off-by: Zeno Tajoli <tajoli@cilea.it>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
8 years agoMerge branch 'bug_8924' into 3.12-master
Jared Camins-Esakov [Fri, 4 Jan 2013 13:25:49 +0000 (08:25 -0500)]
Merge branch 'bug_8924' into 3.12-master

8 years agoBug 8924: Some modules erroneously skipped by 00-load
Jared Camins-Esakov [Tue, 1 Jan 2013 00:45:58 +0000 (19:45 -0500)]
Bug 8924: Some modules erroneously skipped by 00-load

Several patterns were being skipped unnecessarily in t/00-load.t:
* C4::Cache* - no longer exists
* C4::Record - no longer requires database
* C4::Serials - no longer requires database

To test:
1) Unset KOHA_CONF and/or shut down MySQL.
2) Run `prove t/00-load.t`
3) If the test passes, the patch is good.

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
144 tests passing.

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
8 years agoMerge branch 'bug_9102' into 3.12-master
Jared Camins-Esakov [Fri, 4 Jan 2013 13:14:03 +0000 (08:14 -0500)]
Merge branch 'bug_9102' into 3.12-master

8 years agoBug 9102 : Set HttpOnly on the CGISESSID cookie
Chris Cormack [Sun, 18 Nov 2012 07:01:37 +0000 (20:01 +1300)]
Bug 9102 : Set HttpOnly on the CGISESSID cookie

https://www.owasp.org/index.php/HttpOnly

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
To test, use curl

Before the patch

% curl -I http://192.168.2.135
HTTP/1.1 200 OK
Date: Sun, 18 Nov 2012 06:56:49 GMT
Server: Apache/2.2.22 (Ubuntu)
Pragma: no-cache
Cache-control: no-cache
Content-script-type: text/javascript
Content-style-type: text/css
Set-Cookie: CGISESSID=19689f6e7d8ec94c25269fecebf2f009; path=/
Vary: Accept-Encoding
Content-Type: text/html; charset=UTF-8

After patch

 % curl -I http://192.168.2.135
HTTP/1.1 200 OK
Date: Sun, 18 Nov 2012 07:01:04 GMT
Server: Apache/2.2.22 (Ubuntu)
Pragma: no-cache
Cache-control: no-cache
Content-script-type: text/javascript
Content-style-type: text/css
Set-Cookie: CGISESSID=da25baf03c0bc1e2c512a627028e43e6; path=/; HttpOnly
Vary: Accept-Encoding
Content-Type: text/html; charset=UTF-8
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
8 years agoMerge branch 'bug_7919' into 3.12-master
Jared Camins-Esakov [Wed, 2 Jan 2013 21:51:37 +0000 (16:51 -0500)]
Merge branch 'bug_7919' into 3.12-master

8 years agoBug 7919: FIX the "all" categories method
Jonathan Druart [Mon, 17 Dec 2012 10:04:07 +0000 (11:04 +0100)]
Bug 7919: FIX the "all" categories method

The C4::Category->all method must return fields from the categories
table only.
Without this patch, there is 2 "categorycode" values, the second one is
sometimes undef (if no branch limitation).

same for the GetBorrowercategoryList routine (some category codes are
undefined)

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Liz Rea <liz@catalyst.net.nz>
Signed off for also fixing problems with patron searching noted by Katrin.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Problems fixed by this patch include:
- on patron search result list the category description is shown again
- it's possible to limit a patron search to a patron category again

All tests pass.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
8 years agoMerge branch 'bug_9052' into 3.12-master
Jared Camins-Esakov [Sun, 30 Dec 2012 23:36:34 +0000 (18:36 -0500)]
Merge branch 'bug_9052' into 3.12-master

Conflicts:
koha-tmpl/opac-tmpl/prog/en/css/sco.css

8 years agoBug 9052 - followup: fix the YUI CSS locations for SCO
Robin Sheat [Tue, 18 Dec 2012 04:48:46 +0000 (17:48 +1300)]
Bug 9052 - followup: fix the YUI CSS locations for SCO

This is followup to the previous YUI-fixing patch, and simply causes the
self-checkout page to load the YUI files via the sco CSS file,
and that gets re-written at package build time to work.

Signed-off-by: Mirko Tietgen <mirko@abunchofthings.net>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Tested on a package installation using packages built by
Mirko Tietgen and a git dev installation.

To test:
1) Enable WebBasedSelfCheck system preference
2) Enter login date for staff user in AutoSelfCheckAllowed... prefernces
3) Go to the self checkout page:
   .../cgi-bin/koha/sco/sco-main.pl
4) Verify all pages have the usual look, CSS, Javascript and images
   look normal
5) Verify the same is true for translated templates

Manual: http://manual.koha-community.org/3.10/en/selfcheckout.html
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>