]> git.koha-community.org Git - koha.git/log
koha.git
13 years agoFix for Bug 6458 - incorrect parsing result in translation processing
Owen Leonard [Thu, 25 Aug 2011 19:11:09 +0000 (15:11 -0400)]
Fix for Bug 6458 - incorrect parsing result in translation processing

Correction for opac-messaging.tt tops tag attribute markup from
being passed to the template directly in favor of using template
logic.

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoFix for Bug 6458 Follow-up for memberentrygen.tt
Katrin Fischer [Wed, 11 Aug 2010 00:27:39 +0000 (02:27 +0200)]
Fix for Bug 6458 Follow-up for memberentrygen.tt

The registration date field would show up twice after applying the first
patch for memberentrygen.tt.

This patch fixes the problem.

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoFix for Bug 6458 - incorrect parsing result in translation processing
Owen Leonard [Fri, 26 Aug 2011 13:07:15 +0000 (09:07 -0400)]
Fix for Bug 6458 - incorrect parsing result in translation processing

Fixing improperly nested template logic inside HTML tags in
member entry form.

Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
Fixes lots of problems. Spotted one small problem. I am sending a follow-up.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit e8a876614eddde3025477e228d4ccf533d3cc683)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 5252 - Phone labels on patron creation
Nicole C. Engard [Tue, 9 Aug 2011 15:20:47 +0000 (11:20 -0400)]
Bug 5252 - Phone labels on patron creation

The labels for emails on the patron forms say 'primary' and
'secondary.' This patch does the same thing for the phones.
phone is now 'Primary phone', mobile is now 'Secondary phone',
and 'phonepro' is now 'Other phone'. This way the type of phone
does not matter and the phone that the patron wants to be called
at the most is the 'primary.'

This is just a step in the direction of fixing Bug 5252, not a
complete fix.

This patch also updated a stray reference to Home Email.  Both the
OPAC and staff client are updated with this patch.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 0a71367dc2113de860ca25f735a4996e170e44d6)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years ago6829: Remove two warnings for opac-MARCdetail
Marcel de Rooy [Thu, 1 Sep 2011 12:07:40 +0000 (14:07 +0200)]
6829: Remove two warnings for opac-MARCdetail

Remove two warnings from logfile by adding simple checks.

Sept 1, revision: Clearing another warning (thx Owen) too.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit caae541135dedb5d0ccddbf8ffd31887f802332d)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoFix for Bug 2891, cannot manually enter date at reports/issues_stats.pl
Owen Leonard [Mon, 22 Aug 2011 16:23:05 +0000 (12:23 -0400)]
Fix for Bug 2891, cannot manually enter date at reports/issues_stats.pl

Removed unnecessary readonly attribute from date fields

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agobug 6677 - remove reference to 'debarred'
Nicole C. Engard [Sat, 6 Aug 2011 11:15:11 +0000 (07:15 -0400)]
bug 6677 - remove reference to 'debarred'

The patron stats wizard had 'debarred' in the pull down
for status, but it's called restricted everywhere else.
This patch changes debarred to restricted.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 92e71131faf55e719f84c6e29314f5abc5714b57)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 6841 - A member with cataloging permissions cannot change branches (when independ...
Liz Rea [Tue, 6 Sep 2011 18:00:51 +0000 (13:00 -0500)]
Bug 6841 - A member with cataloging permissions cannot change branches (when independent branches is set on)

This patch does a couple of things.

1. Changes permission over all to set branch printer (change branch/Set Library) from "circulation" privileges to "view catalogue" permissions. Reasoning: anyone who has privileges to view catalogue could reasonably be expected to perhaps need to change the set branch, but you might have people who don't have circulate permissions who need to change the branch, centralized cataloguing, for example. Those people would never circ and wouldn't need circ privileges, but *would* need to be able to change the set branch.
2. Changes the template flags to see the "Set Library" link with independent branches set from "manage users" to "manage users or edit catalogue." Reasoning: even with indy branches on, there might be reasons for catalogers to be able to change the set branch (that reason was the impetus for this patch in the first place).

To test:
Create a user with only "View Catalogue" Permissions (no circulate permissions), that user should be able to change set library with Independent branches OFF.

With independent branches on, give a user edit catalogue permissions. That user should be able to change set library.

I want to add that this patch was specifically written in response to chris_n's bug report. It may not be practical for these changes to be in mainline, but I haven't thought of any reasons why it would be explicitly bad. That doesn't mean there aren't some, though.

Signed-off-by: Chris Nighswonger <cnighswonger@foundations.edu>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit c2015c710355a0ab81306515a70af29e6aef3504)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 6620 Ensure autoflush is set on output filehandles
Colin Campbell [Thu, 21 Jul 2011 11:16:22 +0000 (12:16 +0100)]
Bug 6620 Ensure autoflush is set on output filehandles

stdout is by default buffered and a flush is only guaranteed on CR
Sip responses are not CR terminated so we need to ensure autoflush
is switched on  so that the filehandle is flushed after a print
Otherwise this can manifest as self checks running slow or
failing due to timeout (although in the log we see the response)

Signed-off-by: Ulrich Kleiber <ulrich.kleiber@bsz-bw.de>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit f9ccfae400324fdd88597ff81fba42715e50f19d)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 6368: unimarc_field_4XX plugin does not work with new templates - corrected
Janusz Kaczmarek [Wed, 18 May 2011 20:35:57 +0000 (22:35 +0200)]
Bug 6368: unimarc_field_4XX plugin does not work with new templates - corrected

[2011.05.19] I confirm the bug and the solution

Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 47aee699afbb4ad8aebc84e023a0e5c7fd441ec9)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoFollow-up fix for Bug 6458, incorrect parsing result in translation processing
Owen Leonard [Tue, 13 Sep 2011 16:30:05 +0000 (12:30 -0400)]
Follow-up fix for Bug 6458, incorrect parsing result in translation processing

Somehow some markup which should have been deleted by a previous
patch has reappeared, messing up the display of the MARC editor.
This patch removes that section again.

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoFix for Bug 6458 - incorrect parsing result in translation processing
Owen Leonard [Tue, 13 Sep 2011 13:33:05 +0000 (09:33 -0400)]
Fix for Bug 6458 - incorrect parsing result in translation processing

Fixing improperly nested template logic inside HTML tags in
CSV profiles template

Also fixing improperly scoped template variable which prevented
the current profile from being preselected under the edit tab.

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoFix for Bug 6458 - incorrect parsing result in translation processing
Owen Leonard [Tue, 13 Sep 2011 13:01:54 +0000 (09:01 -0400)]
Fix for Bug 6458 - incorrect parsing result in translation processing

Fixing improperly nested template logic inside HTML tags in
budgets admin search form.

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoFix for Bug 6458 - incorrect parsing result in translation processing / branches
Owen Leonard [Fri, 26 Aug 2011 20:07:46 +0000 (16:07 -0400)]
Fix for Bug 6458 - incorrect parsing result in translation processing / branches

Correction for branch admin template stops tag attribute markup from
being passed to the template directly in favor of using template
logic.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 3e1203c95e53422015885a2add288d5cbc9f8733)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoFix for Bug 6458 - incorrect parsing result in translation processing / clone-rules
Owen Leonard [Fri, 26 Aug 2011 19:56:00 +0000 (15:56 -0400)]
Fix for Bug 6458 - incorrect parsing result in translation processing / clone-rules

Fixing improperly nested template logic inside HTML tags in
clone circulation rules form.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 8bdab59bbad65bdb4b324fedc79c73b33066b0d3)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoFix for Bug 6458 - incorrect parsing result in translation processing
Owen Leonard [Fri, 2 Sep 2011 14:14:51 +0000 (10:14 -0400)]
Fix for Bug 6458 - incorrect parsing result in translation processing

There is template logic in manage-marc-import.tt which is intended
to set the "selected" option for the framework chooser ("Add new
bibliographic records into this framework"). However, I can't see
any place in the code which sends the "selected" variable to the
template, and I can't see any circumstance in which a value would
be passed to the template.

This patch removes the "selected" variable from the template.

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoFix for Bug 6458 - incorrect parsing result in translation processing
Owen Leonard [Thu, 25 Aug 2011 19:37:25 +0000 (15:37 -0400)]
Fix for Bug 6458 - incorrect parsing result in translation processing

Correction in opac holds template. Corrections made are logically
consistent, but I couldn't reproduce the combination of factors
to trigger the "disabled" attribute on the branch selector. In
that respect this hasn't been tested 100%.

Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 597240e878a2a9808ce103508a42d9ed34a11422)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoFix for Bug 6458 - incorrect parsing result in translation processing / patron-attr...
Owen Leonard [Fri, 26 Aug 2011 14:54:07 +0000 (10:54 -0400)]
Fix for Bug 6458 - incorrect parsing result in translation processing / patron-attr-types

Correction for patron-attr-types.tt stops tag attribute markup from
being passed to the template directly in favor of using template
logic.

Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
Read the patch and tested the page, didn't find any problems.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit e1bbff6b7f9db37714fcdb69b03598600e222237)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoFix for Bug 6458 - incorrect parsing result in translation processing
Owen Leonard [Thu, 1 Sep 2011 14:53:24 +0000 (10:53 -0400)]
Fix for Bug 6458 - incorrect parsing result in translation processing

Fixing improperly nested template logic inside HTML tags in the
system preferences editor.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit c7c7a09dc49483fa9b9eefb2a24d3bc4aaea5359)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoFix for Bug 6458 - incorrect parsing result in translation processing
Owen Leonard [Thu, 1 Sep 2011 14:36:50 +0000 (10:36 -0400)]
Fix for Bug 6458 - incorrect parsing result in translation processing

Fixing improperly nested template logic inside HTML tags in spine
label print template.

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoFix for Bug 6458 - incorrect parsing result in translation processing
Owen Leonard [Thu, 1 Sep 2011 14:26:19 +0000 (10:26 -0400)]
Fix for Bug 6458 - incorrect parsing result in translation processing

Fixing improperly nested template logic inside HTML tags in member
details template.

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoFix for Bug 6458 - incorrect parsing result in translation processing
Owen Leonard [Thu, 1 Sep 2011 14:06:03 +0000 (10:06 -0400)]
Fix for Bug 6458 - incorrect parsing result in translation processing

Fixing improperly nested template logic inside HTML tags in
aqplan template.

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoFix for Bug 6458 - incorrect parsing result in translation processing
Owen Leonard [Thu, 1 Sep 2011 13:40:08 +0000 (09:40 -0400)]
Fix for Bug 6458 - incorrect parsing result in translation processing

Fixing improperly nested template logic inside markup in header.inc

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoFix for Bug 6458 - incorrect parsing result in translation processing
Owen Leonard [Fri, 26 Aug 2011 20:15:34 +0000 (16:15 -0400)]
Fix for Bug 6458 - incorrect parsing result in translation processing

Fixing improperly nested template logic inside HTML tags in
branch transfer limits template.

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoFix for Bug 5234 - Remove unused CSS files
Owen Leonard [Tue, 21 Sep 2010 12:35:38 +0000 (08:35 -0400)]
Fix for Bug 5234 - Remove unused CSS files
(cherry picked from commit 2d4d976f3dd5e9b36784562a02da25ae04122d86)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 6129 - [3.4.x] this adds an ISSN to serialssolutions URLs
Robin Sheat [Mon, 5 Sep 2011 00:19:50 +0000 (12:19 +1200)]
Bug 6129 - [3.4.x] this adds an ISSN to serialssolutions URLs

If a URL is a serialssolutions URLs that doesn't already have an ISSN
parameter, this adds one on the OPAC.

Author: Srdjan Jankovic <srdjan@catalyst.net.nz>
Author: Robin Sheat <robin@catalyst.net.nz>

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 6651 - fix splitting of names when updating to 3.4
Robin Sheat [Sun, 31 Jul 2011 02:26:23 +0000 (14:26 +1200)]
Bug 6651 - fix splitting of names when updating to 3.4

This affects only koha package installations that have multiple
instances running. After this patch, it's worth running the upgrade
again to ensure that everything happened correctly the first time.

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 6458: Incorrect translation processing / results
Katrin Fischer [Wed, 24 Aug 2011 22:40:56 +0000 (00:40 +0200)]
Bug 6458: Incorrect translation processing / results

Removed template toolkit directives from within HTML tags.

Advanced Search > Scan Index > Search results

Additional changes:
- removes entry 'Series Title' from the index pull down as it was the same
  index as 'Series'

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 282a2d60b830b22661cc0324a84b7c17b7b905d1)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 6458: Incorrect translation processing / suggestion
Katrin Fischer [Wed, 24 Aug 2011 22:09:11 +0000 (00:09 +0200)]
Bug 6458: Incorrect translation processing / suggestion

Removes template toolkit directives from within HTML tags.

Acquisitions > Suggestions

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 06d6cb0ce471f312ffb1ddd92f0ce0bc3ab76a24)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 6458: Incorrect translation processing / sco-main.tt
Katrin Fischer [Sat, 20 Aug 2011 17:02:01 +0000 (19:02 +0200)]
Bug 6458: Incorrect translation processing / sco-main.tt

Patch removes templates directives from HTML tags in sco-main.tt

Problems were related to buttons for renewing items.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Before
opac-tmpl/prog/en/modules/sco/sco-main.tt: 135, 222

After, no errors

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 4530159ce13eb6ff823d6ef49ad847d92556f356)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 6458: Incorrect translation processing / serials/...
Katrin Fischer [Wed, 24 Aug 2011 18:49:23 +0000 (20:49 +0200)]
Bug 6458: Incorrect translation processing / serials/...

Fixes problems with template toolkit directives within HTML tags
for the serials module.

Serials > add/modify subsciption

serial-issues-full.tt seems to be unused?
I couldn't find the page in the serials module.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 8f8fc1088a2c5b43ed03fb06c9c842b7c721a838)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 6458: Incorrect translation processing - rotating_collections/...
Katrin Fischer [Wed, 24 Aug 2011 17:43:58 +0000 (19:43 +0200)]
Bug 6458: Incorrect translation processing - rotating_collections/...

Patch removes templates directives from HTML tags in the
rotating collections module.

The module is currently not interated into Koha's staff interface.
Fixing templats to make Jenkins happy.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 22804d6ff6fdc2105644f03d0edca1e4e17d4b72)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 6458: Incorrect translation processing / opac-detail.tt
Katrin Fischer [Thu, 25 Aug 2011 16:48:55 +0000 (12:48 -0400)]
Bug 6458: Incorrect translation processing / opac-detail.tt

Patch removes template directives from within HTML tags from OPAC detail view.

Problems were related to the items tabs for holdings, subscriptions, and serial collection.

Fixed the problem spotted by Frère Sébastien Marie - thx!

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 6d6c9626274268e82d6fa433894f188b995c913b)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 6458: Incorrect translation processing / cataloguing/...
Katrin Fischer [Mon, 22 Aug 2011 22:06:00 +0000 (00:06 +0200)]
Bug 6458: Incorrect translation processing / cataloguing/...

Patch removes template directives from within HTML tags from
  - cataloging > new record
  - cataloging
  - UNIMARC plugin for 4XX

There is one problem remaining in addbiblio:

<option value="[% frameworkcodeloo.value %]" [% frameworkcodeloo.selected %]>
    [% frameworkcodeloo.frameworktext %]
</option>

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 27c87aea11243e63c2600d71a154d425b3269c13)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 6458: Incorrect translation processing / acqui/...
Katrin Fischer [Mon, 22 Aug 2011 21:47:02 +0000 (23:47 +0200)]
Bug 6458: Incorrect translation processing / acqui/...

Patch removes template directives from within HTML tags from
- acquisitions > new vendor / modify vendor / vendor details
- acquisitions > late orders
- acquisitons > vendor x > basket groups

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit d5a9eea5194c97e3874ee830fccf2cdeb1ddf3f8)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 6458: Incorrect translation processing - masthead.inc
Katrin Fischer [Sat, 20 Aug 2011 17:38:30 +0000 (19:38 +0200)]
Bug 6458: Incorrect translation processing - masthead.inc

Patch removes templates directives from HTML tags in masthead.inc

Problem was related to library pull down shown when
OpacAddMastheadLibraryPulldown is activated.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Before
opac-tmpl/prog/en/includes/masthead.inc: 83

After no errors

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 637953df93f7090de846e1f274a1e721687a9277)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 6458: Incorrect translation processing / 3x reports/...
Katrin Fischer [Mon, 22 Aug 2011 21:25:37 +0000 (23:25 +0200)]
Bug 6458: Incorrect translation processing / 3x reports/...

Patch removes template directives from within HTML tags from
- Reports > Guided Reports
- Reports > Items with no checkouts
- Reports > Patron statistics

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit fb7b258ec2220fcf6a86d49132b0224175f0a344)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 6458: Incorrect translation processing / authorities.tt
Katrin Fischer [Mon, 22 Aug 2011 21:16:12 +0000 (23:16 +0200)]
Bug 6458: Incorrect translation processing / authorities.tt

Patch removes template directives from within HTML tags from
authorities > modify authority.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 1866c4939df4298d561bc9f5fe617644a9955371)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 6458: Incorrect translation processing / review.tt
Katrin Fischer [Mon, 22 Aug 2011 21:00:18 +0000 (23:00 +0200)]
Bug 6458: Incorrect translation processing / review.tt

Patch removes template directives from within HTML tags from
Tools > Tags.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 1859858af62c6f9923d56b70b29c4c0a3a24f9e4)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 6458: Incorrect translation processing / overdue.tt
Katrin Fischer [Mon, 22 Aug 2011 20:46:28 +0000 (22:46 +0200)]
Bug 6458: Incorrect translation processing / overdue.tt

Patch removes template directives from within HTML tags from
circulation > overdues.

Problems were related to patron flags pull down and sort by loop for patron attributes.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 18844d6bf1f1c6cf93cbe833067fe747753856b9)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 6458: Incorrect translation processing - doc-head-close/open.inc
Katrin Fischer [Sun, 21 Aug 2011 17:58:48 +0000 (19:58 +0200)]
Bug 6458: Incorrect translation processing - doc-head-close/open.inc

Patch removes templates directives from HTML tags in masthead.inc
Fixes all 3 problems now.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 75bfa2a56a857417cf99d605f0f903e14ec0f204)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoWhile testing the commits for 6716 I discovered a couple of missing
Chris Cormack [Mon, 12 Sep 2011 01:57:19 +0000 (13:57 +1200)]
While testing the commits for 6716 I discovered a couple of missing
drop tables, fixed now
(cherry picked from commit d6417257fde4e22252c78f2def21091016db17f3)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 6517 - [REVISED] koha-create wants "use database" in DEFAULTSQL
Magnus Enger [Thu, 30 Jun 2011 06:47:35 +0000 (08:47 +0200)]
Bug 6517 - [REVISED] koha-create wants "use database" in DEFAULTSQL

The revised patch quotes the variable $mysqldb, as suggested by Frère
Sébastien Marie.

This patch makes sure that pointing DEFAULTSQL in /etc/koha/koha-sites.conf
to any (gzip'ed) file produced by mysqldump works, by adding the name of the
database to the end of the call to mysql, when the specified SQL file is
loaded. Files produced with koha-dump-defaults should still work too.

To test:
- Apply the patch
- Create a new package with build-git-snapshot
- Install the package
- Create an SQL file from an existing installation with mysqldump
- gzip the SQL file
- point DEFAULTSQL to the file in /etc/koha/koha-sites.conf
- create a new site with koha-create --create-db

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 6863: Shelf Browser images not showing up
Ian Walls [Fri, 9 Sep 2011 18:37:22 +0000 (14:37 -0400)]
Bug 6863: Shelf Browser images not showing up

Fixes case for Syndetics (test condition was scoped wrong, leading to "no image available")
as well as Baker and Taylor (bad scope and capitalization on BakerTaylorImageURL).

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 6860: SyndeticsClientCode improperly scoped on many OPAC pages
Ian Walls [Fri, 9 Sep 2011 10:34:56 +0000 (06:34 -0400)]
Bug 6860: SyndeticsClientCode improperly scoped on many OPAC pages

SyndeticsClientCode was locally scoped in nearly all loops, preventing it from working.

This patch fixes not only search results and shelf browsers, but also rarely-used parts of
opac-detail, opac-opensearch, opac-readingrecord, opac-showreviews and opac-user

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 5602 - [3.4.x] Rewrite of package building script
Robin Sheat [Fri, 9 Sep 2011 03:50:07 +0000 (15:50 +1200)]
Bug 5602 - [3.4.x] Rewrite of package building script

Note: this is pulling in the most recent version from master. Working
with two different versions that have two different options was getting
painful, and it doesn't touch anything outside of debian/

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years ago6256 Follow up fixing typo
Marcel de Rooy [Wed, 7 Sep 2011 12:28:45 +0000 (14:28 +0200)]
6256 Follow up fixing typo

Fixing typo for 1062

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 6750 Guarantor search broken on translated templates
Frédéric Demians [Thu, 1 Sep 2011 08:09:48 +0000 (10:09 +0200)]
Bug 6750 Guarantor search broken on translated templates

Fix the JavaScript to avoid implementing complex string substitution into JS
function call. This patch solves the bug and keep the ability to copy
borrower's address, name, etc., containing new line, simple quote, etc.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit f64aaf063ea39b70c6f128d74d296566a021d217)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 6256: Many bib1 attributes missing
Ian Walls [Sun, 28 Aug 2011 01:19:55 +0000 (21:19 -0400)]
Bug 6256: Many bib1 attributes missing

This patch adds all the bib1 attributes listed in the bug report, in numerical order.  Names of attributes are
normalized; spaces are replaced by '-', '--' is reduced to '-' and parentheticals are dropped

In the particular case of att 1062, it is renamed from 'stocknumber' to 'Number-local-acquisition',
as per the bib1 definition.  The mapping in ccl.properties is retained as 'stocknumber', so all search
functions should continue to behave normally

Signed-off-by: <dev_patches@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 5d8b1713da45ca82d67668a00bd345d9fcead717)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoFollow up for 6665 : Fixing the hide_marc pref also
Chris Cormack [Mon, 5 Sep 2011 02:50:29 +0000 (14:50 +1200)]
Follow up for 6665 : Fixing the hide_marc pref also

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 34b553d03b96cb3c84ec978f6eea542f38f60de3)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 6665 : TT problem was preventing AdvancedMARCEditor pref from working when catalo...
Chris Cormack [Mon, 5 Sep 2011 02:42:55 +0000 (14:42 +1200)]
Bug 6665 : TT problem was preventing AdvancedMARCEditor pref from working when cataloguing

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 4363ff6669c92d0fbbd891fa870bd2cb5e021e9e)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 6555 : only 10 lists show in the staff client
Chris Cormack [Sun, 4 Sep 2011 23:27:40 +0000 (11:27 +1200)]
Bug 6555 : only 10 lists show in the staff client

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 6732 : Showing the bibliographic title on the manual invoices line
Chris Cormack [Mon, 5 Sep 2011 02:04:26 +0000 (14:04 +1200)]
Bug 6732 : Showing the bibliographic title on the manual invoices line

Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
(cherry picked from commit e71b4faf789ab872d94c8f20c0c252b5550da2d0)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoUpdating about file and history doc
Chris Cormack [Tue, 6 Sep 2011 20:49:31 +0000 (08:49 +1200)]
Updating about file and history doc
(cherry picked from commit f09e8403119c08861ef1cec466447012b1b2775b)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agobug 6724: enable decimals on values greater than 1
Brett Wilkins [Mon, 29 Aug 2011 04:47:48 +0000 (16:47 +1200)]
bug 6724: enable decimals on values greater than 1

Separating perl standard uses from koha uses

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit f824121bb136b08ae3308168a0deeb524518fdde)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoUpdating history and about file
Chris Cormack [Sun, 4 Sep 2011 08:49:09 +0000 (20:49 +1200)]
Updating history and about file
(cherry picked from commit 9e9326671426dbd41384a70d7e59c27632c890a3)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 4877 [ENH] - [SIGNED-OFF] more man page improvements
Robin Sheat [Mon, 29 Aug 2011 00:24:45 +0000 (12:24 +1200)]
Bug 4877 [ENH] - [SIGNED-OFF] more man page improvements

Signed-off-by: Magnus Enger <magnus@enger.priv.no>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 6534b5cf29ea044f405af976447fe67262780a0d)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 4877 [ENH] - Update man page for koha-create
Magnus Enger [Sun, 28 Aug 2011 13:02:09 +0000 (15:02 +0200)]
Bug 4877 [ENH] - Update man page for koha-create

Signed-off-by: Robin Sheat <robin@catalyst.net.nz>
(to be followed by another patch that I think helps too)

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 6516 - Make borrowernumber of staff user configurable in koha-create
Magnus Enger [Tue, 9 Aug 2011 08:22:20 +0000 (10:22 +0200)]
Bug 6516 - Make borrowernumber of staff user configurable in koha-create

Sets the default borrowernumber of staff user to 1 and makes it possible
to override this with ADMINUSER in /etc/koha/koha-sites.conf or with the
--adminuser and -a command line options.

Remember to update the wiki if this gets pushed!

Signed-off-by: Robin Sheat <robin@catalyst.net.nz>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 8d8d2e6b441415724e667af95fefd9b0ea9c1bbc)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 6121: follow-up = using overloo instead of reserveloo
Paul Poulain [Wed, 10 Aug 2011 11:46:18 +0000 (13:46 +0200)]
Bug 6121: follow-up = using overloo instead of reserveloo

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 6121: Holds awaiting pickup
Christophe Croullebois [Tue, 8 Feb 2011 16:58:54 +0000 (17:58 +0100)]
Bug 6121: Holds awaiting pickup

On holds over, when cancelling hold and returning to his branch a bug fill the branchtransfers.tobranch field with the branchname instead of the branch code.

BibLibre MT5647

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoFix for Bug 5028 - Remove references to catmaintain.pl
Owen Leonard [Tue, 23 Aug 2011 18:57:02 +0000 (14:57 -0400)]
Fix for Bug 5028 - Remove references to catmaintain.pl

catmaintain.pl doesn't exist anymore. References to it in the
templates should be removed.

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoFix for Bug 6768, Two unused include files can be removed
Owen Leonard [Tue, 23 Aug 2011 18:52:37 +0000 (14:52 -0400)]
Fix for Bug 6768, Two unused include files can be removed

Removing error-top.inc and error-bottom.inc

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 4966 - follow up - add xhtml closure for input tags
Alex Arnaud [Fri, 2 Sep 2011 12:36:21 +0000 (14:36 +0200)]
Bug 4966 - follow up - add xhtml closure for input tags

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agobug4966 - follow up to 4966 changes language from 'end' to 'finish'
Nicole C. Engard [Fri, 5 Aug 2011 14:09:21 +0000 (10:09 -0400)]
bug4966 - follow up to 4966 changes language from 'end' to 'finish'

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agobug 4966: Add a button in parcel.pl for confirm end receiving
Alex Arnaud [Fri, 5 Aug 2011 13:47:16 +0000 (15:47 +0200)]
bug 4966: Add a button in parcel.pl for confirm end receiving

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 6595: [ENH] [SIGNED-OFF] Fixing German translation and address formatting (HOLD_P...
Katrin Fischer [Sun, 17 Jul 2011 15:18:47 +0000 (17:18 +0200)]
Bug 6595: [ENH] [SIGNED-OFF] Fixing German translation and address formatting (HOLD_PRINT)

Patch fixes some translation issues and address formatting for printed
hold notices.

Signed-off-by: Magnus Enger <magnus@enger.priv.no>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 6ba4419be0826f9535e92d1bbf3612f7bf0695b7)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 6595:[ENH] [SIGNED-OFF] Add German translation of purchase suggestion mails
Katrin Fischer [Sun, 17 Jul 2011 14:20:00 +0000 (16:20 +0200)]
Bug 6595:[ENH] [SIGNED-OFF] Add German translation of purchase suggestion mails

Translates the purchase suggestion mails in sample_notices.sql from English to German.

Signed-off-by: Magnus Enger <magnus@enger.priv.no>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit ba78d6a8503d9340797eeabf2f9655efaee6f993)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agobug 6834 followup removing param_map
Henri-Damien LAURENT [Fri, 2 Sep 2011 08:36:29 +0000 (10:36 +0200)]
bug 6834 followup removing param_map

param_map was still to be found in two files.

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 6834 : Removing last of the $template->{param_map}
Chris Cormack [Fri, 2 Sep 2011 03:31:28 +0000 (15:31 +1200)]
Bug 6834 : Removing last of the $template->{param_map}

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 6479 Converts all the serialseq variables to UTF-8.
Frédérick Capovilla [Tue, 7 Jun 2011 18:03:08 +0000 (14:03 -0400)]
Bug 6479 Converts all the serialseq variables to UTF-8.

Corrects a problem when an UTF-8 character is used in the serial
numbering formula. The encoding became incorrect when concatenating the
number in the subscriptionhistory table.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
To reproduce:
- Create subscription with numbering pattern N° {X}
- Receive 2 or more issues
- Check subscription summary page and manual history fields on the edit screen

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoFix for Bug 2539 - kohaspsuggest is deprecated, notes outmoded
Owen Leonard [Mon, 22 Aug 2011 20:09:05 +0000 (16:09 -0400)]
Fix for Bug 2539 - kohaspsuggest is deprecated, notes outmoded

Removing unused script.

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 6275 - allow automated backups for packages
Robin Sheat [Thu, 28 Apr 2011 03:21:04 +0000 (15:21 +1200)]
Bug 6275 - allow automated backups for packages

This causes backups for the last two days to be stored by default. The
backups will go into /var/spool/koha.

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 6656 : Fix for advanced search not respecting default sort order
Chris Cormack [Mon, 29 Aug 2011 03:35:45 +0000 (15:35 +1200)]
Bug 6656 : Fix for advanced search not respecting default sort order

Rebase for 3.4.x

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 6822: fix RIS export from OPAC
Steven Callender [Tue, 30 Aug 2011 19:19:23 +0000 (15:19 -0400)]
Bug 6822: fix RIS export from OPAC

Prior to this patch, RIS export was producing
effectively empty output.

Signed-off-by: Steven Callender <stevecallender@esilibrary.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit a2a9bc522035c17a24aa48badc5184b015197826)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 6351: Cannot delete library-specific holds polices and checkout limits
Ian Walls [Tue, 30 Aug 2011 17:49:51 +0000 (13:49 -0400)]
Bug 6351: Cannot delete library-specific holds polices and checkout limits

Template::Toolkit scope error on delete links on Checkout Limit by Patron Category
and Holds Policy by Item Type areas.

Testing Results:
Tested adding and removing Checkout Limits by Patron Category - both work
Tested adding and removing Holds Policies by ItemTypes - both work

Signed-off-by: Liz Rea <lrea@nekls.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit cb6c40faf78fa25b752c3c51abc98435e9afe4cb)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 6704 : Escaping html in the merging records, so " don't break the merge
Chris Cormack [Mon, 29 Aug 2011 04:46:11 +0000 (16:46 +1200)]
Bug 6704 : Escaping html in the merging records, so " don't break the merge

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Liz Rea <lrea@nekls.org>
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 720e3012a87ca437c17e864f159138304ed0c006)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 6794 : Fixing a bug with member flags in IE
Maxime Pelletier [Fri, 26 Aug 2011 21:09:46 +0000 (09:09 +1200)]
Bug 6794 : Fixing a bug with member flags in IE

Rebased for template toolkit

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
(cherry picked from commit 6756581cf88bcbe40203722bb29aef6abe9283f6)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 5524 : Cant delete list from the second page of lists
Chris Cormack [Fri, 26 Aug 2011 01:42:44 +0000 (13:42 +1200)]
Bug 5524 : Cant delete list from the second page of lists

Includes follow up fixing deleting lists in OPAC

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit e39de040206eae26e22d6375479b548017cb7217)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 6528 : Cataloguing search not showing location for available items
Chris Cormack [Mon, 29 Aug 2011 02:14:58 +0000 (14:14 +1200)]
Bug 6528 : Cataloguing search not showing location for available items

Cataloging search now shows holdings information.

Signed-off-by: Liz Rea <lrea@nekls.org>
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit ff4b179e14ab15bf5d20852a37e2b0a2dca45800)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 6715 - Fix xmlControlfield.js so the xml files are fetched in the correct languag...
preprod34 [Fri, 12 Aug 2011 15:44:33 +0000 (11:44 -0400)]
Bug 6715 - Fix xmlControlfield.js so the xml files are fetched in the correct language directory.

xmlControlfield.js was always fetching the "en" xml file, preventing the translations
from working.

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

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
- Apply patch
- Install language files, example: perl translate install de-DE
- Edit .xml files for value builders 006 and 008
- Test by creating a new record and using value builders

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoUpdating about page and history
Chris Cormack [Sun, 28 Aug 2011 07:47:22 +0000 (19:47 +1200)]
Updating about page and history
(cherry picked from commit 61758c8bcbd6d8c2a03e39ca196e944470520c97)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoFix for Bug 6712 - Remove memberofinstitution markup from templates until it can...
Owen Leonard [Thu, 11 Aug 2011 19:21:35 +0000 (15:21 -0400)]
Fix for Bug 6712 - Remove memberofinstitution markup from templates until it can be completed

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
To test:
1) Make sure syspref memberofinstitution is turned on
2) Add a new patron of organisation category (example: library)
3) Check that there is no field set 'organisation' showing up
4) Checkout books to any borrower
5) Renew books until no longer possible
6) Scan barcode from renewed book to force renewal
6) Check that the 'no more renewals' message has no empty pull below text message

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoFix for Bug 6696, New category button broken when no categories defined
Owen Leonard [Wed, 10 Aug 2011 15:44:37 +0000 (11:44 -0400)]
Fix for Bug 6696, New category button broken when no categories defined

The javascript tablesorter will trigger an error if we try
to apply it to a table with no <tbody>. That error prevented
the YUI button script to complete properly, hence the broken
button.

This patch hides the table in cases where there are no
categories and displays an error message instead.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
- Deleted all patron categories and checked button was broken
- Applied patch and checked again - button shows up
- Nice: There is a note now that you have to create categories

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoFix for Bug 6652, Zip showing in funny place on libraries admin
Owen Leonard [Mon, 1 Aug 2011 11:51:18 +0000 (07:51 -0400)]
Fix for Bug 6652, Zip showing in funny place on libraries admin

This fixes display of Zip code relative to the city and state if
you're in the USA and you like to do it this way. At the very
least this matches how we display addresses elsewhere in Koha.

It should be noted that this makes it incorrect for anyone who
wants to see addresses like this:

[name]
[street address]
[postal code + city]

...or any other variation of course.

While I'm in there, also making branch URLs and emails clickable.

Signed-off-by: Nicole Engard <nengard@gmail.com>
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 3731ec80fc407ba4668450b48c9c81b8c0a98460)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoFix for Bug 6791 - editing list with apostrophe loses text
Owen Leonard [Fri, 26 Aug 2011 19:14:48 +0000 (15:14 -0400)]
Fix for Bug 6791 - editing list with apostrophe loses text

Markup used single quotes around value attribute. Since single
quotes aren't escaped by the template's HTML filter these
quotes conflicted with the one in the text.

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 6733 - Change return page after printing routing slip
Colin Campbell [Fri, 26 Aug 2011 16:14:25 +0000 (17:14 +0100)]
Bug 6733 - Change return page after printing routing slip

Previously printing a routing slip returned the user to
the top level in serials this change maintains the context
in the current subscription

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 6765: sip2 unicode checksum
Ulrich Kleiber [Fri, 29 Jul 2011 14:35:40 +0000 (16:35 +0200)]
Bug 6765: sip2 unicode checksum

Changes checksum calculation method, as per Dan Scott's fix in openncip.
see http://sourceforge.net/tracker/?func=detail&aid=2925760&group_id=161781&atid=821216

http://bugs.koha-community.org/show_bug.cgi?id=6765
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 8a7c9167660493bc1a01a93dddba37a1a3683bc0)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoFix for Bug 4419 - cannot change module for notice templates
Owen Leonard [Mon, 22 Aug 2011 15:08:59 +0000 (11:08 -0400)]
Fix for Bug 4419 - cannot change module for notice templates

Adding a hidden form field to contain the original module
so that it can be used in the check for an existing entry.

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 6662: Remove Dewey Specific References in Sort
Nicole C. Engard [Sat, 20 Aug 2011 23:33:18 +0000 (19:33 -0400)]
Bug 6662: Remove Dewey Specific References in Sort

The sort option used to include tooltips for call number
that were Dewey specific.   This patch removes references
to Fiction and Nonfiction so that it can apply to any
classification.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 57a0fcb475ff7e353329ba9a7e5963a22351b4c9)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years ago6747 Checks in opac-export
Marcel de Rooy [Mon, 22 Aug 2011 12:02:03 +0000 (14:02 +0200)]
6747 Checks in opac-export

Added check on returned marc. If record does not exist, generate 404. (Prevents 500 errors by Googlebot on deleted records.)
Fixed typo, whitespace. Removed if on op=export. Added check on format.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 223156ea74233122c35d16100724eddbcd69d66a)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoUpdating Version Number to 3.04.04.001
Chris Nighswonger [Fri, 2 Sep 2011 19:07:38 +0000 (15:07 -0400)]
Updating Version Number to 3.04.04.001

13 years agoBug 5866 : Updated patch to speed up holds awaiting pickup
Chris Cormack [Thu, 25 Aug 2011 03:21:01 +0000 (15:21 +1200)]
Bug 5866 : Updated patch to speed up holds awaiting pickup

This reduced execution time on the report from timeout (1400 holds waiting + 200 holds over) to 6 or so seconds, with 1566 holds over (test data, no holds waiting).

Signed-off-by: Liz Rea <lrea@nekls.org>
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoFollow-up fix for Bug 6753, Markup corrections and improvements for label export...
Owen Leonard [Fri, 19 Aug 2011 14:23:58 +0000 (10:23 -0400)]
Follow-up fix for Bug 6753, Markup corrections and improvements for label export window

Making the same changes to the patron card export window.
Now that all references are removed, the old icons and CSS
have been removed as well.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
(cherry picked from commit 63d300191efb3207b7ebb95b98db0d86ca371f16)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoFollow-up fix for Bug 6726 - When SMS is enabled the messaging table is misaligned
Owen Leonard [Wed, 24 Aug 2011 13:50:19 +0000 (09:50 -0400)]
Follow-up fix for Bug 6726 - When SMS is enabled the messaging table is misaligned

Corresponding fix for the OPAC

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 666a2316d8adbd8fadba263c42dba71fe992532c)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoFixing typo in history doc
Chris Cormack [Fri, 26 Aug 2011 01:00:54 +0000 (13:00 +1200)]
Fixing typo in history doc
(cherry picked from commit 9c346e25269ada0b3fa5f5a6934986970c6b9a9f)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years ago150th developer!!!
Chris Cormack [Fri, 26 Aug 2011 00:49:50 +0000 (12:49 +1200)]
150th developer!!!

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 6723 : import-framework-crlf
Ward van Wanrooij [Mon, 15 Aug 2011 12:38:40 +0000 (14:38 +0200)]
Bug 6723 : import-framework-crlf

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 6562: Silence runtime error in reserve/request.pl
Colin Campbell [Mon, 4 Jul 2011 15:20:59 +0000 (16:20 +0100)]
Bug 6562: Silence runtime error in reserve/request.pl

Not defining action just causes logging of noisy
runtime warnings.

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agobug 6538 update letter.pl help file
Nicole C. Engard [Tue, 28 Jun 2011 19:24:45 +0000 (15:24 -0400)]
bug 6538 update letter.pl help file

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>