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

[Anthony Lenton]

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

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

We can eventually add it back in, hopefully soon.

[Ricardo Kirkner (ricardokirkner)]

LGTM

review: Approve

=== modified file '.bzrignore'
--- .bzrignore	2011-06-18 23:17:11 +0000
+++ .bzrignore	2011-07-05 16:12:34 +0000
@@ -1,7 +1,6 @@
 webcatalog.db
 src/ubuntu_webcatalog.egg-info/
 virtualenv/
-django_project/adminaudit
 django_project/django_openid_auth
 django_project/local_settings.py
 django_project/static/

=== 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 @@
  python-configglue (>> 0.9.1),
  python-django-configglue (>> 0.3),
  python-django-preflight,
- python-django-adminaudit,
  python-django-pgtools,
  python-django-south,
  python-django-openid-auth,

=== 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 @@
                  django.contrib.messages
                  django.contrib.staticfiles
                  django.contrib.markup
-                 adminaudit
                  django.contrib.admin
                  django_openid_auth
                  django_configglue

=== 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 @@
 #   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import preflight
-import adminaudit
 from django.conf.urls.defaults import patterns, include, url
 from django.conf import settings
 from django.contrib import admin
@@ -24,7 +23,6 @@
 
 admin.autodiscover()
 preflight.autodiscover()
-adminaudit.audit_install()
 
 urlpatterns = patterns('',
     url(r'^cat/', include('webcatalog.urls')),

=== 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 @@
 
 def pull_required_branches():
     _get_or_pull_bzr_branch(
-        "lp:django-adminaudit",
-        "django-adminaudit")
-    _symlink(
-        "branches/django-adminaudit/adminaudit",
-        "django_project/adminaudit")
-    _get_or_pull_bzr_branch(
         "lp:~django-openid-auth/django-openid-auth/trunk",
         "django-openid-auth",
         revision=79)
@@ -130,6 +124,6 @@
     local("rm -rf virtualenv/")
     local("rm -rf src/ubuntu_webcatalog.egg-info")
     local("rm -f webcatalog.db")
-    links = ("adminaudit", "django_openid_auth")
+    links = ("django_openid_auth", )
     for link in links:
         local("rm -f django_project/{0}".format(link))

=== 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 @@
     preflight = ConfigSection()
     preflight.preflight_base_template = StringConfigOption(
         default="webcatalog/base.html")
-
-    #adminaudit
-    adminaudit_emails_recipients = LinesConfigOption(
-        item=StringConfigOption())
-    adminaudit_summary_subject = StringConfigOption(
-        default='Admin Audit Summary')