@@ -12,6 +12,7 @@
| Story |
Task |
{% if is_bug %}Branch | {% endif %}
+{% if is_group %}Project | {% endif %}
Assignee |
Milestone |
@@ -25,6 +26,7 @@
{{ task.story.title }} |
{{ task.title }} |
{% if is_bug %}{{ task.milestone.branch.name }} | {% endif %}
+{% if is_group %}{{ task.project.name }} | {% endif %}
{{ task.assignee.username }} |
{% if not task.milestone.undefined %}{{ task.milestone.name }}{% endif %} |
diff --git a/storyboard/projects/templates/projects.project.html b/storyboard/projects/templates/projects.project.html
index 230ac777..586f0962 100644
--- a/storyboard/projects/templates/projects.project.html
+++ b/storyboard/projects/templates/projects.project.html
@@ -2,22 +2,28 @@
{% block extranav %}
{% endblock %}
{% block modals %}
-{% include "stories.modal_addstory.html" with project=project.name story_type='bug' %}
-{% include "stories.modal_addstory.html" with project=project.name story_type='feature' %}
+{% if not is_group %}
+ {% include "stories.modal_addstory.html" with project=ref.name story_type='bug' %}
+ {% include "stories.modal_addstory.html" with project=ref.name story_type='feature' %}
+{% endif %}
{% endblock %}
diff --git a/storyboard/projects/utils.py b/storyboard/projects/utils.py
new file mode 100644
index 00000000..fe08bbf7
--- /dev/null
+++ b/storyboard/projects/utils.py
@@ -0,0 +1,26 @@
+# Copyright 2013 Thierry Carrez
+# All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License. You may obtain
+# a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations
+# under the License.
+
+from storyboard.projects.models import Project
+from storyboard.projects.models import ProjectGroup
+
+
+def retrieve_projects(name, group):
+ if group:
+ ref = ProjectGroup.objects.get(name=name)
+ return ref, ref.members.all()
+ else:
+ ref = Project.objects.get(name=name)
+ return ref, [ref]
diff --git a/storyboard/projects/views.py b/storyboard/projects/views.py
index 8c35af9a..3f0859c1 100644
--- a/storyboard/projects/views.py
+++ b/storyboard/projects/views.py
@@ -16,6 +16,7 @@
from django.shortcuts import render
from storyboard.projects.models import Project
+from storyboard.projects.utils import retrieve_projects
from storyboard.stories.models import Task
@@ -25,60 +26,71 @@ def default_list(request):
})
-def dashboard(request, projectname):
- project = Project.objects.get(name=projectname)
- bugcount = Task.objects.filter(project=project,
+def dashboard(request, projectname, group=False):
+ ref, projects = retrieve_projects(projectname, group)
+ bugcount = Task.objects.filter(project__in=projects,
story__is_bug=True,
story__priority=0).count()
+ if group:
+ return render(request, "projects.group.html", {
+ 'ref': ref,
+ 'is_group': group,
+ 'bugtriagecount': bugcount,
+ })
return render(request, "projects.dashboard.html", {
- 'project': project,
+ 'ref': ref,
+ 'is_group': group,
'bugtriagecount': bugcount,
})
-def list_featuretasks(request, projectname):
- project = Project.objects.get(name=projectname)
- bugcount = Task.objects.filter(project=project,
+def list_featuretasks(request, projectname, group=False):
+ ref, projects = retrieve_projects(projectname, group)
+ bugcount = Task.objects.filter(project__in=projects,
story__is_bug=True,
story__priority=0).count()
- featuretasks = Task.objects.filter(project=project,
+ featuretasks = Task.objects.filter(project__in=projects,
story__is_bug=False,
status__in=['T', 'R'])
return render(request, "projects.list_tasks.html", {
'title': "Active feature tasks",
- 'project': project,
+ 'ref': ref,
+ 'is_group': group,
+ 'name': projectname,
'bugtriagecount': bugcount,
'tasks': featuretasks,
'is_bug': False,
})
-def list_bugtasks(request, projectname):
- project = Project.objects.get(name=projectname)
- bugcount = Task.objects.filter(project=project,
+def list_bugtasks(request, projectname, group=False):
+ ref, projects = retrieve_projects(projectname, group)
+ bugcount = Task.objects.filter(project__in=projects,
story__is_bug=True,
story__priority=0).count()
- bugtasks = Task.objects.filter(project=project,
+ bugtasks = Task.objects.filter(project__in=projects,
story__is_bug=True,
status__in=['T', 'R'])
return render(request, "projects.list_tasks.html", {
'title': "Active bug tasks",
- 'project': project,
+ 'ref': ref,
+ 'is_group': group,
'bugtriagecount': bugcount,
'tasks': bugtasks,
'is_bug': True,
})
-def list_bugtriage(request, projectname):
- project = Project.objects.get(name=projectname)
- tasks = Task.objects.filter(project=project,
+def list_bugtriage(request, projectname, group=False):
+ ref, projects = retrieve_projects(projectname, group)
+ tasks = Task.objects.filter(project__in=projects,
story__is_bug=True,
story__priority=0)
bugcount = tasks.count()
return render(request, "projects.list_tasks.html", {
'title': "Bugs needing triage",
- 'project': project,
+ 'ref': ref,
+ 'is_group': group,
'bugtriagecount': bugcount,
'tasks': tasks,
'is_bug': True,
diff --git a/storyboard/urls.py b/storyboard/urls.py
index 008ec61c..c37e4815 100644
--- a/storyboard/urls.py
+++ b/storyboard/urls.py
@@ -26,6 +26,7 @@ urlpatterns = patterns('',
(r'^$', 'storyboard.about.views.welcome'),
(r'^about/', include('storyboard.about.urls')),
(r'^project/', include('storyboard.projects.urls')),
+ (r'^projectgroup/', include('storyboard.projects.urls'), {'group': True}),
(r'^story/', include('storyboard.stories.urls')),
url(r'^admin/', include(admin.site.urls)),
(r'^logout$', 'storyboard.about.views.dologout'),