Skip to content
Snippets Groups Projects
Commit 8343a627 authored by Todd Dembrey's avatar Todd Dembrey
Browse files

Add basic Activity model and comment form

parent 35c9b918
No related branches found
No related tags found
No related merge requests found
from django import forms
from .models import Activity
class CommentForm(forms.ModelForm):
class Meta:
model = Activity
fields = ('message',)
# -*- coding: utf-8 -*-
# Generated by Django 1.11.8 on 2018-02-28 11:03
from __future__ import unicode_literals
from django.conf import settings
from django.db import migrations, models
import django.db.models.deletion
class Migration(migrations.Migration):
initial = True
dependencies = [
('funds', '0025_update_with_file_blocks'),
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
]
operations = [
migrations.CreateModel(
name='Activity',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('timestamp', models.DateTimeField(auto_now_add=True)),
('message', models.TextField()),
('application', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='funds.ApplicationSubmission')),
('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
],
),
]
from django.conf import settings
from django.db import models from django.db import models
# Create your models here.
class Activity(models.Model):
timestamp = models.DateTimeField(auto_now_add=True)
user = models.ForeignKey(settings.AUTH_USER_MODEL)
application = models.ForeignKey('funds.ApplicationSubmission')
message = models.TextField()
from django.shortcuts import render from django.views.generic.edit import ModelFormMixin
# Create your views here. from .forms import CommentForm
class CommentFormViewMixin(ModelFormMixin):
form_class = CommentForm
...@@ -5,6 +5,8 @@ from django.views.generic import DetailView ...@@ -5,6 +5,8 @@ from django.views.generic import DetailView
from django_filters.views import FilterView from django_filters.views import FilterView
from django_tables2.views import SingleTableMixin from django_tables2.views import SingleTableMixin
from opentech.apply.activity.views import CommentFormViewMixin
from .models import ApplicationSubmission from .models import ApplicationSubmission
from .tables import SubmissionsTable, SubmissionFilter, SubmissionFilterAndSearch from .tables import SubmissionsTable, SubmissionFilter, SubmissionFilterAndSearch
from .workflow import SingleStage, DoubleStage from .workflow import SingleStage, DoubleStage
...@@ -40,7 +42,7 @@ class SubmissionSearchView(SingleTableMixin, FilterView): ...@@ -40,7 +42,7 @@ class SubmissionSearchView(SingleTableMixin, FilterView):
) )
class SubmissionDetailView(DetailView): class SubmissionDetailView(CommentFormViewMixin, DetailView):
model = ApplicationSubmission model = ApplicationSubmission
def get_context_data(self, **kwargs): def get_context_data(self, **kwargs):
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment