www-apps/trac-acct_mgr: add 0.12 branch

git-svn-id: https://svn.disconnected-by-peer.at/svn/linamh/trunk/linamh@1755 6952d904-891a-0410-993b-d76249ca496b
This commit is contained in:
geos_one 2009-12-26 10:29:48 +00:00
parent de5bed8245
commit 123050804b
4 changed files with 122 additions and 1 deletions

View File

@ -2,6 +2,11 @@
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
26 Dec 2009; Mario Fetka <mario.fetka@gmail.com>
+trac-acct_mgr-0.2.1-r2.ebuild,
+files/replaceMessageWrapper-with-genshi-markup-against-0.11-branch.patch:
add 0.12 branch
26 Dec 2009; Mario Fetka <mario.fetka@gmail.com>
trac-acct_mgr-0.2.1-r1.ebuild:
add registration patch back

View File

@ -1,7 +1,9 @@
AUX RegistrationConfirmationPatch.diff 4570 RMD160 e844d2b40e2bf3ca05777f836d346a881d661bdb SHA1 dbf528abc61c510df84ad8a67d2ba657f3dda3ca SHA256 2c4499175037fd06a5e7661a5d61ef97a178b720e5cfe5973d711095b6604088
AUX redirect-fix.patch 579 RMD160 ace1b0a2e46f2bf47266e348643f69e50daa173f SHA1 32494b5b9e36236433305aeabdc01527e51b6004 SHA256 f3ec357c65642753eda0e11266e84916497ffecbd2e8f5d1d667773835486709
AUX replaceMessageWrapper-with-genshi-markup-against-0.11-branch.patch 2759 RMD160 e108ae24e5fafa399745d898a12a3f98694b7a0e SHA1 1b00e9ed79e6063a8ec10cab528ab0d709c5f708 SHA256 b478be6bcae846552bd6f538a1eb21788cb7381ace8439d365d134022b471186
EBUILD trac-acct_mgr-0.1.3.ebuild 1214 RMD160 08c61116b34731a9204414a8801df2ed49327e61 SHA1 366ed27ec819f45a352573b3029ad79d84ece486 SHA256 dbcaa0bbb198ee2c4bb8d354dce62faabe36c823bfda827daf16fb87ec2c9b2c
EBUILD trac-acct_mgr-0.2.1-r1.ebuild 1493 RMD160 a5a98ece6674b4c7db7a18b1c671056545cba69c SHA1 c4d513e8437d7f2f12d581f60b3887575fb24c88 SHA256 0a61867f7570b1762238019363809b9e193781b0b88c1e6efb0f8b871ae54021
EBUILD trac-acct_mgr-0.2.1-r2.ebuild 1494 RMD160 1a359f7ad812326f6eab89284c8aef3df72b6538 SHA1 96f75b2b3344c911c7cd7052470409b335c894cd SHA256 69e1c074079fb6aa56e09725fc5c9568eab7e3d78c6a42eeeda3af460492ef7f
EBUILD trac-acct_mgr-0.2.1.ebuild 1452 RMD160 68f332836dd6f90301280babd27349a34b929f1c SHA1 7dfea05925fd88cf661a866281dcb05575c41afa SHA256 a9bfbde6a13df29c28af2eb09dcc2b528ef4281380951e9dd5a191535edc1f8f
MISC ChangeLog 1253 RMD160 f68e9889f979afb4613183aa77f94f5b368a2530 SHA1 b1dd10c73b0a5da8b8a7c5f1c224c235ee1f45a2 SHA256 44e4f60c49f6cecfa97a6299b2158da93376a486a980610b041949e2888347aa
MISC ChangeLog 1434 RMD160 83467db9be06f0b9fe74a7417278f93381d46f8e SHA1 be8795b049c1e33e60135fb628127e95af8efebb SHA256 4b6f7925333efef3e1363dd7193bb2857f1127f7a9a182c1694338369d189ebe
MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42

View File

@ -0,0 +1,65 @@
Index: acct_mgr/web_ui.py
===================================================================
--- acct_mgr/web_ui.py (revision 5267)
+++ acct_mgr/web_ui.py (working copy)
@@ -24,6 +24,7 @@
from trac.web.main import IRequestHandler, IRequestFilter
from trac.web import chrome
from trac.web.chrome import INavigationContributor, ITemplateProvider
+from genshi.core import Markup
from genshi.builder import tag
from api import AccountManager
@@ -239,7 +240,7 @@
if force_change_password:
del(req.session['force_change_passwd'])
req.session.save()
- chrome.add_notice(req, MessageWrapper(tag(
+ chrome.add_notice(req, Markup(tag(
"Thank you for taking the time to update your password."
)))
force_change_password = False
@@ -248,7 +249,7 @@
else:
data.update({'error': 'Invalid action'})
if force_change_password:
- chrome.add_warning(req, MessageWrapper(tag(
+ chrome.add_warning(req, Markup(tag(
"You are required to change password because of a recent "
"password change request. ",
tag.b("Please change your password now."))))
@@ -507,16 +508,6 @@
return [resource_filename(__name__, 'templates')]
-class MessageWrapper(object):
- """Wrapper for add_warning and add_notice to work around the requirement
- for a % operator."""
- def __init__(self, body):
- self.body = body
-
- def __mod__(self, rhs):
- return self.body
-
-
class EmailVerificationNotification(SingleUserNofification):
template_name = 'verify_email.txt'
@@ -549,7 +540,7 @@
# tickets. As such, this email verifying code won't be used on them
return handler
if handler is not self and 'email_verification_token' in req.session:
- chrome.add_warning(req, MessageWrapper(tag.span(
+ chrome.add_warning(req, Markup(tag.span(
'Your permissions have been limited until you ',
tag.a(href=req.href.verify_email())(
'verify your email address'))))
@@ -566,7 +557,7 @@
req.session['email_verification_token'] = self._gen_token()
req.session['email_verification_sent_to'] = req.session.get('email')
self._send_email(req)
- chrome.add_notice(req, MessageWrapper(tag.span(
+ chrome.add_notice(req, Markup(tag.span(
'An email has been sent to ', req.session['email'],
' with a token to ',
tag.a(href=req.href.verify_email())(

View File

@ -0,0 +1,49 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/www-apps/trac-webadmin/trac-webadmin-0.1.2.ebuild,v 1.4 2007/02/13 20:39:33 corsair Exp $
inherit distutils subversion
ESVN_REPO_URI="http://trac-hacks.org/svn/accountmanagerplugin/trunk"
DESCRIPTION="The AccountManagerPlugin offers several features for managing user accounts."
HOMEPAGE="http://trac-hacks.org/wiki/AccountManagerPlugin"
# SRC_URI="mirror://gentoo/${P}.tar.bz2"
LICENSE="trac"
KEYWORDS="~amd64 ~ppc64 ~x86"
IUSE=""
SLOT="0"
DEPEND="=www-apps/trac-0.11*
>=dev-python/setuptools-0.6_rc1"
src_unpack() {
subversion_src_unpack
cd "${S}"
epatch "${FILESDIR}/redirect-fix.patch"
epatch "${FILESDIR}/RegistrationConfirmationPatch.diff"
}
# from marienz's setuptools.eclass:
src_install() {
"${python}" setup.py install --root=${D} --no-compile \
--single-version-externally-managed "$@" || die "install failed"
}
src_test() {
"${python}" setup.py test || die "tests failed"
}
pkg_postinst() {
elog "To enable the AccountManager plugin in your Trac environments, you have to add:"
elog " [components]"
elog " trac.web.auth.LoginModule = disabled"
elog " acct_mgr.web_ui.LoginModule = enabled"
elog " acct_mgr.web_ui.RegistrationModule = disabled"
elog "to your trac.ini files."
elog
elog "To be able to see the Admin tab, your users must have the TRAC_ADMIN permission"
elog "and/or the TICKET_ADMIN permission."
}