Commit Graph

12668 Commits

Author SHA1 Message Date
Chris Cormack b2af1f850d Merge remote branch 'kc/master' into new/bug_5105
Conflict fixed

Conflicts:
	opac/opac-detail.pl
(cherry picked from commit dcb86689f7)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-11-10 18:04:39 -05:00
Frédéric Demians 740070ab78 Fix bug on opac-detail.pl with switch statement
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 5e1b8167c2)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-11-10 17:17:42 -05:00
Katrin Fischer 99e8b01e9a Bug 5003: Can not search for organisation by name
Rebased to current HEAD, small error fixed.
Should also apply to 3.2

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 863830f3f9)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-11-10 17:17:42 -05:00
Galen Charlton 3393712a55 bug 5380: remove copy-and-paste from authorities/detail.pl
MARC editor code not needed here.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 2c794d1af7)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-11-10 09:53:08 -05:00
Galen Charlton c35c0be961 bug 5372: identify empty field in authority record correctly
This is the sibling to the fix for this bug for the bib
editor.  However, note that this change won't have a
direct effect yet, as currently you can't specify a
default value for a field or subfield in the authority
MARC frameworks.  See bug 4887.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit daabd936d6)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-11-10 09:53:07 -05:00
Chris Cormack 609a87f928 Ukranian and Russian syspref language updates
(cherry picked from commit 1aef81c354)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-11-08 19:16:35 -05:00
Chris Cormack d8c72a66f1 Russian and Ukranian opac language updates
(cherry picked from commit a3226d5ce6)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-11-08 19:16:34 -05:00
Chris Cormack 07e5e31b60 Staff interface .po file updates
(cherry picked from commit 6d22b87543)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-11-08 19:16:34 -05:00
Katrin Fischer 9da96093f1 Bug 5370: Fix all references to koha.org
Thx to Brooke for helping with the wiki.

This is the last patch.
We will have to change some more links, after translate.koha.org was moved.

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-11-08 17:04:15 -05:00
Chris Cormack 37b759bf76 Merge branch 'trivial_bugs' of git://git.koha-community.org/wip/koha-fbc into kcmaster
(cherry picked from commit ce54fe0323)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-11-08 11:59:50 -05:00
Marcel de Rooy df3e806e28 Bug 4515 (Few very small errors in opac-search.pl) RESENT fixing whitespace warning
Loop on results should stop before $i==@servers.  Adding fix for warnings on undefined values in comparison for lines 485, 488 and 510.

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-11-08 11:58:20 -05:00
Frédéric Demians b326530722 Bug 4472 Apply it to MARC21
For French installation of Koha using MARC21, the same issues as UNIMARC
affects handling of &nbsp; by translation scripts.

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-11-08 00:48:35 -05:00
Owen Leonard 5ec46a6790 Fix for Bug 5214 - undefined itype images cause broken image icon in request.pl
Also fixes the same bug on the Itemtypes administration page.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit fbbab73492)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-11-08 00:48:14 -05:00
Galen Charlton ef96483dab bug 5236: remove hidemytags from CSS as well
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit c49600aaa7)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-11-08 00:47:55 -05:00
Galen Charlton f84e17f18c bug 5219: tidy cleanup_database.pl
Includes a bit of cleanup of the enhancement patch
for bug 5074 - adding comments about old and new
behavior isn't necessary for such small changes.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 072896d66b)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-11-08 00:47:40 -05:00
Frédéric Demians 0aee2dca9e Bug 5372 (v2) Existing value can be replace by default value
The way an existing value was tested was wrong. 0 is a valid value but a
false value for Perl.

=> replace privious proposal.

[3.2] Should also apply.

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-11-07 16:22:18 -05:00
Katrin Fischer 12755020c6 Bug 5370: Fix all the references to koha.org
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 6df634855c)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-11-07 16:20:45 -05:00
Katrin Fischer 4882a4351f Bug 5370: Fix all references to koha.org
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 9f688ad92b)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-11-07 16:20:32 -05:00
Katrin Fischer 33f1a68bfb Bug 5370: Fix references to koha.org and other old websites
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 35cf30ef15)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-11-07 15:11:01 -05:00
Chris Nighswonger 7494de10e9 Adding 3.2 Release Maintainer to Release Team List
Signed-off-by: Liz Rea <lrea@nekls.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 8dded0c269)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-11-06 08:31:33 -04:00
Frédéric Demians 73d77687bf Bug 5368 Browse Shelf link appears when no itemcallnumber
Suppress Browse Shelf link on OPAC detail page when there is no item
call number.

[3.2] Should also apply on 3.2

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-11-05 15:08:42 -04:00
Nahuel ANGELINETTI a8e207df36 (MT 2985) simplify CanBookBeReserved
The function was too complex for so simple stuff, not we check if one of all items of the record can be issued.

[Note by Galen Charlton: not only does this patch simplify the routine,
 it also makes it behave correctly.]

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 363c1ca9f9)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-11-05 15:08:14 -04:00
Chris Nighswonger 1c37b030fc Updating Version Number to 3.02.00.006 2010-11-04 20:27:49 -04:00
Galen Charlton 797efe50bc bug 5149: follow-up - remove extraneous character in link
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit b96617dea8)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-11-04 20:17:12 -04:00
Nicole Engard 68a24ddd1d bug 5149 fix broken link to noItemTypeImages preference
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 36df1f6cdf)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-11-04 20:17:11 -04:00
Nicole Engard f4aea1d1a0 bug 5110 move NewItemsDefaultLocation to cataloging tab
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 140fde57de)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-11-04 20:17:11 -04:00
Owen Leonard 848d00482a Fix for Bug 4963, sys prefs need date hints and/or picker
This patch adds the standard date format hint used elsewhere
in the interface.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 51405bcce4)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-11-04 20:17:11 -04:00
ByWater Solutions 047e38e8a7 Bug 4254 - adding new patron advanced notice doesn't save
This was due to poorly constructed SQL which returned duplicate values for
certain fields. This patch corrects that SQL.

NOTE: There is also a formatting problem with the message prefs display table
when it is displayed in moremember.pl. This is due to there being no logic to
tell the table in that context to display checkboxes as appropriate. This patch
does not fix that. Bug 5328 has been opened for this problem.

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-11-04 20:17:11 -04:00
Owen Leonard a7cb6a9a38 Fix for Bug 5082 - Not translatable name of default framework 'Default' in MARCdetail.tmpl
This patch also fixes an unreported bug where switching from any
other framework to 'Default' would bring up no MARC data.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit b0e29e5595)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-11-04 20:17:10 -04:00
Owen Leonard 2f194fdb1a Fix for Bug 4980 - Acq: pull down 'Restrict access to:' for funds not translatable
Applied Owen's patch to current head, updated de-DE translation. The pull down values are now  translated.

Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit bd28366523)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-11-04 20:17:10 -04:00
Owen Leonard ea960af0fb Fix for Bug 5142, Untranslatable strings in tag review template
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit c4de64629d)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-11-04 20:17:10 -04:00
Owen Leonard a2db9940a4 Fix for Bug 5056, Untranslatable strings in members.js
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 100099d429)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-11-04 20:17:10 -04:00
Owen Leonard 1097106719 Fix for Bug 5136, Replace SQL with call to GetAuthorisedValues
An embedded query in circulation.pl for BOR_NOTES authorized
values can be replaced with a call to GetAuthorisedValues

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 82d2cf464b)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-11-04 20:17:10 -04:00
Owen Leonard b2519527da Fix for Bug 5135 - Authorized value input maxlength should match table column
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 81b3ca97ea)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-11-04 20:17:09 -04:00
Nicole Engard 646fd29b87 bug 5171 change 'edit items' to read 'edit item' when next to 1 item
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 3d66c2153b)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-11-04 20:17:09 -04:00
Nicole Engard 3b5c1688a6 bug 5168 change link text from holdings to items
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit c3aa3d9681)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-11-04 20:17:09 -04:00
Jared CAMINS-ESAKOV 12bf736bec Fix bug 3811; Index language as word
An incorrect definition in record.abs was resulting in searches on languages returning incorrect results.  By changing the indexing mode from numeric to word, this patch fixes that problem.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 68dc783c7e)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-11-04 20:17:09 -04:00
Galen Charlton c661e9d219 bug 5311: correction to database update
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 0d84902eca)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-11-04 20:17:08 -04:00
Jared Camins-Esakov ed4049443e Update language mappings to fix Bug 5311
This patch updates the language_rfc4646_to_iso639 mapping table with the
correct mappings for several languages that were not mapped correctly to
the codes used in MARC, including Finnish (which was not mapped at all),
and Armenian (which was mapped to an obsolete code). This patch also
changes English and French to use the proper three-letter codes, which
will eliminate false positives when, for example, limiting by French
brings up results in Afrikaans.

This patch adds the changes to the updatedatabase.pl script, and removes
the incorrectly specified DBversion in the previous patch.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-11-04 20:09:50 -04:00
Galen Charlton 067c2d101d bug 5190: improve linking to MARC field documentation
* zero-pad tag numbers as needed
* handle special case for linking to UNIMARC 0XX vs. 1-8XX
* add a wrapper function
* add comment about the poor linkability of IFLA's UNIMARC documentation

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 141ec0b9bc)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-11-04 19:57:58 -04:00
Galen Charlton 19894217ef bug 5190: link to MARC21/UNIMARC online doc in the bib editor
Patch from  Tomás Cohen Arazi <tomascohen@gmail.com>

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 29432ee42c)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-11-04 19:57:58 -04:00
Nicole Engard 09ff5abc0c bug 5326 fix link to old prefs editor on patron attributes
on the patron attributes page if you have ExtendedPatronAttributes
turned off the error points you to the old sys prefs editor - this
patch fixes that

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 45a6cca1a1)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-11-04 19:57:58 -04:00
Nicole Engard 08e8a31cdb bug 5326 fix extended patron attribute error
the error message if you have ExtendedPatronAttributes turned
off linked to the old sys prefs editor, link has been updated.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 83f03fb9d3)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-11-04 19:57:57 -04:00
Owen Leonard 707af52936 Fix for Bug 5137, Remove obsolete code counting issues by item type in circ
The removed section of code contained a "my $dbh = C4::Context->dbh"
which was required for the query of BOR_NOTES. That line has been
moved accordingly.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit b2bda465d7)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-11-04 19:57:57 -04:00
Owen Leonard 50656a56e7 Fix for Bug 5008 - "Remove" link missing when Cart in expanded view
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 0d41ba7300)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-11-04 19:57:57 -04:00
Nicole Engard 0084ce5a17 bug 4986 move serials prefs from cataloging tab to serials tab
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit d1593acec7)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-11-04 19:57:57 -04:00
Owen Leonard bb08a2f8ec Fix for Bug 5114 - Can't edit basket in Internet Explorer
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 0bb33cd7ce)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-11-04 19:57:56 -04:00
Nicole Engard e6514b39fe bug 5019 remove link to funds
This patch renames the link to budgets to say 'budgets & funds'
and removes the links to funds (which went no where).

This patch also adds the acq menu to the budget pages.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit d5eb56dd52)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-11-04 19:57:56 -04:00
Frédéric Demians 4b3ce545de Bug 5177 Selecting default sort result by syspref
Syspref .pref file was defining a code for descending order which wasn't
expected by .tmpl files... 'desc' instead of 'dsc'.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit aa7df17f7c)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-11-04 19:46:17 -04:00
Chris Cormack e74fc14914 Bug 5363 - Removing unused module (C4::Cache::FastMemcached)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-11-04 19:17:19 -04:00