[koha-commits] main Koha release repository branch 3.4.x updated. v3.04.04-109-gcfd7bc0
Git repo owner
gitmaster at git.koha-community.org
Wed Sep 14 20:07:23 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, 3.4.x has been updated
via cfd7bc00924c93b28abd398fcbe8725021f5f80d (commit)
via bd2f60295cbc47e4f4f50ed0f73858577108abdf (commit)
via 9ea41c74681f6c960370235b91aec91dcc0f47fa (commit)
via 340dc7b48f83cfd97a0856871d8bde49a038a07f (commit)
via 275e5d872784cc35da3e4aa3be03f19bb6861b31 (commit)
via 09ae2aa7e9158129cc4d9648810858bf25c685f2 (commit)
via 14cb5908e89ce0ef9c64267d046f174f126a7f7e (commit)
via 8550a2514a440c122a61b9c956543a918b4b2dad (commit)
via 7c081866fa8c5b658753d1d90e2feda3551a4982 (commit)
via bf0fe173358f7f1680b1c9939db8298c8361b954 (commit)
via a219d961f6acb407d35267fa4990e26c81faaf27 (commit)
via 390f4d483cb8b13d0214d8866b1c487b20de895e (commit)
via 344c67147958d3db8a019c66c9f39f4f4096211f (commit)
via a68c5239938a7b33f590bbe3f7ed3affd577956c (commit)
via bdbf4f577a43a448a89dcbd68740000925a7fd4e (commit)
via f51a0460b0505ad413b32ff838568935d53f0096 (commit)
via 6cd7e2dcb1775b4e3b94da16b75c3c98ed86002e (commit)
via f1c165158f8f482e4aedc515e9a7bebdf8619a46 (commit)
via 3565cda55f22f764d0da8dfb942a37718a62a415 (commit)
via 0dbe479931ffcdc0fadd3c45d0446477db045283 (commit)
via 3dd92f781dca583ca02ec67166c06b4cdfc21fc5 (commit)
from aa2284e1113cb74b94c7da2fa43e423b690a9566 (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 cfd7bc00924c93b28abd398fcbe8725021f5f80d
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Thu Sep 1 14:07:40 2011 +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 at myacpl.org>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit caae541135dedb5d0ccddbf8ffd31887f802332d)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit bd2f60295cbc47e4f4f50ed0f73858577108abdf
Author: Owen Leonard <oleonard at myacpl.org>
Date: Mon Aug 22 12:23:05 2011 -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 at bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit 8474059769ae921c9dfb8249bc774ade606785fa)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 9ea41c74681f6c960370235b91aec91dcc0f47fa
Author: Nicole C. Engard <nengard at bywatersolutions.com>
Date: Sat Aug 6 07:15:11 2011 -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 at bywatersolutions.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit 92e71131faf55e719f84c6e29314f5abc5714b57)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 340dc7b48f83cfd97a0856871d8bde49a038a07f
Author: Liz Rea <lrea at nekls.org>
Date: Tue Sep 6 13:00:51 2011 -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 at foundations.edu>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit c2015c710355a0ab81306515a70af29e6aef3504)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 275e5d872784cc35da3e4aa3be03f19bb6861b31
Author: Colin Campbell <colin.campbell at ptfs-europe.com>
Date: Thu Jul 21 12:16:22 2011 +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 at bsz-bw.de>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit f9ccfae400324fdd88597ff81fba42715e50f19d)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 09ae2aa7e9158129cc4d9648810858bf25c685f2
Author: Janusz Kaczmarek <januszop at gmail.com>
Date: Wed May 18 22:35:57 2011 +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 at tamil.fr>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit 47aee699afbb4ad8aebc84e023a0e5c7fd441ec9)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 14cb5908e89ce0ef9c64267d046f174f126a7f7e
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>
(cherry picked from commit 362b82c51d1ff4fe6506f7724e8dac7d0a24ebd0)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 8550a2514a440c122a61b9c956543a918b4b2dad
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>
(cherry picked from commit 9dc11e418a3f48971de92f2722bd564738218c9f)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 7c081866fa8c5b658753d1d90e2feda3551a4982
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>
(cherry picked from commit aab0d9fba264ec3e878e339e098b1f3c943e6a6d)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit bf0fe173358f7f1680b1c9939db8298c8361b954
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>
(cherry picked from commit 3e1203c95e53422015885a2add288d5cbc9f8733)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit a219d961f6acb407d35267fa4990e26c81faaf27
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>
(cherry picked from commit 8bdab59bbad65bdb4b324fedc79c73b33066b0d3)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 390f4d483cb8b13d0214d8866b1c487b20de895e
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>
(cherry picked from commit 0d5aaf0a7ca024d4ec5e1b7d554e0d813785fae4)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 344c67147958d3db8a019c66c9f39f4f4096211f
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>
(cherry picked from commit 597240e878a2a9808ce103508a42d9ed34a11422)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit a68c5239938a7b33f590bbe3f7ed3affd577956c
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>
(cherry picked from commit e1bbff6b7f9db37714fcdb69b03598600e222237)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit bdbf4f577a43a448a89dcbd68740000925a7fd4e
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>
(cherry picked from commit c7c7a09dc49483fa9b9eefb2a24d3bc4aaea5359)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit f51a0460b0505ad413b32ff838568935d53f0096
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>
(cherry picked from commit ecfa1ddd49bd8de6139cd7200679996b51dabf3c)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 6cd7e2dcb1775b4e3b94da16b75c3c98ed86002e
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>
(cherry picked from commit 550a38143a5898dc7c4ef09be215dcb27aab1034)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit f1c165158f8f482e4aedc515e9a7bebdf8619a46
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>
(cherry picked from commit 2c51064ab183abb3761be629efd4169ebef99d4b)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 3565cda55f22f764d0da8dfb942a37718a62a415
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>
(cherry picked from commit 7950a8f5af10b905d1a53e14e69eb34ad430d29e)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 0dbe479931ffcdc0fadd3c45d0446477db045283
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>
(cherry picked from commit d058b4eee9de75b00d8cb74367bd3ee0bdc2318c)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 3dd92f781dca583ca02ec67166c06b4cdfc21fc5
Author: Owen Leonard <oleonard at myacpl.org>
Date: Tue Sep 21 08:35:38 2010 -0400
Fix for Bug 5234 - Remove unused CSS files
(cherry picked from commit 2d4d976f3dd5e9b36784562a02da25ae04122d86)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
-----------------------------------------------------------------------
Summary of changes:
C4/SIP/Sip.pm | 5 +-
admin/branches.pl | 6 +-
admin/patron-attr-types.pl | 24 +-
circ/selectbranchprinter.pl | 3 +-
.../intranet-tmpl/prog/en/css/intranet-print.css | 235 -------
koha-tmpl/intranet-tmpl/prog/en/css/intranet.css | 491 ---------------
koha-tmpl/intranet-tmpl/prog/en/css/intranet2.css | 665 --------------------
.../intranet-tmpl/prog/en/css/intranet2popup.css | 551 ----------------
.../intranet-tmpl/prog/en/css/pages/addbiblio.css | 75 ---
.../intranet-tmpl/prog/en/css/staff-global2.css | 575 -----------------
.../prog/en/includes/budgets-admin-search.inc | 6 +-
.../intranet-tmpl/prog/en/includes/header.inc | 8 +-
.../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 -
.../cataloguing/value_builder/unimarc_field_4XX.tt | 8 +-
.../prog/en/modules/labels/spinelabel-print.tt | 6 +-
.../prog/en/modules/members/moremember.tt | 14 +-
.../prog/en/modules/reports/borrowers_stats.tt | 6 +-
.../prog/en/modules/reports/issues_avg_stats.tt | 8 +-
.../prog/en/modules/reports/issues_stats.tt | 4 +-
.../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 +-
opac/opac-MARCdetail.pl | 10 +-
29 files changed, 224 insertions(+), 2675 deletions(-)
delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/css/intranet-print.css
delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/css/intranet.css
delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/css/intranet2.css
delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/css/intranet2popup.css
delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/css/pages/addbiblio.css
delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/css/staff-global2.css
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list