Rename planetadmin schema and module to admin, to work with new

project name (Selenas fault)

diff --git a/planetadmin/__init__.py b/admin/__init__.py
similarity index 100%
rename from planetadmin/__init__.py
rename to admin/__init__.py

diff --git a/planetadmin/planetadmin.wsgi b/admin/admin.wsgi
similarity index 62%
rename from planetadmin/planetadmin.wsgi
rename to admin/admin.wsgi
index d0f1c917902f82d356a91cae20523e7810dcf794..67e7d9cc828b44ec0a5a465c53126c9b5c637f08 100644 (file)
--- a/planetadmin/planetadmin.wsgi
+++ b/admin/admin.wsgi
@@ -1,6 +1,6 @@
 import os, sys
 
-os.environ['DJANGO_SETTINGS_MODULE'] = 'planetadmin.settings'
+os.environ['DJANGO_SETTINGS_MODULE'] = 'admin.settings'
 
 import django.core.handlers.wsgi
 application = django.core.handlers.wsgi.WSGIHandler()

diff --git a/planetadmin/auth.py b/admin/auth.py
similarity index 100%
rename from planetadmin/auth.py
rename to admin/auth.py

diff --git a/planetadmin/exceptions.py b/admin/exceptions.py
similarity index 100%
rename from planetadmin/exceptions.py
rename to admin/exceptions.py

diff --git a/planetadmin/local_settings.py.sample b/admin/local_settings.py.sample
similarity index 86%
rename from planetadmin/local_settings.py.sample
rename to admin/local_settings.py.sample
index 304ad43ab978085a2a23e8d4e66b5d7ee181672a..a4bbe1c0b35a29b86ce33cbe3b08d6618da94319 100644 (file)
--- a/planetadmin/local_settings.py.sample
+++ b/admin/local_settings.py.sample
@@ -1,7 +1,7 @@
 # Add any settings here to override the default ones
 
 DATABASE_NAME = 'planetbeta'
-DATABASE_USER = 'planetadmin'
+DATABASE_USER = 'admin'
 
 DEBUG = True
 

diff --git a/planetadmin/manage.py b/admin/manage.py
similarity index 100%
rename from planetadmin/manage.py
rename to admin/manage.py

diff --git a/planetadmin/register/__init__.py b/admin/register/__init__.py
similarity index 100%
rename from planetadmin/register/__init__.py
rename to admin/register/__init__.py

diff --git a/planetadmin/register/models.py b/admin/register/models.py
similarity index 97%
rename from planetadmin/register/models.py
rename to admin/register/models.py
index 50858d562259a4d4e368427f34f231342a32b6a3..b5dfbc8e0ffaff7832b503ead6bb2ff4f2a09199 100644 (file)
--- a/planetadmin/register/models.py
+++ b/admin/register/models.py
@@ -61,7 +61,7 @@ class AuditEntry(models.Model):
                return "%s (%s): %s" % (self.logtime, self.user, self.logtxt)
 
        class Meta:
-               db_table = 'planetadmin\".\"auditlog'
+               db_table = 'admin\".\"auditlog'
                ordering = ['logtime']
                
 class AggregatorLog(models.Model):

diff --git a/planetadmin/register/templates/404.html b/admin/register/templates/404.html
similarity index 100%
rename from planetadmin/register/templates/404.html
rename to admin/register/templates/404.html

diff --git a/planetadmin/register/templates/500.html b/admin/register/templates/500.html
similarity index 100%
rename from planetadmin/register/templates/500.html
rename to admin/register/templates/500.html

diff --git a/planetadmin/register/templates/aggregatorlog.html b/admin/register/templates/aggregatorlog.html
similarity index 100%
rename from planetadmin/register/templates/aggregatorlog.html
rename to admin/register/templates/aggregatorlog.html

diff --git a/planetadmin/register/templates/blogposts.html b/admin/register/templates/blogposts.html
similarity index 100%
rename from planetadmin/register/templates/blogposts.html
rename to admin/register/templates/blogposts.html

diff --git a/planetadmin/register/templates/index.html b/admin/register/templates/index.html
similarity index 100%
rename from planetadmin/register/templates/index.html
rename to admin/register/templates/index.html

diff --git a/planetadmin/register/templates/internal_error.html b/admin/register/templates/internal_error.html
similarity index 100%
rename from planetadmin/register/templates/internal_error.html
rename to admin/register/templates/internal_error.html

diff --git a/planetadmin/register/templates/regbase.html b/admin/register/templates/regbase.html
similarity index 100%
rename from planetadmin/register/templates/regbase.html
rename to admin/register/templates/regbase.html

diff --git a/planetadmin/register/templates/registration/login.html b/admin/register/templates/registration/login.html
similarity index 100%
rename from planetadmin/register/templates/registration/login.html
rename to admin/register/templates/registration/login.html

diff --git a/admin/register/urls.py b/admin/register/urls.py
new file mode 100644 (file)
index 0000000..7f01800
--- /dev/null
+++ b/admin/register/urls.py
@@ -0,0 +1,28 @@
+from django.conf.urls.defaults import *
+from django.contrib.auth.views import login, logout, logout_then_login
+
+# Uncomment the next two lines to enable the admin:
+# from django.contrib import admin
+# admin.autodiscover()
+
+urlpatterns = patterns('',
+    (r'^$', 'admin.register.views.root'),
+    (r'^new/$', 'admin.register.views.new'),
+    (r'^approve/(\d+)/$', 'admin.register.views.approve'),
+    (r'^unapprove/(\d+)/$', 'admin.register.views.unapprove'),
+    (r'^discover/(\d+)/$', 'admin.register.views.discover'),
+    (r'^undiscover/(\d+)/$', 'admin.register.views.undiscover'),
+    (r'^detach/(\d+)/$', 'admin.register.views.detach'),
+    (r'^delete/(\d+)/$', 'admin.register.views.delete'),
+    (r'^modify/(\d+)/$', 'admin.register.views.modify'),
+    (r'^modifyauthorfilter/(\d+)/$', 'admin.register.views.modifyauthorfilter'),
+
+    (r'^log/(\d+)/$','admin.register.views.logview'),
+    (r'^blogposts/(\d+)/$', 'admin.register.views.blogposts'),
+    (r'^blogposts/(\d+)/hide/(\d+)/$', 'admin.register.views.blogpost_hide'),
+    (r'^blogposts/(\d+)/unhide/(\d+)/$', 'admin.register.views.blogpost_unhide'),
+    (r'^blogposts/(\d+)/delete/(\d+)/$', 'admin.register.views.blogpost_delete'),
+
+    (r'^login/$', login),
+    (r'^logout/$', logout_then_login, {'login_url':'/'}),
+)

diff --git a/planetadmin/register/views.py b/admin/register/views.py
similarity index 99%
rename from planetadmin/register/views.py
rename to admin/register/views.py
index 1ec8537b0e66f8a08976062629e3b46c673cd900..3efd77fa71a4e276ca79e5a12f996371c5c659b5 100644 (file)
--- a/planetadmin/register/views.py
+++ b/admin/register/views.py
@@ -6,8 +6,8 @@ from django.conf import settings
 from django.core.mail import send_mail
 from django.db import transaction
 
-from planetadmin.register.models import *
-from planetadmin.exceptions import pExcept
+from admin.register.models import *
+from admin.exceptions import pExcept
 
 import socket
 import feedparser

diff --git a/planetadmin/settings.py b/admin/settings.py
similarity index 85%
rename from planetadmin/settings.py
rename to admin/settings.py
index a5e77601cf4f822d4750133293a8aeef189954e4..1a9a8b529141fbb9f575a0a42aaf72ed0ff0f938 100644 (file)
--- a/planetadmin/settings.py
+++ b/admin/settings.py
@@ -1,4 +1,4 @@
-# Django settings for planetadmin project.
+# Django settings for admin project.
 
 DEBUG = False
 
@@ -10,7 +10,7 @@ MANAGERS = ADMINS
 
 DATABASE_ENGINE = 'postgresql_psycopg2'           # 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' or 'oracle'.
 DATABASE_NAME = 'planetbeta'             # Or path to database file if using sqlite3.
-DATABASE_USER = 'planetadmin'             # Not used with sqlite3.
+DATABASE_USER = 'admin'             # Not used with sqlite3.
 DATABASE_PASSWORD = ''         # Not used with sqlite3.
 DATABASE_HOST = '/tmp'             # Set to empty string for localhost. Not used with sqlite3.
 DATABASE_PORT = ''             # Set to empty string for default. Not used with sqlite3.
@@ -38,10 +38,10 @@ MIDDLEWARE_CLASSES = (
     'django.middleware.common.CommonMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',
     'django.contrib.auth.middleware.AuthenticationMiddleware',
-    'planetadmin.exceptions.PlanetExceptionMiddleware',
+    'admin.exceptions.PlanetExceptionMiddleware',
 )
 
-ROOT_URLCONF = 'planetadmin.urls'
+ROOT_URLCONF = 'admin.urls'
 
 TEMPLATE_DIRS = (
     # Refer back to main planet templates
@@ -53,11 +53,11 @@ INSTALLED_APPS = (
     'django.contrib.contenttypes',
     'django.contrib.sessions',
     'django.contrib.sites',
-    'planetadmin.register',
+    'admin.register',
 )
 
 AUTHENTICATION_BACKENDS = (
-    'planetadmin.auth.AuthBackend',
+    'admin.auth.AuthBackend',
 )
 
 LOGIN_URL = '/register/login'

diff --git a/planetadmin/urls.py b/admin/urls.py
similarity index 76%
rename from planetadmin/urls.py
rename to admin/urls.py
index e6a8834b0925a8e854395b1baef751a14c469964..1576e13011f225bc6334395a0f61e5a8ee9970b0 100644 (file)
--- a/planetadmin/urls.py
+++ b/admin/urls.py
@@ -6,5 +6,5 @@ from django.conf.urls.defaults import *
 
 urlpatterns = patterns('',
     # Example:
-    (r'^register/', include('planetadmin.register.urls')),
+    (r'^register/', include('admin.register.urls')),
 )

diff --git a/listsync.py b/listsync.py
index 7e7952e9d16186735eecf80f217a72f02a7db31f..d29c7e702f63520505c1db9492652f767bba3b21 100755 (executable)
--- a/listsync.py
+++ b/listsync.py
@@ -144,8 +144,8 @@ class Synchronizer:
 
                curs = self.db.cursor()
                curs.execute("""
-SELECT email FROM planetadmin.auth_user 
-INNER JOIN planet.feeds ON planetadmin.auth_user.username=planet.feeds.userid 
+SELECT email FROM admin.auth_user 
+INNER JOIN planet.feeds ON admin.auth_user.username=planet.feeds.userid 
 WHERE planet.feeds.approved
 """)
                self.expected = set([r[0] for r in curs.fetchall()])

diff --git a/planetadmin/register/urls.py b/planetadmin/register/urls.py
deleted file mode 100644 (file)
index 1f48f6e..0000000
--- a/planetadmin/register/urls.py
+++ /dev/null
@@ -1,28 +0,0 @@
-from django.conf.urls.defaults import *
-from django.contrib.auth.views import login, logout, logout_then_login
-
-# Uncomment the next two lines to enable the admin:
-# from django.contrib import admin
-# admin.autodiscover()
-
-urlpatterns = patterns('',
-    (r'^$', 'planetadmin.register.views.root'),
-    (r'^new/$', 'planetadmin.register.views.new'),
-    (r'^approve/(\d+)/$', 'planetadmin.register.views.approve'),
-    (r'^unapprove/(\d+)/$', 'planetadmin.register.views.unapprove'),
-    (r'^discover/(\d+)/$', 'planetadmin.register.views.discover'),
-    (r'^undiscover/(\d+)/$', 'planetadmin.register.views.undiscover'),
-    (r'^detach/(\d+)/$', 'planetadmin.register.views.detach'),
-    (r'^delete/(\d+)/$', 'planetadmin.register.views.delete'),
-    (r'^modify/(\d+)/$', 'planetadmin.register.views.modify'),
-    (r'^modifyauthorfilter/(\d+)/$', 'planetadmin.register.views.modifyauthorfilter'),
-
-    (r'^log/(\d+)/$','planetadmin.register.views.logview'),
-    (r'^blogposts/(\d+)/$', 'planetadmin.register.views.blogposts'),
-    (r'^blogposts/(\d+)/hide/(\d+)/$', 'planetadmin.register.views.blogpost_hide'),
-    (r'^blogposts/(\d+)/unhide/(\d+)/$', 'planetadmin.register.views.blogpost_unhide'),
-    (r'^blogposts/(\d+)/delete/(\d+)/$', 'planetadmin.register.views.blogpost_delete'),
-
-    (r'^login/$', login),
-    (r'^logout/$', logout_then_login, {'login_url':'/'}),
-)