From 3dc9a7bb1929e383c6463a4e53bb473da3c7420e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Barrag=C3=A1n=20Merino?= Date: Thu, 3 Oct 2013 11:05:07 +0200 Subject: [PATCH] Fixed the sample_data command --- greenmine/projects/choices.py | 6 +++ .../management/commands/sample_data.py | 14 ++++-- greenmine/projects/models.py | 48 +++++++++++-------- greenmine/projects/questions/choices.py | 9 ---- 4 files changed, 45 insertions(+), 32 deletions(-) delete mode 100644 greenmine/projects/questions/choices.py diff --git a/greenmine/projects/choices.py b/greenmine/projects/choices.py index 06952965..bbea85b4 100644 --- a/greenmine/projects/choices.py +++ b/greenmine/projects/choices.py @@ -59,6 +59,12 @@ ISSUE_TYPES = ( (1, _(u'Bug')), ) +QUESTION_STATUS = ( + (1, _(u"New"), False), + (2, _(u"Pending"), False), + (3, _(u"Answered"), True), +) + # TODO: pending to refactor TASK_COMMENT = 1 diff --git a/greenmine/projects/management/commands/sample_data.py b/greenmine/projects/management/commands/sample_data.py index 3e5da410..12e1c329 100644 --- a/greenmine/projects/management/commands/sample_data.py +++ b/greenmine/projects/management/commands/sample_data.py @@ -11,9 +11,15 @@ from django.utils.timezone import now from django.contrib.webdesign import lorem_ipsum -from greenmine.base.users.models import User, Role -from greenmine.scrum.models import * -from greenmine.questions.models import * +from greenmine.base.users.models import * +from greenmine.projects.models import * +from greenmine.projects.milestones.models import * +from greenmine.projects.userstories.models import * +from greenmine.projects.tasks.models import * +from greenmine.projects.issues.models import * +from greenmine.projects.questions.models import * +from greenmine.projects.documents.models import * +from greenmine.projects.wiki.models import * subjects = [ @@ -191,7 +197,7 @@ class Command(BaseCommand): owner=random.choice(self.users), public=True, total_story_points=self.sd.int(100, 150), - milestones=self.sd.int(5,10) + total_milestones=self.sd.int(5,10) ) project.save() diff --git a/greenmine/projects/models.py b/greenmine/projects/models.py index c30ad3c8..b36eeee7 100644 --- a/greenmine/projects/models.py +++ b/greenmine/projects/models.py @@ -146,6 +146,7 @@ class Project(models.Model, WatchedMixin): "user", flat=True))) def update_role_points(self): + rolepoints_model = get_model("userstories", "RolePoints") roles = self.list_roles role_ids = roles.values_list("id", flat=True) null_points = self.points.get(value=None) @@ -153,13 +154,13 @@ class Project(models.Model, WatchedMixin): for role in roles: try: sp = us.role_points.get(role=role, user_story=us) - except RolePoints.DoesNotExist: - sp = RolePoints.objects.create(role=role, + except rolepoints_model.DoesNotExist: + sp = rolepoints_model.objects.create(role=role, user_story=us, points=null_points) #Remove unnecesary Role points - rp_query = RolePoints.objects.filter(user_story__in=self.user_stories.all()) + rp_query = rolepoints_model.objects.filter(user_story__in=self.user_stories.all()) rp_query = rp_query.exclude(role__id__in=role_ids) rp_query.delete() @@ -189,31 +190,40 @@ def project_post_save(sender, instance, created, **kwargs): if not created: return + points_model = get_model("userstories", "Points") + userstorystatus_model = get_model("userstories", "UserStoryStatus") + taskstatus_model = get_model("tasks", "TaskStatus") + severity_model = get_model("issues", "Severity") + priority_model = get_model("issues", "Priority") + issuestatus_model = get_model("issues", "IssueStatus") + issuetype_model = get_model("issues", "IssueType") + questionstatus_model = get_model("questions", "QuestionStatus") + # Populate new project dependen default data for order, name in choices.PRIORITY_CHOICES: - Priority.objects.create(project=instance, name=name, order=order) + priority_model.objects.create(project=instance, name=name, order=order) for order, name in choices.SEVERITY_CHOICES: - Severity.objects.create(project=instance, name=name, order=order) + severity_model.objects.create(project=instance, name=name, order=order) for order, name, value in choices.POINTS_CHOICES: - Points.objects.create(project=instance, name=name, order=order, value=value) + points_model.objects.create(project=instance, name=name, order=order, value=value) - for order, name, is_closed in choices.USSTATUSES: - UserStoryStatus.objects.create(name=name, order=order, - is_closed=is_closed, project=instance) + for order, name, is_closed in choices.US_STATUSES: + userstorystatus_model.objects.create(name=name, order=order, + is_closed=is_closed, project=instance) - for order, name, is_closed, color in choices.TASKSTATUSES: - TaskStatus.objects.create(name=name, order=order, color=color, - is_closed=is_closed, project=instance) + for order, name, is_closed, color in choices.TASK_STATUSES: + taskstatus_model.objects.create(name=name, order=order, color=color, + is_closed=is_closed, project=instance) - for order, name, is_closed in choices.ISSUESTATUSES: - IssueStatus.objects.create(name=name, order=order, - is_closed=is_closed, project=instance) + for order, name, is_closed in choices.ISSUE_STATUSES: + issuestatus_model.objects.create(name=name, order=order, + is_closed=is_closed, project=instance) - for order, name in choices.ISSUETYPES: - IssueType.objects.create(project=instance, name=name, order=order) + for order, name in choices.ISSUE_TYPES: + issuetype_model.objects.create(project=instance, name=name, order=order) for order, name, is_closed in choices.QUESTION_STATUS: - QuestionStatus.objects.create(name=name, order=order, - is_closed=is_closed, project=instance) + questionstatus_model.objects.create(name=name, order=order, + is_closed=is_closed, project=instance) diff --git a/greenmine/projects/questions/choices.py b/greenmine/projects/questions/choices.py deleted file mode 100644 index e52b1e78..00000000 --- a/greenmine/projects/questions/choices.py +++ /dev/null @@ -1,9 +0,0 @@ -# -*- coding: utf-8 -*- - -from django.utils.translation import ugettext_lazy as _ - -QUESTION_STATUS = ( - (1, _(u"New"), False), - (2, _(u"Pending"), False), - (3, _(u"Answered"), True), -)