[koha-commits] main Koha release repository branch new/bug_6458 updated. v3.04.00-510-g362b82c
Git repo owner
gitmaster at git.koha-community.org
Wed Sep 14 00:14:15 CEST 2011
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".
The branch, new/bug_6458 has been updated
via 362b82c51d1ff4fe6506f7724e8dac7d0a24ebd0 (commit)
via 9dc11e418a3f48971de92f2722bd564738218c9f (commit)
via aab0d9fba264ec3e878e339e098b1f3c943e6a6d (commit)
via 3e1203c95e53422015885a2add288d5cbc9f8733 (commit)
via 8bdab59bbad65bdb4b324fedc79c73b33066b0d3 (commit)
via 0d5aaf0a7ca024d4ec5e1b7d554e0d813785fae4 (commit)
via 597240e878a2a9808ce103508a42d9ed34a11422 (commit)
via e1bbff6b7f9db37714fcdb69b03598600e222237 (commit)
via 8a4dbae0efee89728de8bc5a63339828498f9798 (commit)
via e8a876614eddde3025477e228d4ccf533d3cc683 (commit)
via c7c7a09dc49483fa9b9eefb2a24d3bc4aaea5359 (commit)
via ecfa1ddd49bd8de6139cd7200679996b51dabf3c (commit)
via 550a38143a5898dc7c4ef09be215dcb27aab1034 (commit)
via 2c51064ab183abb3761be629efd4169ebef99d4b (commit)
via 7950a8f5af10b905d1a53e14e69eb34ad430d29e (commit)
via d058b4eee9de75b00d8cb74367bd3ee0bdc2318c (commit)
from 282a2d60b830b22661cc0324a84b7c17b7b905d1 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 362b82c51d1ff4fe6506f7724e8dac7d0a24ebd0
Author: Owen Leonard <oleonard at myacpl.org>
Date: Tue Sep 13 12:30:05 2011 -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 at catalyst.net.nz>
commit 9dc11e418a3f48971de92f2722bd564738218c9f
Author: Owen Leonard <oleonard at myacpl.org>
Date: Tue Sep 13 09:33:05 2011 -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 at catalyst.net.nz>
commit aab0d9fba264ec3e878e339e098b1f3c943e6a6d
Author: Owen Leonard <oleonard at myacpl.org>
Date: Tue Sep 13 09:01:54 2011 -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 at catalyst.net.nz>
commit 3e1203c95e53422015885a2add288d5cbc9f8733
Author: Owen Leonard <oleonard at myacpl.org>
Date: Fri Aug 26 16:07:46 2011 -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 at web.de>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
commit 8bdab59bbad65bdb4b324fedc79c73b33066b0d3
Author: Owen Leonard <oleonard at myacpl.org>
Date: Fri Aug 26 15:56:00 2011 -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 at web.de>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
commit 0d5aaf0a7ca024d4ec5e1b7d554e0d813785fae4
Author: Owen Leonard <oleonard at myacpl.org>
Date: Fri Sep 2 10:14:51 2011 -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 at catalyst.net.nz>
commit 597240e878a2a9808ce103508a42d9ed34a11422
Author: Owen Leonard <oleonard at myacpl.org>
Date: Thu Aug 25 15:37:25 2011 -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 at bsz-bw.de>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
commit e1bbff6b7f9db37714fcdb69b03598600e222237
Author: Owen Leonard <oleonard at myacpl.org>
Date: Fri Aug 26 10:54:07 2011 -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 at bsz-bw.de>
Read the patch and tested the page, didn't find any problems.
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
commit 8a4dbae0efee89728de8bc5a63339828498f9798
Author: Katrin Fischer <katrin.fischer at bsz-bw.de>
Date: Wed Aug 11 02:27:39 2010 +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 at catalyst.net.nz>
commit e8a876614eddde3025477e228d4ccf533d3cc683
Author: Owen Leonard <oleonard at myacpl.org>
Date: Fri Aug 26 09:07:15 2011 -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 at bsz-bw.de>
Fixes lots of problems. Spotted one small problem. I am sending a follow-up.
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
commit c7c7a09dc49483fa9b9eefb2a24d3bc4aaea5359
Author: Owen Leonard <oleonard at myacpl.org>
Date: Thu Sep 1 10:53:24 2011 -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 at web.de>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
commit ecfa1ddd49bd8de6139cd7200679996b51dabf3c
Author: Owen Leonard <oleonard at myacpl.org>
Date: Thu Sep 1 10:36:50 2011 -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 at catalyst.net.nz>
commit 550a38143a5898dc7c4ef09be215dcb27aab1034
Author: Owen Leonard <oleonard at myacpl.org>
Date: Thu Sep 1 10:26:19 2011 -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 at catalyst.net.nz>
commit 2c51064ab183abb3761be629efd4169ebef99d4b
Author: Owen Leonard <oleonard at myacpl.org>
Date: Thu Sep 1 10:06:03 2011 -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 at catalyst.net.nz>
commit 7950a8f5af10b905d1a53e14e69eb34ad430d29e
Author: Owen Leonard <oleonard at myacpl.org>
Date: Thu Sep 1 09:40:08 2011 -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 at catalyst.net.nz>
commit d058b4eee9de75b00d8cb74367bd3ee0bdc2318c
Author: Owen Leonard <oleonard at myacpl.org>
Date: Fri Aug 26 16:15:34 2011 -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 at catalyst.net.nz>
-----------------------------------------------------------------------
Summary of changes:
admin/branches.pl | 6 +-
admin/patron-attr-types.pl | 24 +-
.../prog/en/includes/budgets-admin-search.inc | 6 +-
.../intranet-tmpl/prog/en/includes/header.inc | 6 +-
.../intranet-tmpl/prog/en/modules/admin/aqplan.tt | 8 +-
.../en/modules/admin/branch_transfer_limits.tt | 8 +-
.../prog/en/modules/admin/branches.tt | 7 +-
.../prog/en/modules/admin/clone-rules.tt | 12 +-
.../prog/en/modules/admin/patron-attr-types.tt | 46 +++-
.../prog/en/modules/admin/systempreferences.tt | 71 ++++-
.../prog/en/modules/cataloguing/addbiblio.tt | 1 -
.../prog/en/modules/labels/spinelabel-print.tt | 6 +-
.../prog/en/modules/members/memberentrygen.tt | 272 ++++++++++++++++----
.../prog/en/modules/members/moremember.tt | 14 +-
.../prog/en/modules/tools/csv-profiles.tt | 9 +-
.../prog/en/modules/tools/manage-marc-import.tt | 4 +-
.../opac-tmpl/prog/en/modules/opac-reserve.tt | 33 ++-
17 files changed, 425 insertions(+), 108 deletions(-)
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list