Sync with local modifications

This commit is contained in:
2010-02-24 16:05:00 +00:00
committed by root
parent f68e2be1f9
commit b6168ae824
3 changed files with 10 additions and 13 deletions

View File

@@ -9,10 +9,10 @@ ADMINS = (
MANAGERS = ADMINS MANAGERS = ADMINS
DATABASE_ENGINE = 'sqlite3' # 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' or 'oracle'. DATABASE_ENGINE = 'mysql' # 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' or 'oracle'.
DATABASE_NAME = '/home/dreddit/www/login.dredd.it/login.db3' # Or path to database file if using sqlite3. DATABASE_NAME = 'dreddit_sso' # Or path to database file if using sqlite3.
DATABASE_USER = '' # Not used with sqlite3. DATABASE_USER = 'dreddit_sso' # Not used with sqlite3.
DATABASE_PASSWORD = '' # Not used with sqlite3. DATABASE_PASSWORD = 'bf6431670c657b9b62f08353d61047c4552ed3d4' # Not used with sqlite3.
DATABASE_HOST = '' # Set to empty string for localhost. Not used with sqlite3. DATABASE_HOST = '' # Set to empty string for localhost. Not used with sqlite3.
DATABASE_PORT = '' # Set to empty string for default. Not used with sqlite3. DATABASE_PORT = '' # Set to empty string for default. Not used with sqlite3.
@@ -72,6 +72,7 @@ TEMPLATE_DIRS = (
) )
INSTALLED_APPS = ( INSTALLED_APPS = (
'django.contrib.admin',
'django.contrib.auth', 'django.contrib.auth',
'django.contrib.contenttypes', 'django.contrib.contenttypes',
'django.contrib.sessions', 'django.contrib.sessions',

View File

@@ -1,18 +1,14 @@
from django.db import models from django.db import models
from django.contrib.auth.models import User from django.contrib.auth.models import User
from eve_api.models.api_player import EVEAccount
class UserProfile(User): class Service(models.Model):
eveaccount = models.ForeignKey(EVEAccount)
class Site(models.Model):
url = models.CharField(max_length=200) url = models.CharField(max_length=200)
active = models.BooleanField() active = models.BooleanField()
api = models.CharField(max_length=200) api = models.CharField(max_length=200)
class SiteAccount(models.Model): class ServiceAccount(models.Model):
user = models.ForeignKey(UserProfile) user = models.ForeignKey(User)
site = models.ForeignKey(Site) service = models.ForeignKey(Service)
username = models.CharField(max_length=200) username = models.CharField(max_length=200)
active = models.BooleanField() active = models.BooleanField()

View File

@@ -5,7 +5,7 @@ from django.contrib import admin
admin.autodiscover() admin.autodiscover()
urlpatterns = patterns('', urlpatterns = patterns('',
(r'^login/', include('django.contrib.auth.views.login')), #(r'^login/', include('django.contrib.auth.views.login')),
(r'^admin/', include(admin.site.urls)), (r'^admin/', include(admin.site.urls)),
) )