# HG changeset patch # User nishanth # Date 1265292243 -19800 # Node ID 3ad980fc23ca9e4280d6501f7aff65ee1dec5f52 # Parent 12ca78ff63e4bb980abf9243ccfea31c0b3d46ff removed views.py from taskapp and created a package views. added auth_profile setting to settings.py diff -r 12ca78ff63e4 -r 3ad980fc23ca settings.py --- a/settings.py Sun Jan 24 19:15:28 2010 +0530 +++ b/settings.py Thu Feb 04 19:34:03 2010 +0530 @@ -10,7 +10,7 @@ MANAGERS = ADMINS DATABASE_ENGINE = 'sqlite3' # 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' or 'oracle'. -DATABASE_NAME = '../pytaskDb' # Or path to database file if using sqlite3. +DATABASE_NAME = '../../pytask.db' # Or path to database file if using sqlite3. DATABASE_USER = '' # Not used with sqlite3. DATABASE_PASSWORD = '' # Not used with sqlite3. DATABASE_HOST = '' # Set to empty string for localhost. Not used with sqlite3. @@ -48,7 +48,7 @@ ADMIN_MEDIA_PREFIX = '/media/' # Make this unique, and don't share it with anybody. -SECRET_KEY = '@7p-w6$99)@&+sp024%is8i=4#62q8*y0xx=5e_z*4h3%@#7u)' +SECRET_KEY = '#7bo8^p1gc=$85gv09z5d_d9-8xk1p=me7_c^3ito@jjth6^^w' # List of callables that know how to import templates from various sources. TEMPLATE_LOADERS = ( @@ -69,6 +69,7 @@ # Put strings here, like "/home/html/django_templates" or "C:/www/django/templates". # Always use forward slashes, even on Windows. # Don't forget to use absolute paths, not relative paths. + './templates', ) INSTALLED_APPS = ( @@ -79,3 +80,5 @@ 'django.contrib.admin', 'pytask.taskapp', ) + +AUTH_PROFILE_MODULE = 'taskapp.models.Profile' diff -r 12ca78ff63e4 -r 3ad980fc23ca taskapp/admin.py --- a/taskapp/admin.py Sun Jan 24 19:15:28 2010 +0530 +++ b/taskapp/admin.py Thu Feb 04 19:34:03 2010 +0530 @@ -1,7 +1,11 @@ -from pytask.taskapp.models import Person,Task,Comment,Credit from django.contrib import admin -admin.site.register(Person) +from pytask.taskapp.models.user import Profile +from pytask.taskapp.models.task import Task +from pytask.taskapp.models.credit import Credit +from pytask.taskapp.models.comment import Comment + +admin.site.register(Profile) admin.site.register(Task) admin.site.register(Comment) admin.site.register(Credit) diff -r 12ca78ff63e4 -r 3ad980fc23ca taskapp/models.py --- a/taskapp/models.py Sun Jan 24 19:15:28 2010 +0530 +++ b/taskapp/models.py Thu Feb 04 19:34:03 2010 +0530 @@ -6,37 +6,38 @@ ("AD", "Admin"), ("MN", "Manager"), ("DV", "Developer"), - ("MT", "Mentor"), - ("CT", "Contributor"), - ("GP", "Public"),) + ("CT", "Contributor"),) STATUS_CHOICES = ( ("OP", "Open"), + ("LO", "Locked"), ("CL", "Claimed"), - ("LO", "Locked"), - ("AS", "Assigned"),) + ("AS", "Assigned"), + ("RO", "Reopened"), + ("CD", "Closed"), + ("DL", "Deleted"), + ("CM", "Completed")) IMAGES_DIR = "./images" UPLOADS_DIR = "./uploads" -class Person(models.Model): -#class Person(User): +class Profile(models.Model): user = models.ForeignKey(User, unique = True) aboutme = models.TextField() - DOB = models.DateField() + dob = models.DateField() gender = models.CharField(max_length = 1, choices = GENDER_CHOICES) rights = models.CharField(max_length = 2, choices = RIGHTS_CHOICES) credits = models.PositiveSmallIntegerField() foss_comm = models.CharField(max_length = 80, blank = True) - phoneNum = models.CharField(max_length = 15, blank = True) + phonenum = models.CharField(max_length = 15, blank = True) homepage = models.URLField(blank = True) street = models.CharField(max_length = 80, blank = True) city = models.CharField(max_length = 25, blank = True) country = models.CharField(max_length = 25, blank = True) nick = models.CharField(max_length = 20, blank = True) - photo = models.ImageField(upload_to = IMAGES_DIR, blank = True) +# photo = models.ImageField(upload_to = IMAGES_DIR, blank = True) def __unicode__(self): return unicode(self.user.username) @@ -49,18 +50,18 @@ status = models.CharField(max_length = 2, choices = STATUS_CHOICES) tags = models.CharField(max_length = 200, blank = True) - parents = models.ManyToManyField('self', blank = True, related_name = "%(class)s_parents") + subs = models.ManyToManyField('self', blank = True, related_name = "%(class)s_parents") deps = models.ManyToManyField('self', blank = True, related_name = "%(class)s_deps") credits = models.PositiveSmallIntegerField() progress = models.PositiveSmallIntegerField() - mentors = models.ManyToManyField('Person', related_name = "%(class)s_mentors") - created_by = models.ForeignKey('Person', related_name = "%(class)s_created_by") - claimed_users = models.ManyToManyField('Person', blank = True, related_name = "%(class)s_claimed_users") - assigned_users = models.ManyToManyField('Person', blank = True, related_name = "%(class)s_assigned_users") + mentors = models.ManyToManyField(User, related_name = "%(class)s_mentors") + created_by = models.ForeignKey(User, related_name = "%(class)s_created_by") + claimed_users = models.ManyToManyField(User, blank = True, related_name = "%(class)s_claimed_users") + assigned_users = models.ManyToManyField(User, blank = True, related_name = "%(class)s_assigned_users") - creation_date = models.DateField() + creation_datetime = models.DateTimeField() ## not yet decided if attribs after this are to be included ## tasktype = "" ## "bugfix"/"enhancement" @@ -73,11 +74,11 @@ task = models.ForeignKey('Task') data = models.TextField() - created_by = models.ForeignKey('Person', related_name = "%(class)s_created_by") - deleted_by = models.ForeignKey('Person', null = True, blank = True, related_name = "%(class)s_deleted_by") - creation_date = models.DateField() - deleted = models.BooleanField() - attachment = models.FileField(upload_to = UPLOADS_DIR, blank = True) + created_by = models.ForeignKey(User, related_name = "%(class)s_created_by") + creation_datetime = models.DateTimeField() +# deleted_by = models.ForeignKey(User, null = True, blank = True, related_name = "%(class)s_deleted_by") +# deleted = models.BooleanField() +# attachment = models.FileField(upload_to = UPLOADS_DIR, blank = True) def __unicode__(self): return unicode(self.task.title) @@ -85,9 +86,10 @@ class Credit(models.Model): task = models.ForeignKey('Task') - given_by = models.ForeignKey('Person', related_name = "%(class)s_given_by") - given_to = models.ForeignKey('Person', related_name = "%(class)s_given_to") + given_by = models.ForeignKey(User, related_name = "%(class)s_given_by") + given_to = models.ForeignKey(User, related_name = "%(class)s_given_to") points = models.PositiveSmallIntegerField() + given_time = models.DateTimeField() def __unicode__(self): return unicode(self.task.title) diff -r 12ca78ff63e4 -r 3ad980fc23ca taskapp/views.py --- a/taskapp/views.py Sun Jan 24 19:15:28 2010 +0530 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -# Create your views here. diff -r 12ca78ff63e4 -r 3ad980fc23ca taskapp/views/__init__.py --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/taskapp/views/__init__.py Thu Feb 04 19:34:03 2010 +0530 @@ -0,0 +1,1 @@ + diff -r 12ca78ff63e4 -r 3ad980fc23ca taskapp/views/tasks.py diff -r 12ca78ff63e4 -r 3ad980fc23ca taskapp/views/users.py --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/taskapp/views/users.py Thu Feb 04 19:34:03 2010 +0530 @@ -0,0 +1,1 @@ + diff -r 12ca78ff63e4 -r 3ad980fc23ca urls.py --- a/urls.py Sun Jan 24 19:15:28 2010 +0530 +++ b/urls.py Thu Feb 04 19:34:03 2010 +0530 @@ -11,7 +11,7 @@ # Uncomment the admin/doc line below and add 'django.contrib.admindocs' # to INSTALLED_APPS to enable admin documentation: # (r'^admin/doc/', include('django.contrib.admindocs.urls')), + + (r'^admin/', include(admin.site.urls)), - # Uncomment the next line to enable the admin: - (r'^admin/', include(admin.site.urls)), )