Commit Graph

14689 Commits

Author SHA1 Message Date
Chris Cormack 7d4db83a7a Bug 6679 : Not using strict .. bad script, no cookie for you!
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit e8ea58270d)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-11-16 09:20:58 -05:00
Chris Cormack d5b97aa1cb Bug 6679 : Don't declare variables in conditionals Don't change $_ in a list context http://search.cpan.org/~elliotjs/Perl-Critic-1.116/lib/Perl/Critic/Policy/ControlStructures/ProhibitMutatingListFunctions.pm
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 607b5449bd)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-11-16 09:20:43 -05:00
Chris Cormack ea6f752020 Bug 6679 : Declare variables outside of conditionals
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 6bb73a04c4)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-11-16 09:20:28 -05:00
Paul Poulain 8c1f853ef5 Bug 7188: C4::Context::db_scheme2dbi does case-insensitive grep
Checking NYTProf in C4::Context, it appears that the /i flag is highly time-consumming
As we don't support anything outside from mysql, returning directly mysql directly

If in a future version PostgresSQL works, then we will have to update this sub. But if an ORM is introduced, this code will be removed completly anyway

Testing note:
Drops execution time of the line from 300ms to 20 microseconds (in my testing).
(cherry picked from commit 0f8db0c538)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-11-16 09:18:00 -05:00
Paul Poulain 71f9b11add Bug 7184 raise mySQL error if debug is set
Before this patch, if a mySQL occured in Koha (any error), then the user was seeing nothing.
With this patch, if DEBUG is set in Koha VirtualHost, any mySQL error will make Koha die and display the SQL error

Step to test:
=== BEFORE PATCH ===
go anywhere, and change a mySQL statement to make it invalid.
Launch a page using the SQL you've made wrong, you'll see nothing, except you won't see the expected results

=== AFTER PATCH ===
Modify koha-httpd.conf, and add the following line, in the virtualhost (if it does not already exist)
SetEnv DEBUG 1
restart/reload Apache
Launch the same page, you'll get a Perl statement saying something like:

DBD::mysql::st execute failed: <<blablabla SQL error>> at <<where the error was raised line <<error line>>
(cherry picked from commit 016e66c6f2)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-11-16 09:07:38 -05:00
Liz Rea 3032fd1d9e Bug 7128 - adding some ID's to make styling opac-main.tt a bit easier
To test:
verify that the loggedin id is added when user is logged in
verify that the notloggedin id is evident when no user is logged in.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>

Bug 7128 : Follow up, adding the id to the case when a user is not logged in

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 4ccb8649f8)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-11-16 09:07:23 -05:00
Katrin Fischer 06fc7eaa80 Bug 6994: Wrong 'no budget defined' alert
When ordering from an existing record the 'no budgets and funds defined' error
message was shown below the result list.

To test:
A) No budgets defined for this user and library
Basket summary page shows a warning instead of the link for creation
of orders.

B) Budgets and funds are properly defined for this user and library
Basket summary page shows links for order creation.
Before patch: A search for an existing record had the alert at the bottom
of the search result list.
After patch: The links for creation of orders are shown instead.

Signed-off-by: Liz Rea <lrea@nekls.org>
Verified A and B.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 488f4be865)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-11-16 09:07:08 -05:00
Frédérick Capovilla 659aa24e9b Notify the user on his account page when his account is almost expired
New feature : If the "NotifyBorrowerDeparture" system preference is defined, a
notification appears in the user's account page if his subscription is almost
expired.

http://bugs.koha-community.org/show_bug.cgi?id=6978
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
works perfectly with date formatted DD/MM/YYYY as well
(cherry picked from commit e676e117fc)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-11-16 09:06:51 -05:00
Ian Walls 58abaaf000 Bug 6471: add tablesorter to Holds Queue
This patch adds the table sorter to Holds Queue.  Sponsored by Farmington Public Library.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 0ea8ff7c4c)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-11-16 09:06:36 -05:00
Katrin Fischer 87a32efcc3 Bug 7117: Bug 7117 - Small display problems when organising suggestion tabs by name
To test:
1) Add some suggestions
2) Go to suggestions in staff
3) Choose from filters 'suggested by' or 'managed by'
4) Compare names shown on tabs with names in list of suggestions

Before patch: tab name has the wrong order, while list name is correct.
After patch: all names should be consistent and correct.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit e660cef0e2)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-11-16 09:01:18 -05:00
Marcel de Rooy 7d8ad8f9f1 7146 (Update timestamps when deleting a biblio)
Currently, when you delete an item, the timestamp column in deleteditems is
updated with current time. (This comes from an [unintentional] additional
update statement in DelItem.) It makes deletion time visible.
In the past, the marcxml was updated too at that moment, resulting in an
updated timestamp in biblioitems too. The timestamp in biblio was not touched.

If you delete a biblio however, the timestamps in deletedbiblio and
deletedbiblioitems do not reflect time of deletion. They still show the time of
last update before the record was deleted. This last update can be extracted
from MARC field 005 too.

This behavior is not consistent nor logical. I would suggest to add a statement
in DelBiblio to force updating the timestamp in deletedbiblio(items) too. It
makes the time of deletion visible in the record too. The time of deletion of a
biblio can be very useful for e.g. synchronizing purposes.

Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 7ee0565f5c)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-11-16 09:01:03 -05:00
Owen Leonard de3e679865 Follow-up fix for Bug 3958, Standardize vendor/supplier/bookseller terminology
Fixing two stray instances of "supplier."
(cherry picked from commit 0038b0df15)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-11-16 09:00:48 -05:00
Ian Walls 38d3552983 Bug 7061: unnecessary global variables declared in C4::SQLHelper
Removes $tablename and $hash from global scope of C4/SQLHelper.pm.  They are never used;
all instances of $table are locally scoped to the subroutines, and $hash is never used.

This may help with persistance; if not, it's at least a bit of trivial cleanup.

To test:

1.  Search for a patron
2.  Create a Contract in Acquisitions
3.  Modify that Contract
4.  Delete that Contract

All instances should return error free.  This checks the subroutines of SQLHelper

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 36d8e5df96)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-11-16 09:00:33 -05:00
Frédéric Demians 15a04cacd5 Bug 6989 Patron categories not properly displayed if not pure ASCII
C4::Category module returns badly encoded patron categories when they are
containing non pure-ASCII characters.

To reproduce this bug:

  - Go in Administration > Patron Categories
  - Add a new category. Give it this code for example:
    Café
  - Click on Patrons link on top menu
  - Click on New button

    => You get 'Café' displayed without accent

Signed-off-by: Piotr Wejman <ropuch@bagno.be>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit d998166ea3)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-11-16 09:00:19 -05:00
Paul Poulain f4d8032d47 Bug 5885 : UNIMARC XSLT changes
dealing with some BNF/SUDOC invalid utf-8 (in title, the removed fields are used to mark non-sorted words)

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>

I can't test this works ok for UNIMARC, but it does not cause any
problems with the translation scripts or MARC21 so signing off
(cherry picked from commit cc6c1acb38)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-11-16 09:00:04 -05:00
Ian Walls 5fee6f518a Bug 7076: Lists render OPAC XSLT on staff side
Adds a small check in C4::VirtualShelves::Page::shelfpage to only render
OPACResultsXSLT if the $type is 'opac'.  Since parsing the XML is such an expensive
thing, and the resulting XSLTBloc is not used on the staff side, this will increase
performance for Lists in the intranet

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit a0a9368bec)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-11-16 08:53:20 -05:00
Frédérick Capovilla fd5f34d2ac Follow-up patch : use the subfield associated with items.barcode
Instead of using the 'p' subfield directly, use the subfield letter
associated with the items.barcode column.

http://bugs.koha-community.org/show_bug.cgi?id=6963
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>

Test cases tested:
- 1 item, barcode empty
- 2 items, barcodes both empty
- 1 item, existing barcode
- 1 item, new barcode
- 2 items, one barcode empty, one existing

All test cases worked nicely and gave correct error messages.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 61e1eeee84)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-11-16 08:53:05 -05:00
Frédérick Capovilla 0a06936b2a Bug 6963: Corrects a problem when a new order is created with a duplicate barcode.
If the AcqCreateItem preference is set to "ordering" and the barcode for
the new item is already in use, no error is returned, but an invalid
itemnumber is saved in the aqorders_items table and the item is never
created.

This patch adds a duplicate barcode verification in neworderempty.pl
_koha_add_item is also modified so it won't return an invalid ID when
an item can't be added.

http://bugs.koha-community.org/show_bug.cgi?id=6963
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Test plan on second patch.
(cherry picked from commit 327be442bd)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-11-16 08:52:50 -05:00
Chris Cormack 6b78db76b1 Bug 6895 : First attempt at fixing the diacritics bug
This is a fairly hacky solution, a counter patch would be more than
welcome

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

Updated, translated and installed German po files after applying this patch.
No problems found.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit afaf7eaffa)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-11-16 08:52:35 -05:00
Maxime Pelletier 5a90f3b4f7 Bug 7069: Put strings in "" instead of '' to fix the javascript not working when the translated string has a ' in it.
http://bugs.koha-community.org/show_bug.cgi?id=7069

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Patch changes '' to "" to make it work for strings which contain '.
Patch does NOT add new strings to the po files.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 7ff9d9d03c)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-11-16 08:52:19 -05:00
Owen Leonard 5e84b9d3ab Fix for Bug 6955, Toolbar on reading history broken
Table sorter script causes error if there is no <tbody> to sort.
JS errors cause the YUI toolbar js to abort, causing the problem
observed. When there are no results the whole table should be
omitted and a message displayed in its place.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
To test:
- check toolbar on top of patron reading history with no entries
- check toolbar on top of patron reading history after a few checkouts

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 54226b60f3)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-11-16 08:52:04 -05:00
Maxime Pelletier d866a10f09 Use unitprice in neworder so that the value is saved in the database and so it will be the same field used as to receive shipments
http://bugs.koha-community.org/show_bug.cgi?id=6414
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>

Signed off with a note: this doesn't fix everything mentioned in the bug.
It also might clash with bug 4831 and should be tested with that patch.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 0faf91c591)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-11-16 07:38:23 -05:00
Chris Cormack 19c436d1f6 Sorry pushed this by mistake when trying to fix Pauls permissions
Revert "Fix for Bug 5974 - Bogus auth check for "StaffMember" role"

This reverts commit a867bfcff7.
(cherry picked from commit 7a82e508f0)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-11-16 07:37:49 -05:00
Owen Leonard 32168100f4 Fix for Bug 5974 - Bogus auth check for "StaffMember" role
Also removing some YAHOO.widget.Button declarations which
are redundant.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit a867bfcff7)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-11-16 07:37:20 -05:00
Chris Nighswonger e7a667bb8a Updating Version Number to 3.04.06.000 2011-11-09 13:54:18 -05:00
Chris Nighswonger 96979f5f58 Release Notes for 3.04.06.000 2011-11-09 11:50:37 -05:00
Frédéric Demians 9155d6e90d 3.4.6 Translation Update
(cherry picked from commit 2bc8e34587ea9402eead735700833a84ce3c5854)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-11-04 22:40:11 -04:00
Chris Nighswonger ca0264de48 Removing merge conflict markers 2011-10-26 10:56:26 -04:00
Chris Nighswonger c9fc4d92f1 Updating Version Number to 3.04.05.003
Also fixing up two typos in db version numbers
2011-10-25 20:11:42 -04:00
Robin Sheat ef382d8252 Bug 6905: [3.4.x] change which page clicking users in circ history takes you to
Adds a syspref (borrowerhistorylink) that allows you to choose where
links to borrowers on the item circulation page go, choosing between the
circ page for them, or their details page. Default is the current
behaviour (go the the circ page.)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-10-25 20:05:38 -04:00
Ian Walls bb3fae1495 Bug 5995 Followup: checkpw was returning inconsistent values
In the case of LDAP, checkpw was returning the cardnumber of there user, but it was being treated as the
userid.  This patch updates checkpw_ldap to return the cardnumber AND the userid, and updates checkpw to
uniformly return cardnumber and userid in all instances, so that whoever is authenticating can use the
desired value in the right way.
(cherry picked from commit dcb4ac77fb)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-10-25 19:59:25 -04:00
Matthias Meusburger 07ce7d8d3b Bug 5995 : MT2892: Fix security issue in CAS intranet login
Users could log in intranet using their cardnumber, with superlibrarian
rights.

Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-10-25 19:59:08 -04:00
Srdjan Jankovic 01d01b02a2 bug_6770: removed doubled override increment when using AllowHoldPolicyOverride
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-10-25 19:56:33 -04:00
Srdjan Jankovic b340aa213e bug_5533: Improved marking items as lost
Call LostItem() whenever an item is lost
Disable lost status on catalogue item edit

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-10-25 19:54:56 -04:00
Ian Walls 61ea6ad388 Bug 7078: Remove HTML::Template::Pro from Koha perl dependencies list
Removes HTML::Template::Pro as a requirement (since we're now on Template::Toolkit).

To test:

On a system without, HTML::Template::Pro installed, run perl koha_perl_deps.pl -m -u

Shouldn't return anything about HTML::Template::Pro

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit d52095b48c)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-10-25 19:45:53 -04:00
Ian Walls cb787cf842 Bug 7063: add available perl packages for Debian in install_misc/debian.packages
Takes work done by Eduardo Trápani, alphabetizes, and adds two other packages:

libuniversal-require-perl
libgravatar-url-perl

From my testing, only CGI::Session::Driver::memcached remains missing; it is only
packaged for sid and wheezy at this time

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 0953e8ca09)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-10-25 19:45:26 -04:00
Ian Walls ea602708b6 Bug 5995 Follow up: variable scope in koha/sco/sco-main.pl
The patronid value (cardnumber) set by checkpw in the case of SelfCheckoutByLogin
was improperly scoped with 'my' inside a conditional.  The changes followup to 5995
made this more apparent, causing logins to fail.

Also added "parts copyright" statement to the script, since ByWater Solutions did make some
significant contributions to the operations of the page

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-10-25 19:44:51 -04:00
Ian Walls a2c7779b91 Bug 7060 Followup: AddReturn needs GetMemberDetails
In my haste, I overlooked circ/returns.pl's need for borrower flags.  This patch
changes back the call in AddReturn from GetMember to GetMemberDetails

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit c5bc35b694)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-10-25 19:42:43 -04:00
Frédérick Capovilla 608c23e6bd Bug 6854: Correct a double password encryption problem in import_borrowers.pl
When the CSV file has no password column and no default value was set for
the password :
If we try to modify an existing user, the password from the BD is sent
to ModMember, which then encrypts the already-encrypted password a
second time.

http://bugs.koha-community.org/show_bug.cgi?id=6854

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Confirmed bug on current master.
1) Import new patron with password provided
> OPAC login works
2) Overwrite patron record, password provided
> OPAC login works
3) Overwrite patron record, password not provided
Before patch: OPAC login broken, password in database changed
After patch: OPC login works with same password as before

Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 906ef4b28c)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-10-25 19:42:21 -04:00
Marcel de Rooy fecb2920c7 7042 Improving cleanup_database.pl: handling quotes in a_session and interpreting sessdays parameter
Improving the cleanup_database.pl script in two aspects:
1) In some cases CGI::Session seems to place quotes around the atime and ctime
data in the a_session field. Two regexps now take this into account.
2) If the --sessdays parameter is used, the --sessions parameter is now
implicitly enabled too.

With thanks to Ian Bays and Tom Hanstra.

Signed-off-by: Ian Bays <ian.bays@ptfs-europe.com>
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit a7ee2993f0)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-10-25 19:42:00 -04:00
Marcel de Rooy fa08d3b728 6094 Follow up for cleanup_database
Adds purging completed entries from need_merge_authorities table.
If you set dontmerge to ON, you need to periodically remove records.

Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit c56d12c721)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-10-25 19:41:47 -04:00
Ian Walls 422a82e095 Bug 7060: GetMemberDetails unnecessary in C4::Circulation
Replaces all instances of GetMemberDetails with the more efficient GetMember.  Since
no hash values other than the borrowers table's fields are used in this module, the
transition is safe.

To test:

1.  Checkout a material; the page should load without error
2.  Renew a material: the page should load without error
3.  Return a material: the page should load without error

The above test plan invokes all the subroutines affected by this patch; any call to an undefined
value in a hashref should give a warning

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 769acee41a)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-10-25 19:41:32 -04:00
Ian Walls 35987009bc Bug 7057: CheckReserves uses GetMemberDetails unnecessarily
Replaces call to GetMemberDetails with a call to GetMember.  Much more efficient,
and since only branchcode is used, no required data is lost.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit a1e3975067)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-10-25 19:41:00 -04:00
Katrin Fischer a95b6cb963 Bug 7049: [SIGNED-OFF] Item form on order receive has lots of blank space
The item form on the order receive page (AcqCreateItem = on receive) contains a
lot of blank space which makes it hard to read and fill out.

To test:
- set AcqCreateItem = on receive
- create basket, order something, receive shipment
- check item form is nicely formatted and doesn't include lots of blank space

Note: It will be easier to test if you have an ACQ framework created to hide some
unnecessary subfields, because the hidden fields create the blank space.

Signed-off-by: Magnus Enger <magnus@enger.priv.no>
Created an ACQ framework and hid some of the fields (hidden = 5). Before the
patch there were gaps between the fields as shown in the screenshot from
Katrin. After the patch fields line up nicely, with no extra space between
them.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 224140a2b6)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-10-25 19:40:43 -04:00
Katrin Fischer cca7dd8dc4 Bug 7027: [SIGNED-OFF] Corrections to German web installer txt files
Rephrasing, correcting typos, removing blank lines

Signed-off-by: Magnus Enger <magnus@enger.priv.no>
Does not break the web-installer and I'm assuming
Katrin is doing the right thing when it comes to
the German text, so signing off!

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit a46cbc03ee)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-10-25 19:40:02 -04:00
Chris Nighswonger ddf212bd29 Updating Version Number to 3.04.05.002 2011-10-25 19:38:33 -04:00
Marcel de Rooy bc398d5b97 6094 Fixing ModAuthority problems
Only contains db revision to insert new table need_merge_authorities.
You can apply the revision by running
cgi-bin/koha/installer/install.pl?step=3&op=updatestructure. (Will not change
your version while testing.)

Oct 19, 2011: Rebased after functionality patch signoff.

Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-10-25 19:37:42 -04:00
Marcel de Rooy f5660195a5 6094 Fixing ModAuthority problems
Pref MergeAuthoritiesOnUpdate does not exist; should be dontmerge
(AuthoritiesMarc.pm).

Instead of folder modified_authorities, now introducing a table for this
purpose: need_merge_authorities. This eliminates several permissions and
security issues. This change applies to AuthoritiesMarc.pm and
merge_authority.pl.

POD lines added for ModAuthority. Deprecated parameter $merge removed.

Test this patch by applying the db revision first from the second patch.

August 4, 2011: Rebased.

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

Thanks Marcel. It works as advertised. Both modes are functionnal
(back):

- Immediate with dontmerge=0: After modifying an authority record, its
  linked biblios are immediately modified. This isn't the case in 3.4.5.
- Delayed with dontmerge=1: After modifying an authority record, its
  linked biblios are not modified. But an entry is added to
  need_merge_authority new table and 'merge_authorities.pl -b' script
  updates biblios.

Comment: need_merge_authority, like zebraqueue, should be cleared
from time to time.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 05d35b0ae0)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-10-25 19:35:46 -04:00
Ian Walls 258d980197 Bug 6553: parentheses in authors break tracings
If an author's name includes parentheses or other escape-characters, the tracing links
produced in the OPAC and staff client fail in XSLT mode.  This patch wraps the author names
in double-quotes, providing the necessary escapement.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Test plan:
- Create a new framework, delete Thesaurus from 700 and other fields
- Create a new record in this framework
- Add 700$a - use parentheses
- Check the search links in OPAC and staff detail pages
> before patch link was broken, after it works

Note: Links are only broken when no authorities are being used.
When using authorities the link uses the auth number instead of the text
for linking, so the parentheses don't matter for search.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 0ae2c3c4ce)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-10-25 19:35:15 -04:00
Ian Walls ecb4cd1782 Bug 6253 followup: explicitly check ref value for ARRAY before casting
in C4::SQLHelper::_Process_Operands, $operand has been modified to be cast as an array ref
if the incoming $operand is not a ref.  However, the incoming $operand could be some other
kind of ref (hashref for example), which would case the dereferencing in line 419 to fail and exit.

Adding an explicit test for whether the ref is ARRAY seems to clear up this issue.

To test, run t/db_dependent/Members.t.  Before, it fails after test 3.  After, it completes all tests.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit d80cf35e9b)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-10-25 19:34:58 -04:00