From 706152de89a8c64ebbfb6d91bcafe7a8616f4cef Mon Sep 17 00:00:00 2001 From: eliott Date: Sat, 29 Dec 2007 18:21:10 -0800 Subject: [PATCH] Moved some things around. --- {public => devel}/models.py | 4 ++++ {public => devel}/templatetags/__init__.py | 0 {public => devel}/templatetags/validation.py | 0 devel/views.py | 4 ++-- public/views.py | 2 +- settings.py | 2 +- 6 files changed, 8 insertions(+), 4 deletions(-) rename {public => devel}/models.py (95%) rename {public => devel}/templatetags/__init__.py (100%) rename {public => devel}/templatetags/validation.py (100%) diff --git a/public/models.py b/devel/models.py similarity index 95% rename from public/models.py rename to 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 similarity index 100% rename from public/templatetags/__init__.py rename to devel/templatetags/__init__.py diff --git a/public/templatetags/validation.py b/devel/templatetags/validation.py similarity index 100% rename from public/templatetags/validation.py rename to 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.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 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 @@ # 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',