taiga
/
taiga-back
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Now working the custom user

remotes/origin/enhancement/email-actions
Jesús Espino 2013-03-27 19:10:01 +01:00
parent d349baa4f0
commit 79c0630c3f
7 changed files with 25 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
greenmine/base/fixtures/initial_data.json
View File

@ -1,7 +1,7 @@
[
{
"pk": 1,
"model": "profile.role",
"model": "base.role",
"fields": {
"name": "Developer",
"slug": "developer"
@ -9,7 +9,7 @@
},
{
"pk": 2,
"model": "profile.role",
"model": "base.role",
"fields": {
"name": "Product Owner",
"slug": "product-owner"
@ -17,7 +17,7 @@
},
{
"pk": 3,
"model": "profile.role",
"model": "base.role",
"fields": {
"name": "Observer",
"slug": "observer"

2
greenmine/base/models.py
View File

@ -60,7 +60,7 @@ class User(AbstractUser):
token = models.CharField(max_length=200, unique=True, null=True,
blank=True, default=None)
colorize_tags = models.BooleanField(default=False)
objects = UserManager
objects = UserManager()
class Role(models.Model):
name = models.CharField(max_length=200)

2
greenmine/documents/models.py
View File

@ -15,7 +15,7 @@ class Document(models.Model):
modified_date = models.DateTimeField(auto_now_add=True)
project = models.ForeignKey('scrum.Project', related_name='documents')
owner = models.ForeignKey('auth.User', related_name='documents')
owner = models.ForeignKey('base.User', related_name='documents')
attached_file = models.FileField(upload_to="documents", max_length=1000,
null=True, blank=True)
tags = DictField()

8
greenmine/questions/models.py
View File

@ -16,12 +16,12 @@ class Question(models.Model):
milestone = models.ForeignKey('scrum.Milestone', related_name='questions',
null=True, default=None, blank=True)
assigned_to = models.ForeignKey("auth.User")
assigned_to = models.ForeignKey("base.User")
created_date = models.DateTimeField(auto_now_add=True)
modified_date = models.DateTimeField(auto_now_add=True)
owner = models.ForeignKey('auth.User', related_name='questions')
owner = models.ForeignKey('base.User', related_name='questions')
watchers = models.ManyToManyField('auth.User',
watchers = models.ManyToManyField('base.User',
related_name='question_watch', null=True,
blank=True)
tags = DictField()
@ -40,5 +40,5 @@ class QuestionResponse(models.Model):
null=True, blank=True)
question = models.ForeignKey('Question', related_name='responses')
owner = models.ForeignKey('auth.User', related_name='questions_responses')
owner = models.ForeignKey('base.User', related_name='questions_responses')
tags = DictField()

25
greenmine/scrum/models.py
View File

@ -9,7 +9,6 @@ from django.utils import timezone
from django.dispatch import receiver
from django.contrib.contenttypes.models import ContentType
from django.contrib.contenttypes import generic
from django.contrib.auth.models import User
from picklefield.fields import PickledObjectField
@ -118,7 +117,7 @@ class Project(models.Model):
created_date = models.DateTimeField(auto_now_add=True)
modified_date = models.DateTimeField(auto_now_add=True, auto_now=True)
owner = models.ForeignKey("auth.User", related_name="projects")
owner = models.ForeignKey("base.User", related_name="projects")
public = models.BooleanField(default=True)
last_us_ref = models.BigIntegerField(null=True, default=1)
@ -195,7 +194,7 @@ class Milestone(models.Model):
uuid = models.CharField(max_length=40, unique=True, blank=True)
name = models.CharField(max_length=200, db_index=True)
slug = models.SlugField(max_length=250, unique=True, blank=True)
owner = models.ForeignKey('auth.User', related_name="milestones")
owner = models.ForeignKey('base.User', related_name="milestones")
project = models.ForeignKey('Project', related_name="milestones")
estimated_start = models.DateField(null=True, default=None)
@ -243,7 +242,7 @@ class UserStory(models.Model):
related_name="user_stories", null=True,
default=None)
project = models.ForeignKey("Project", related_name="user_stories")
owner = models.ForeignKey("auth.User", null=True, default=None,
owner = models.ForeignKey("base.User", null=True, default=None,
related_name="user_stories")
status = models.ForeignKey("UserStoryStatus", related_name="userstories", default=1)
@ -257,7 +256,7 @@ class UserStory(models.Model):
subject = models.CharField(max_length=500)
description = models.TextField()
watchers = models.ManyToManyField('auth.User', related_name='us_watch', null=True)
watchers = models.ManyToManyField('base.User', related_name='us_watch', null=True)
client_requirement = models.BooleanField(default=False)
team_requirement = models.BooleanField(default=False)
@ -282,7 +281,7 @@ class UserStory(models.Model):
class Change(models.Model):
change_type = models.IntegerField(choices=TASK_CHANGE_CHOICES)
owner = models.ForeignKey('auth.User', related_name='changes')
owner = models.ForeignKey('base.User', related_name='changes')
created_date = models.DateTimeField(auto_now_add=True)
project = models.ForeignKey("Project", related_name="changes")
@ -297,7 +296,7 @@ class Change(models.Model):
class ChangeAttachment(models.Model):
change = models.ForeignKey("Change", related_name="attachments")
owner = models.ForeignKey("auth.User", related_name="change_attachments")
owner = models.ForeignKey("base.User", related_name="change_attachments")
created_date = models.DateTimeField(auto_now_add=True)
attached_file = models.FileField(upload_to="files/msg", max_length=500,
@ -309,7 +308,7 @@ class Task(models.Model):
uuid = models.CharField(max_length=40, unique=True, blank=True)
user_story = models.ForeignKey('UserStory', related_name='tasks')
ref = models.BigIntegerField(db_index=True, null=True, default=None)
owner = models.ForeignKey("auth.User", null=True, default=None,
owner = models.ForeignKey("base.User", null=True, default=None,
related_name="tasks")
severity = models.ForeignKey("Severity", related_name="tasks")
@ -326,11 +325,11 @@ class Task(models.Model):
subject = models.CharField(max_length=500)
description = models.TextField(blank=True)
assigned_to = models.ForeignKey('auth.User',
assigned_to = models.ForeignKey('base.User',
related_name='user_storys_assigned_to_me',
blank=True, null=True, default=None)
watchers = models.ManyToManyField('auth.User', related_name='task_watch',
watchers = models.ManyToManyField('base.User', related_name='task_watch',
null=True)
changes = generic.GenericRelation(Change)
@ -355,7 +354,7 @@ class Task(models.Model):
class Issue(models.Model):
uuid = models.CharField(max_length=40, unique=True, blank=True)
ref = models.BigIntegerField(db_index=True, null=True, default=None)
owner = models.ForeignKey("auth.User", null=True, default=None,
owner = models.ForeignKey("base.User", null=True, default=None,
related_name="issues")
severity = models.ForeignKey("Severity", related_name="issues")
@ -373,11 +372,11 @@ class Issue(models.Model):
subject = models.CharField(max_length=500)
description = models.TextField(blank=True)
assigned_to = models.ForeignKey('auth.User',
assigned_to = models.ForeignKey('base.User',
related_name='issues_assigned_to_me',
blank=True, null=True, default=None)
watchers = models.ManyToManyField('auth.User', related_name='issue_watch',
watchers = models.ManyToManyField('base.User', related_name='issue_watch',
null=True)
changes = generic.GenericRelation(Change)

2
greenmine/settings/common.py
View File

@ -291,7 +291,7 @@ LOGGING = {
}
AUTH_USER_MODEL = 'greenmine.base.User'
AUTH_USER_MODEL = 'base.User'
FORMAT_MODULE_PATH = 'greenmine.base.formats'
DATE_INPUT_FORMATS = (
'%Y-%m-%d', '%m/%d/%Y', '%d/%m/%Y', '%b %d %Y',

6
greenmine/wiki/models.py
View File

@ -7,9 +7,9 @@ class WikiPage(models.Model):
project = models.ForeignKey('scrum.Project', related_name='wiki_pages')
slug = models.SlugField(max_length=500, db_index=True)
content = models.TextField(blank=False, null=True)
owner = models.ForeignKey("auth.User", related_name="wiki_pages", null=True)
owner = models.ForeignKey("base.User", related_name="wiki_pages", null=True)
watchers = models.ManyToManyField('auth.User',
watchers = models.ManyToManyField('base.User',
related_name='wikipage_watchers',
null=True)
@ -19,7 +19,7 @@ class WikiPage(models.Model):
class WikiPageAttachment(models.Model):
wikipage = models.ForeignKey('WikiPage', related_name='attachments')
owner = models.ForeignKey("auth.User", related_name="wikifiles")
owner = models.ForeignKey("base.User", related_name="wikifiles")
created_date = models.DateTimeField(auto_now_add=True)
modified_date = models.DateTimeField(auto_now_add=True)
attached_file = models.FileField(upload_to="files/wiki", max_length=500,