milestone & improvements
This commit is contained in:
Élie Bouttier
parent
2f9a29d3a0
commit
59ae312338
8 changed files with 228 additions and 46 deletions
|
|
@ -65,16 +65,36 @@ class Label(models.Model):
|
|||
|
||||
class Milestone(models.Model):
|
||||
|
||||
name_validator = RegexValidator(regex='^[a-z0-9_.-]+$',
|
||||
message="Please enter only lowercase characters, number, "
|
||||
"dot, underscores or hyphens.")
|
||||
|
||||
project = models.ForeignKey(Project, related_name='milestones')
|
||||
|
||||
name = models.CharField(max_length=32)
|
||||
name = models.CharField(max_length=32, validators=[name_validator])
|
||||
|
||||
class Meta:
|
||||
unique_together = [ 'project', 'name' ]
|
||||
|
||||
progression = models.SmallIntegerField(default=0)
|
||||
due_date = models.DateTimeField(blank=True,null=True)
|
||||
|
||||
due_date = models.DateTimeField(null=True)
|
||||
def closed_issues(self):
|
||||
|
||||
return self.issues.filter(closed=True).count()
|
||||
|
||||
def total_issues(self):
|
||||
|
||||
return self.issues.count()
|
||||
|
||||
def progress(self):
|
||||
|
||||
closed = self.closed_issues()
|
||||
total = self.total_issues()
|
||||
|
||||
if total:
|
||||
return int(100 * closed / total);
|
||||
else:
|
||||
return 0
|
||||
|
||||
def __str__(self):
|
||||
return self.name
|
||||
|
|
@ -99,6 +119,8 @@ class Issue(models.Model):
|
|||
|
||||
labels = models.ManyToManyField(Label, blank=True, null=True, related_name='issues')
|
||||
|
||||
milestone = models.ForeignKey(Milestone, blank=True, null=True, related_name='issues')
|
||||
|
||||
assignee = models.ForeignKey(User, blank=True, null=True, related_name='+')
|
||||
|
||||
@staticmethod
|
||||
|
|
@ -154,6 +176,28 @@ class Issue(models.Model):
|
|||
code=Event.DEL_LABEL, args={'label': label.id})
|
||||
event.save()
|
||||
|
||||
def add_milestone(self, author, milestone, commit=True):
|
||||
if self.milestone:
|
||||
event = Event(issue=self, author=author, code=Event.CHANGE_MILESTONE,
|
||||
args={'old_milestone': self.milestone.name,
|
||||
'new_milestone': milestone.name})
|
||||
event.save()
|
||||
else:
|
||||
event = Event(issue=self, author=author, code=Event.SET_MILESTONE,
|
||||
args={'milestone': milestone.name})
|
||||
event.save()
|
||||
self.milestone = milestone
|
||||
if commit:
|
||||
self.save()
|
||||
|
||||
def remove_milestone(self, author, milestone, commit=True):
|
||||
self.milestone = None
|
||||
if commit:
|
||||
self.save()
|
||||
event = Event(issue=self, author=author, code=Event.UNSET_MILESTONE,
|
||||
args={'milestone': milestone.name})
|
||||
event.save()
|
||||
|
||||
def __str__(self):
|
||||
return self.title
|
||||
|
||||
|
|
@ -167,7 +211,7 @@ class Event(models.Model):
|
|||
DEL_LABEL = 5
|
||||
SET_MILESTONE = 6
|
||||
CHANGE_MILESTONE = 7
|
||||
DEL_MILESTONE = 8
|
||||
UNSET_MILESTONE = 8
|
||||
REFERENCE = 9
|
||||
COMMENT = 10
|
||||
DESCRIBE = 11
|
||||
|
|
@ -198,14 +242,11 @@ class Event(models.Model):
|
|||
|
||||
return self.code == Event.COMMENT or self.code == Event.DESCRIBE
|
||||
|
||||
def boxed(self):
|
||||
|
||||
return self.code == Event.COMMENT or self.code == Event.DESCRIBE
|
||||
|
||||
def glyphicon(self):
|
||||
|
||||
if self.code == Event.COMMENT \
|
||||
or self.code == Event.DESCRIBE:
|
||||
if self.code == Event.COMMENT:
|
||||
return "bullhorn"
|
||||
elif self.code == Event.DESCRIBE:
|
||||
return "pencil"
|
||||
elif self.code == Event.CLOSE:
|
||||
return "ban-circle"
|
||||
|
|
@ -218,7 +259,7 @@ class Event(models.Model):
|
|||
return "tag"
|
||||
elif self.code == Event.SET_MILESTONE \
|
||||
or self.code == Event.CHANGE_MILESTONE \
|
||||
or self.code == Event.DEL_MILESTONE:
|
||||
or self.code == Event.UNSET_MILESTONE:
|
||||
return "road"
|
||||
elif self.code == Event.REFERENCE:
|
||||
return "transfer"
|
||||
|
|
@ -253,8 +294,8 @@ class Event(models.Model):
|
|||
elif self.code == Event.SET_MILESTONE:
|
||||
description = "added this to the {milestone} milestone"
|
||||
elif self.code == Event.CHANGE_MILESTONE:
|
||||
description = "moved this from the {old_milestone} milestone to the {new_mileston} milestone"
|
||||
elif self.code == Event.DEL_MILESTONE:
|
||||
description = "moved this from the {old_milestone} milestone to the {new_milestone} milestone"
|
||||
elif self.code == Event.UNSET_MILESTONE:
|
||||
description = "deleted this from the {milestone} milestone"
|
||||
elif self.code == Event.REFERENCE:
|
||||
description = "referenced this issue"
|
||||
|
|
|
|||
|
|
@ -35,15 +35,11 @@
|
|||
<a href="{% url 'list-issue' project.name %}?q=is:open%20author:{{ event.author.username }}"><strong>{{ event.author}}</strong></a> {{ event }} {{ event.date|naturaltime }}
|
||||
{% if event.code == event.DESCRIBE %}
|
||||
<div class="pull-right">
|
||||
<a href="{% url 'edit-issue' project.name issue.id %}">
|
||||
<button class="btn btn-primary btn-xs">Edit</button>
|
||||
</a>
|
||||
<a href="{% url 'edit-issue' project.name issue.id %}"><button class="btn btn-primary btn-xs">Edit</button></a>
|
||||
</div>
|
||||
{% elif event.code == event.COMMENT %}
|
||||
<div class="pull-right">
|
||||
<a href="{% url 'edit-comment' project.name issue.id event.id %}">
|
||||
<button class="btn btn-primary btn-xs">Edit</button>
|
||||
</a>
|
||||
<a href="{% url 'edit-comment' project.name issue.id event.id %}"><button class="btn btn-primary btn-xs">Edit</button></a>
|
||||
</div>
|
||||
{% endif %}
|
||||
</div>
|
||||
|
|
@ -119,16 +115,29 @@
|
|||
None yet
|
||||
{% endif %}
|
||||
<hr>
|
||||
<h5>
|
||||
<b>Milestons</b>
|
||||
<b>Milestone</b>
|
||||
<div class="pull-right">
|
||||
<a href="#"><button class="btn btn-default btn-xs"><span class="glyphicon glyphicon-cog"></span></button></a>
|
||||
</div>
|
||||
</h5>
|
||||
{% if issue.milestones.count %}
|
||||
{% for milestone in issue.milestones.all %}
|
||||
{{ milestone }}
|
||||
<div class="dropdown">
|
||||
<button class="btn btn-default btn-xs" type="button" id="labels-menu" data-toggle="dropdown"><span class="glyphicon glyphicon-cog"></span></button>
|
||||
<ul class="dropdown-menu dropdown-menu-right" role="menu" aria-labelledby="labels-menu">
|
||||
{% if milestones.count %}
|
||||
{% for milestone in milestones %}
|
||||
<li role="presentation">
|
||||
<a href="{% url 'add-milestone-to-issue' project.name issue.id milestone.name %}">{{ milestone }}</a>
|
||||
</li>
|
||||
{% endfor %}
|
||||
<li role="presentation" class="divider"></li>
|
||||
{% endif %}
|
||||
<li role="presentation">
|
||||
<a href="{% url 'add-milestone' project.name %}?issue={{ issue.id }}"><button class="btn btn-success btn-xs btn-block">New milestone...</button></a>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
<br /><br />
|
||||
{% if issue.milestone %}
|
||||
<a href="{% url 'remove-milestone-from-issue' project.name issue.id issue.milestone.name %}"><span class="glyphicon glyphicon-remove remove-label"></span></a>
|
||||
<a href="{% url 'list-issue' project.name %}?q=is:open%20milestone:{{ issue.milestone.name }}"><b>{{ issue.milestone }}</b></a>
|
||||
{% else %}
|
||||
No milestone
|
||||
{% endif %}
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
{% block content %}
|
||||
|
||||
<div class="row">
|
||||
<div class="col-md-offset-3 col-md-6">
|
||||
<div class="col-md-offset-4 col-md-4">
|
||||
|
||||
<form action="" method="post" role="form">
|
||||
{{ form|crispy }}
|
||||
|
|
|
|||
|
|
@ -2,16 +2,55 @@
|
|||
|
||||
{% block milestonetab %} class="active"{% endblock %}
|
||||
|
||||
{% block core %}
|
||||
{% block content %}
|
||||
|
||||
Milestones :
|
||||
<div class="panel panel-default">
|
||||
|
||||
<ul>
|
||||
<div class="panel-heading">
|
||||
<h1>
|
||||
Milestone
|
||||
<div class="pull-right">
|
||||
<a href="{% url 'add-milestone' project.name %}"><button class="btn btn-success">New milestone</button></a>
|
||||
</div>
|
||||
</h1>
|
||||
</div>
|
||||
|
||||
{% if milestones.count %}
|
||||
<table class="table">
|
||||
{% for milestone in milestones %}
|
||||
<li>
|
||||
{{ milestone }}
|
||||
</li>
|
||||
<tr>
|
||||
<td>
|
||||
<div class="pull-right">
|
||||
<a href="{% url 'edit-milestone' project.name milestone.name %}">
|
||||
<button class="btn btn-primary"><span class="glyphicon glyphicon-edit"></span> Edit</button>
|
||||
</a>
|
||||
<a href="{% url 'delete-milestone' project.name milestone.name %}">
|
||||
<button class="btn btn-danger"><span class="glyphicon glyphicon-remove"></span> Delete</button>
|
||||
</a>
|
||||
</div>
|
||||
<b style="font-size: 200%;">
|
||||
<a href="{% url 'list-issue' project.name %}?q=is:open%20milestone:{{ milestone.name }}">{{ milestone }}</a>
|
||||
</b>
|
||||
 
|
||||
<small>
|
||||
<span class="glyphicon glyphicon-calendar"></span> {% if milestone.due_date %}Due by {{ milestone.due_date }}{% else %}No due date{% endif %}
|
||||
</small>
|
||||
<br /><br />
|
||||
<div class="progress">
|
||||
<div class="progress-bar progress-bar-success" role="progressbar" aria-valuenow="{{ milestone.progress }}" aria-valuemin="0" aria-valuemax="100" style="width: {{ milestone.progress }}%;">
|
||||
{{ milestone.progress }}% complete
|
||||
</div>
|
||||
</div>
|
||||
</td>
|
||||
</tr>
|
||||
{% endfor %}
|
||||
</ul>
|
||||
</table>
|
||||
{% else %}
|
||||
<div class="panel-body">
|
||||
There aren't any milestones for this repository quite yet.
|
||||
</div>
|
||||
{% endif %}
|
||||
|
||||
</div>
|
||||
|
||||
{% endblock %}
|
||||
|
|
|
|||
|
|
@ -16,13 +16,16 @@ urlpatterns = [
|
|||
url(r'^(?P<project>[a-z0-9_-]+)/issues/(?P<id>[0-9]+)/delete$', 'issue.views.issue_delete', name='delete-issue'),
|
||||
url(r'^(?P<project>[a-z0-9_-]+)/issues/(?P<issue>[0-9]+)/add-label/(?P<label>[0-9]+)$', 'issue.views.issue_add_label', name='add-label-to-issue'),
|
||||
url(r'^(?P<project>[a-z0-9_-]+)/issues/(?P<issue>[0-9]+)/remove-label/(?P<label>[0-9]+)$', 'issue.views.issue_remove_label', name='remove-label-from-issue'),
|
||||
url(r'^(?P<project>[a-z0-9_-]+)/issues/(?P<issue>[0-9]+)/add-milestone/(?P<milestone>[a-z0-9_.-]+)$', 'issue.views.issue_add_milestone', name='add-milestone-to-issue'),
|
||||
url(r'^(?P<project>[a-z0-9_-]+)/issues/(?P<issue>[0-9]+)/remove-milestone/(?P<milestone>[a-z0-9_.-]+)$', 'issue.views.issue_remove_milestone', name='remove-milestone-from-issue'),
|
||||
url(r'^(?P<project>[a-z0-9_-]+)/labels$', 'issue.views.label_list', name='list-label'),
|
||||
url(r'^(?P<project>[a-z0-9_-]+)/labels/add$', 'issue.views.label_edit', name='add-label'),
|
||||
url(r'^(?P<project>[a-z0-9_-]+)/labels/(?P<id>[0-9]+)/edit$', 'issue.views.label_edit', name='edit-label'),
|
||||
url(r'^(?P<project>[a-z0-9_-]+)/labels/(?P<id>[0-9]+)/delete$', 'issue.views.label_delete', name='delete-label'),
|
||||
url(r'^(?P<project>[a-z0-9_-]+)/milestones$', 'issue.views.milestone_list', name='list-milestone'),
|
||||
url(r'^(?P<project>[a-z0-9_-]+)/milestones/add$', 'issue.views.milestone_edit', name='add-milestone'),
|
||||
url(r'^(?P<project>[a-z0-9_-]+)/milestones/edit/(?P<id>[0-9]+)$', 'issue.views.milestone_edit', name='edit-milestone'),
|
||||
url(r'^(?P<project>[a-z0-9_-]+)/milestones/(?P<name>[a-z0-9_.-]+)/edit$', 'issue.views.milestone_edit', name='edit-milestone'),
|
||||
url(r'^(?P<project>[a-z0-9_-]+)/milestones/(?P<name>[a-z0-9_.-]+)/delete$', 'issue.views.milestone_delete', name='delete-milestone'),
|
||||
url(r'^login$', 'django.contrib.auth.views.login', {'template_name': 'login.html'}, name='login'),
|
||||
url(r'^logout$', 'django.contrib.auth.views.logout', {'next_page': '/'}, name='logout'),
|
||||
]
|
||||
|
|
|
|||
112
issue/views.py
112
issue/views.py
|
|
@ -8,6 +8,7 @@ from issue.models import *
|
|||
|
||||
from django_markdown.widgets import MarkdownWidget
|
||||
from stronghold.decorators import public
|
||||
from bootstrap3_datetime.widgets import DateTimePicker
|
||||
|
||||
|
||||
@public
|
||||
|
|
@ -165,6 +166,17 @@ def issue_list(request, project):
|
|||
break
|
||||
else:
|
||||
issues = issues.filter(labels=label)
|
||||
|
||||
elif key == 'milestone':
|
||||
try:
|
||||
milestone = Milestone.objects.get(project=project,name=value)
|
||||
except ObjectDoesNotExist:
|
||||
messages.error(request, "The milestone '%s' does not exist." %value)
|
||||
issues = None
|
||||
break
|
||||
else:
|
||||
issues = issues.filter(milestone=milestone)
|
||||
|
||||
elif key == 'author' or key == 'user':
|
||||
try:
|
||||
author = User.objects.get(username=value)
|
||||
|
|
@ -174,6 +186,7 @@ def issue_list(request, project):
|
|||
break
|
||||
else:
|
||||
issues = issues.filter(author=author)
|
||||
|
||||
else:
|
||||
messages.error(request, "Unknow '%s' filtering criterion." %keyword)
|
||||
issues = None
|
||||
|
|
@ -279,6 +292,8 @@ def issue(request, project, id):
|
|||
labels = Label.objects.filter(project=issue.project, deleted=False) \
|
||||
.exclude(id__in=issue.labels.all().values_list('id'))
|
||||
milestones = Milestone.objects.filter(project=issue.project)
|
||||
if issue.milestone:
|
||||
milestones = milestones.exclude(name=issue.milestone.name)
|
||||
|
||||
events = issue.events.all()
|
||||
|
||||
|
|
@ -402,6 +417,26 @@ def issue_remove_label(request, project, issue, label):
|
|||
|
||||
return redirect('show-issue', project, issue.id)
|
||||
|
||||
def issue_add_milestone(request, project, issue, milestone):
|
||||
|
||||
issue = get_object_or_404(Issue, project__name=project, id=issue)
|
||||
milestone = get_object_or_404(Milestone, project__name=project, name=milestone)
|
||||
author = User.objects.get(username=request.user.username)
|
||||
|
||||
issue.add_milestone(author, milestone)
|
||||
|
||||
return redirect('show-issue', project, issue.id)
|
||||
|
||||
def issue_remove_milestone(request, project, issue, milestone):
|
||||
|
||||
issue = get_object_or_404(Issue, project__name=project, id=issue)
|
||||
milestone = get_object_or_404(Milestone, project__name=project, name=milestone)
|
||||
author = User.objects.get(username=request.user.username)
|
||||
|
||||
issue.remove_milestone(author, milestone)
|
||||
|
||||
return redirect('show-issue', project, issue.id)
|
||||
|
||||
def label_list(request, project):
|
||||
|
||||
project = get_object_or_404(Project, name=project)
|
||||
|
|
@ -428,12 +463,7 @@ def label_edit(request, project, id=None):
|
|||
else:
|
||||
label = None
|
||||
|
||||
class LabelForm(forms.ModelForm):
|
||||
|
||||
class Meta:
|
||||
model = Label
|
||||
fields = ['name', 'color', 'inverted']
|
||||
|
||||
LabelForm = modelform_factory(Label, fields=['name', 'color', 'inverted'])
|
||||
form = LabelForm(request.POST or None, instance=label)
|
||||
|
||||
if request.method == 'POST' and form.is_valid():
|
||||
|
|
@ -502,14 +532,72 @@ def milestone_list(request, project):
|
|||
|
||||
return render(request, 'issue/milestone_list.html', c)
|
||||
|
||||
def milestone_edit(request, project):
|
||||
def milestone_edit(request, project, name=None):
|
||||
|
||||
project = get_object_or_404(Project, name=project)
|
||||
|
||||
c = {
|
||||
'request': request,
|
||||
'project': project,
|
||||
'milestones': project.milestones.all(),
|
||||
if name:
|
||||
milestone = get_object_or_404(Milestone, project=project, name=name)
|
||||
else:
|
||||
milestone = None
|
||||
|
||||
class MilestoneForm(forms.ModelForm):
|
||||
|
||||
class Meta:
|
||||
model = Milestone
|
||||
fields = ['name', 'due_date']
|
||||
widgets = {
|
||||
'due_date': DateTimePicker(format="YYYY-MM-DD HH:mm"),
|
||||
}
|
||||
|
||||
return render(request, 'issue/milestone_list.html', c)
|
||||
form = MilestoneForm(request.POST or None, instance=milestone)
|
||||
|
||||
if request.method == 'POST' and form.is_valid():
|
||||
|
||||
similar = Milestone.objects.filter(project=project,
|
||||
name=form.cleaned_data['name'])
|
||||
|
||||
if milestone:
|
||||
similar = similar.exclude(pk=milestone.pk)
|
||||
|
||||
if similar.count():
|
||||
|
||||
form._errors['name'] = ['There is already a milestone with this name.']
|
||||
|
||||
else:
|
||||
|
||||
if milestone:
|
||||
if name != form.cleaned_data['name']:
|
||||
author = User.objects.get(username=request.user.username)
|
||||
for issue in milestone.issues.all():
|
||||
event = Event(issue=issue, author=author, code=Event.CHANGE_MILESTONE,
|
||||
args={'old_milestone': name, 'new_milestone': form.cleaned_data['name']})
|
||||
event.save()
|
||||
form.save()
|
||||
messages.success(request, 'Milestone modified successfully.')
|
||||
else:
|
||||
milestone = form.save(commit=False)
|
||||
milestone.project = project
|
||||
milestone.save()
|
||||
messages.success(request, 'Milestone added successfully.')
|
||||
|
||||
issue = request.GET.get('issue')
|
||||
if issue:
|
||||
return redirect('add-milestone-to-issue', project.name, issue, milestone.name)
|
||||
|
||||
return redirect('list-milestone', project.name)
|
||||
|
||||
projects = Project.objects.all()
|
||||
|
||||
c = {
|
||||
'request': request,
|
||||
'projects': projects,
|
||||
'project': project,
|
||||
'form': form,
|
||||
}
|
||||
|
||||
return render(request, 'issue/milestone_edit.html', c)
|
||||
|
||||
def milestone_delete(request, project, name):
|
||||
|
||||
return redirect('list-milestone', project)
|
||||
|
|
|
|||
|
|
@ -41,6 +41,7 @@ INSTALLED_APPS = (
|
|||
|
||||
'stronghold',
|
||||
'django_markdown',
|
||||
'bootstrap3_datetime',
|
||||
'crispy_forms',
|
||||
'colorful',
|
||||
'issue',
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
Django==1.7c2
|
||||
Markdown==2.4.1
|
||||
django-bootstrap3-datetimepicker==2.2.3
|
||||
django-colorful==1.0.1
|
||||
django-crispy-forms==1.4.0
|
||||
django-markdown==0.6.1
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue