summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoreliott <eliott@cactuswax.net>2007-12-29 18:21:10 -0800
committereliott <eliott@cactuswax.net>2007-12-29 18:21:10 -0800
commit706152de89a8c64ebbfb6d91bcafe7a8616f4cef (patch)
tree619feb7b8fd09eef6e05ec5662d846461de269ec
parent89659cef5f309d7eb6bc6ca3d4ab84b779c6728d (diff)
downloadarchweb-706152de89a8c64ebbfb6d91bcafe7a8616f4cef.tar.gz
archweb-706152de89a8c64ebbfb6d91bcafe7a8616f4cef.zip
Moved some things around.
-rw-r--r--devel/models.py (renamed from public/models.py)4
-rw-r--r--devel/templatetags/__init__.py (renamed from public/templatetags/__init__.py)0
-rw-r--r--devel/templatetags/validation.py (renamed from public/templatetags/validation.py)0
-rw-r--r--devel/views.py4
-rw-r--r--public/views.py2
-rw-r--r--settings.py2
6 files changed, 8 insertions, 4 deletions
diff --git a/public/models.py b/devel/models.py
index 79afb6f8..d78989f5 100644
--- a/public/models.py
+++ b/devel/models.py
@@ -10,6 +10,8 @@ class Mirror(models.Model):
admin_email = models.CharField(maxlength=255, null=True, blank=True)
def __str__(self):
return self.domain
+ class Meta:
+ db_table = 'common_mirror'
class Admin:
list_display = ('domain', 'country')
list_filter = ('country',)
@@ -22,6 +24,8 @@ class Donator(models.Model):
name = models.CharField(maxlength=255)
def __str__(self):
return self.name
+ class Meta:
+ db_table = 'common_donator'
class Admin:
ordering = ['name']
search_fields = ('name')
diff --git a/public/templatetags/__init__.py b/devel/templatetags/__init__.py
index e69de29b..e69de29b 100644
--- a/public/templatetags/__init__.py
+++ b/devel/templatetags/__init__.py
diff --git a/public/templatetags/validation.py b/devel/templatetags/validation.py
index 38a40531..38a40531 100644
--- a/public/templatetags/validation.py
+++ b/devel/templatetags/validation.py
diff --git a/devel/views.py b/devel/views.py
index c2cdb706..19a7cdfd 100644
--- a/devel/views.py
+++ b/devel/views.py
@@ -6,8 +6,8 @@ from archweb_dev.lib.utils import render_response
from archweb_dev.packages.models import Package
from archweb_dev.todolists.models import Todolist, TodolistPkg
from archweb_dev.settings import DATA_DIR
-from archweb_dev.utils import validate
-from archweb_dev.public.models import UserProfile
+from archweb_dev.lib.utils import validate
+from archweb_dev.devel.models import UserProfile
@login_required
def index(request):
diff --git a/public/views.py b/public/views.py
index 9c41ece8..18f0c983 100644
--- a/public/views.py
+++ b/public/views.py
@@ -4,7 +4,7 @@ from django.contrib.auth.models import User
from archweb_dev.packages.models import Package, Repo
from archweb_dev.news.models import News
from archweb_dev.settings import DATA_DIR
-from archweb_dev.public.models import Donator, Mirror
+from archweb_dev.devel.models import Donator, Mirror
def index(request):
# get the most recent 10 news items
diff --git a/settings.py b/settings.py
index 4f50cd3a..8f170b6c 100644
--- a/settings.py
+++ b/settings.py
@@ -75,7 +75,7 @@ TEMPLATE_DIRS = (
# Set django's User stuff to use our profile model
# format is app.model
-AUTH_PROFILE_MODULE = 'public.UserProfile'
+AUTH_PROFILE_MODULE = 'devel.UserProfile'
INSTALLED_APPS = (
'django.contrib.auth',