Merge lp:~elachuni/ubuntu-webcatalog/remove-adminaudit into lp:ubuntu-webcatalog

Proposed by Anthony Lenton
Status: Merged
Approved by: Anthony Lenton
Approved revision: 34
Merged at revision: 35
Proposed branch: lp:~elachuni/ubuntu-webcatalog/remove-adminaudit
Merge into: lp:ubuntu-webcatalog
Diff against target: 94 lines (+1/-18)
6 files modified
.bzrignore (+0/-1)
debian/control (+0/-1)
django_project/config/main.cfg (+0/-1)
django_project/urls.py (+0/-2)
fabtasks/bootstrap.py (+1/-7)
src/webcatalog/schema.py (+0/-6)
To merge this branch: bzr merge lp:~elachuni/ubuntu-webcatalog/remove-adminaudit
Reviewer Review Type Date Requested Status
Ricardo Kirkner (community) Approve
Review via email: mp+66924@code.launchpad.net

Commit message

Removed django-adminaudit, until that project has been made public.

Description of the change

This branch removes the use of django-adminaudit, until that project has been made public.

We can eventually add it back in, hopefully soon.

To post a comment you must log in.
Revision history for this message
Ricardo Kirkner (ricardokirkner) wrote :

LGTM

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file '.bzrignore'
--- .bzrignore 2011-06-18 23:17:11 +0000
+++ .bzrignore 2011-07-05 16:12:34 +0000
@@ -1,7 +1,6 @@
1webcatalog.db1webcatalog.db
2src/ubuntu_webcatalog.egg-info/2src/ubuntu_webcatalog.egg-info/
3virtualenv/3virtualenv/
4django_project/adminaudit
5django_project/django_openid_auth4django_project/django_openid_auth
6django_project/local_settings.py5django_project/local_settings.py
7django_project/static/6django_project/static/
87
=== modified file 'debian/control'
--- debian/control 2011-06-20 21:49:31 +0000
+++ debian/control 2011-07-05 16:12:34 +0000
@@ -20,7 +20,6 @@
20 python-configglue (>> 0.9.1),20 python-configglue (>> 0.9.1),
21 python-django-configglue (>> 0.3),21 python-django-configglue (>> 0.3),
22 python-django-preflight,22 python-django-preflight,
23 python-django-adminaudit,
24 python-django-pgtools,23 python-django-pgtools,
25 python-django-south,24 python-django-south,
26 python-django-openid-auth,25 python-django-openid-auth,
2726
=== modified file 'django_project/config/main.cfg'
--- django_project/config/main.cfg 2011-06-29 09:24:48 +0000
+++ django_project/config/main.cfg 2011-07-05 16:12:34 +0000
@@ -18,7 +18,6 @@
18 django.contrib.messages18 django.contrib.messages
19 django.contrib.staticfiles19 django.contrib.staticfiles
20 django.contrib.markup20 django.contrib.markup
21 adminaudit
22 django.contrib.admin21 django.contrib.admin
23 django_openid_auth22 django_openid_auth
24 django_configglue23 django_configglue
2524
=== modified file 'django_project/urls.py'
--- django_project/urls.py 2011-06-20 22:03:17 +0000
+++ django_project/urls.py 2011-07-05 16:12:34 +0000
@@ -16,7 +16,6 @@
16# along with this program. If not, see <http://www.gnu.org/licenses/>.16# along with this program. If not, see <http://www.gnu.org/licenses/>.
1717
18import preflight18import preflight
19import adminaudit
20from django.conf.urls.defaults import patterns, include, url19from django.conf.urls.defaults import patterns, include, url
21from django.conf import settings20from django.conf import settings
22from django.contrib import admin21from django.contrib import admin
@@ -24,7 +23,6 @@
2423
25admin.autodiscover()24admin.autodiscover()
26preflight.autodiscover()25preflight.autodiscover()
27adminaudit.audit_install()
2826
29urlpatterns = patterns('',27urlpatterns = patterns('',
30 url(r'^cat/', include('webcatalog.urls')),28 url(r'^cat/', include('webcatalog.urls')),
3129
=== modified file 'fabtasks/bootstrap.py'
--- fabtasks/bootstrap.py 2011-07-01 15:36:47 +0000
+++ fabtasks/bootstrap.py 2011-07-05 16:12:34 +0000
@@ -106,12 +106,6 @@
106106
107def pull_required_branches():107def pull_required_branches():
108 _get_or_pull_bzr_branch(108 _get_or_pull_bzr_branch(
109 "lp:django-adminaudit",
110 "django-adminaudit")
111 _symlink(
112 "branches/django-adminaudit/adminaudit",
113 "django_project/adminaudit")
114 _get_or_pull_bzr_branch(
115 "lp:~django-openid-auth/django-openid-auth/trunk",109 "lp:~django-openid-auth/django-openid-auth/trunk",
116 "django-openid-auth",110 "django-openid-auth",
117 revision=79)111 revision=79)
@@ -130,6 +124,6 @@
130 local("rm -rf virtualenv/")124 local("rm -rf virtualenv/")
131 local("rm -rf src/ubuntu_webcatalog.egg-info")125 local("rm -rf src/ubuntu_webcatalog.egg-info")
132 local("rm -f webcatalog.db")126 local("rm -f webcatalog.db")
133 links = ("adminaudit", "django_openid_auth")127 links = ("django_openid_auth", )
134 for link in links:128 for link in links:
135 local("rm -f django_project/{0}".format(link))129 local("rm -f django_project/{0}".format(link))
136130
=== modified file 'src/webcatalog/schema.py'
--- src/webcatalog/schema.py 2011-06-28 15:03:12 +0000
+++ src/webcatalog/schema.py 2011-07-05 16:12:34 +0000
@@ -60,9 +60,3 @@
60 preflight = ConfigSection()60 preflight = ConfigSection()
61 preflight.preflight_base_template = StringConfigOption(61 preflight.preflight_base_template = StringConfigOption(
62 default="webcatalog/base.html")62 default="webcatalog/base.html")
63
64 #adminaudit
65 adminaudit_emails_recipients = LinesConfigOption(
66 item=StringConfigOption())
67 adminaudit_summary_subject = StringConfigOption(
68 default='Admin Audit Summary')

Subscribers

People subscribed via source and target branches