Fixed Wishlist, DateFields and Fields

requirements.txt

@@ -12,7 +12,6 @@ django-sitetree==1.4.0
 django-suit==0.2.12
 djangorestframework==3.1.0
 Markdown==2.6.1
-psycopg2==2.6
 pytz==2014.10
 PyYAML==3.11
 requests==2.7.0

scrumtools/apps/scrumboard/models.py

@@ -56,8 +56,8 @@ class Story(models.Model):
     name=models.CharField(max_length=200)
     description=models.TextField()
     sprint = models.ForeignKey(Sprint, blank=True, null=True)
-    created_on=models.DateTimeField()
-    modified_on=models.DateTimeField(default=timezone.now)
+    created_on=models.DateTimeField(auto_now_add=True)
+    modified_on=models.DateTimeField(auto_now=True)
 
     class Meta:
         verbose_name = _('Story')
@@ -86,8 +86,8 @@ class Task(models.Model):
     story = models.ForeignKey(Story, blank=True, null=True)
     story_points=models.IntegerField(default=0)
     estimated_days=models.IntegerField(default=0)
-    created_on=models.DateTimeField()
-    modified_on=models.DateTimeField(default=timezone.now)
+    created_on=models.DateTimeField(auto_now_add=True)
+    modified_on=models.DateTimeField(auto_now_add=True)
     assigned = models.ForeignKey(settings.AUTH_USER_MODEL, null=True, blank=True)
     started = models.DateField(blank=True, null=True)
     due = models.DateField(blank=True, null=True)

scrumtools/apps/scrumboard/views.py

@@ -8,7 +8,6 @@
 from django.contrib.auth.decorators import login_required
 
 from scrumtools.apps.scrumboard.models import Project, Status, Sprint, Story, Task
-from scrumtools.apps.scrumboard.forms import ProjectForm, SprintForm
 from django.utils import timezone
 
 import json
@@ -66,16 +65,19 @@ class StatusList(ListView):
 
 class StatusCreate(CreateView):
     model = Status
+    fields = ['name','order']
     success_url = reverse_lazy('scrumboard:status-list')
     template_name = 'scrumboard/form.html'
 
 class StatusUpdate(UpdateView):
     model = Status
+    fields = ['name','order']
     success_url = reverse_lazy('scrumboard:status-list')
     template_name = 'scrumboard/form.html'
 
 class StatusDelete(DeleteView):
     model = Status
+    fields = ['name','order']
     success_url = reverse_lazy('scrumboard:status-list')
     template_name = 'scrumboard/confirm_delete.html'
 
@@ -113,23 +115,27 @@ class StoryList(ListView):
 
 class StoryCreate(CreateView):
     model = Story
-    form_class = modelform_factory(Story)
+    fields = ['project', 'name', 'description', 'sprint']
+    #form_class = modelform_factory(Story)
     success_url = reverse_lazy('scrumboard:story-list')
     template_name = 'scrumboard/form.html'
 
 class StoryUpdate(UpdateView):
     model = Story
-    form_class = modelform_factory(Story)
+    fields = ['project', 'name', 'description', 'sprint']
     success_url = reverse_lazy('scrumboard:story-list')
     template_name = 'scrumboard/form.html'
 
 class StoryDelete(DeleteView):
     model = Story
+    fields = ['project', 'name', 'description', 'sprint']
     success_url = reverse_lazy('scrumboard:story-list')
     template_name = 'scrumboard/confirm_delete.html'
 
 class StoryDetail(DetailView):
     model = Story
+    fields = ['project', 'name', 'description', 'sprint']
+
 
 #Tasks
 class TaskList(ListView):
@@ -138,13 +144,11 @@ class TaskList(ListView):
 
 class TaskCreate(CreateView):
     model = Task
-    form_class = modelform_factory(Task)
     success_url = reverse_lazy('scrumboard:task-list')
     template_name = 'scrumboard/form.html'
 
 class TaskUpdate(UpdateView):
     model = Task
-    form_class = modelform_factory(Task)
     success_url = reverse_lazy('scrumboard:task-list')
     template_name = 'scrumboard/form.html'
 

scrumtools/apps/wishlist/models.py

@@ -14,7 +14,7 @@ class Wish(models.Model):
     name=models.CharField(max_length=200)
     description=models.TextField()
     votes=models.IntegerField(default=0)
-    created_on=models.DateTimeField('Creation date')
+    created_on=models.DateTimeField(auto_now_add=True)
 
     class Meta:
         verbose_name = _('Wish')

scrumtools/apps/wishlist/views.py

@@ -1,35 +1,37 @@
 from django.views.generic import ListView
 from django.views.generic.detail import DetailView
 from django.views.generic.edit import CreateView, UpdateView, DeleteView
-from django.forms.models import modelform_factory
 
 from django.core.urlresolvers import reverse_lazy
 
 from scrumtools.apps.wishlist.models import Wish
 
 class WishList(ListView):
     model = Wish
+    fields = ['name', 'description']
     paginate_by = 10
 
 class WishCreate(CreateView):
     model = Wish
-    form_class =  modelform_factory(Wish)
+    fields = ['name', 'description']
     success_url = reverse_lazy('wishlist:wish-list')
     template_name = 'wishlist/form.html'
 
 
 class WishUpdate(UpdateView):
     model = Wish
-    form_class =  modelform_factory(Wish)
+    fields = ['name', 'description']
     success_url = reverse_lazy('wishlist:wish-list')
     template_name = 'wishlist/form.html'
 
 
 class WishDelete(DeleteView):
     model = Wish
+    fields = ['name', 'description']
     success_url = reverse_lazy('wishlist:wish-list')
     template_name = 'wishlist/confirm_delete.html'
 
 
 class WishDetail(DetailView):
     model = Wish
+    #fields = ['name', 'description']