Merge lp:~ricardokirkner/django-adminaudit/configglue-schema into lp:django-adminaudit

Proposed by Ricardo Kirkner
Status: Merged
Approved by: Łukasz Czyżykowski
Approved revision: 49
Merged at revision: 47
Proposed branch: lp:~ricardokirkner/django-adminaudit/configglue-schema
Merge into: lp:django-adminaudit
Diff against target: 57 lines (+33/-1)
3 files modified
adminaudit/schema.py (+25/-0)
doc/configuration.rst (+7/-0)
setup.py (+1/-1)
To merge this branch: bzr merge lp:~ricardokirkner/django-adminaudit/configglue-schema
Reviewer Review Type Date Requested Status
Canonical ISD hackers Pending
Review via email: mp+107609@code.launchpad.net

Commit message

Added configglue schema for adminaudit settings.

Description of the change

Added configglue schema for adminaudit settings.

The contributed schema allows configglue-enabled projects to more easily integrate the available settings.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added file 'adminaudit/schema.py'
2--- adminaudit/schema.py 1970-01-01 00:00:00 +0000
3+++ adminaudit/schema.py 2012-07-24 13:03:19 +0000
4@@ -0,0 +1,25 @@
5+# configglue schema to enable projects using configglue to use adminaudit
6+# this schema represents all adminaudit available configuration settings
7+from operator import itemgetter
8+
9+from configglue.schema import (
10+ ListOption,
11+ Schema,
12+ Section,
13+ StringOption,
14+ )
15+from django.conf import settings
16+
17+
18+class AdminAuditSchema(Schema):
19+ class adminaudit(Section):
20+ adminaudit_emails_recipients = ListOption(
21+ item=StringOption(),
22+ default=map(itemgetter(1), settings.ADMINS),
23+ help='List of email addresss to send reports to.')
24+ adminaudit_summary_subject = StringOption(
25+ default='Admin Audit Summary',
26+ help='Email report subject.')
27+ adminaudit_email_from = StringOption(
28+ default=settings.DEFAULT_FROM_EMAIL,
29+ help='Email address from which to send reports.')
30
31=== modified file 'doc/configuration.rst'
32--- doc/configuration.rst 2011-04-03 21:07:36 +0000
33+++ doc/configuration.rst 2012-07-24 13:03:19 +0000
34@@ -55,3 +55,10 @@
35 ``auditlogs``
36 A list of AuditLogs created by this user for the reported period.
37
38+
39+``configglue``
40+==============
41+
42+``django-adminaudit`` doesn't directly depend on ``configglue``, but for
43+those projects that use it a schema is included (``adminaudit.schema``)
44+representing all available configuration settings.
45
46=== modified file 'setup.py'
47--- setup.py 2012-04-26 17:24:41 +0000
48+++ setup.py 2012-07-24 13:03:19 +0000
49@@ -39,7 +39,7 @@
50
51 setup(
52 name='django-adminaudit',
53- version='0.3.2',
54+ version='0.3.3',
55 description="Extends Django's admin logging capabilities",
56 url='https://launchpad.net/django-adminaudit',
57 author='Łukasz Czyżykowski',

Subscribers

People subscribed via source and target branches