# HG changeset patch # User nishanth # Date 1264836789 -19800 # Node ID d28fcc644fbbbf9ab476b95330e56d80ee8f19d8 # Parent c2001db39937a60d42c96827e354e4a6a1a4416d implemented create task view which needed task.py in events. added a method show_msg to views/user.py and used it in logoff view. diff -r c2001db39937 -r d28fcc644fbb pytask/taskapp/forms/task.py --- a/pytask/taskapp/forms/task.py Fri Jan 29 23:34:19 2010 +0530 +++ b/pytask/taskapp/forms/task.py Sat Jan 30 13:03:09 2010 +0530 @@ -0,0 +1,8 @@ +from django import forms +from pytask.taskapp.models import Task + +class TaskCreateForm(forms.ModelForm): + class Meta: + model = Task + fields = ['title', 'desc', 'tags', 'credits'] + publish = forms.BooleanField(required=False) diff -r c2001db39937 -r d28fcc644fbb pytask/taskapp/models.py --- a/pytask/taskapp/models.py Fri Jan 29 23:34:19 2010 +0530 +++ b/pytask/taskapp/models.py Sat Jan 30 13:03:09 2010 +0530 @@ -9,6 +9,7 @@ ("CT", "Contributor"),) STATUS_CHOICES = ( + ("UP", "Unpublished"), ("OP", "Open"), ("LO", "Locked"), ("CL", "Claimed"), @@ -47,14 +48,14 @@ title = models.CharField(max_length = 200, unique = True) desc = models.TextField() - status = models.CharField(max_length = 2, choices = STATUS_CHOICES) + status = models.CharField(max_length = 2, choices = STATUS_CHOICES, default = "UP") tags = models.CharField(max_length = 200, blank = True) subs = models.ManyToManyField('self', blank = True, related_name = "%(class)s_parents") deps = models.ManyToManyField('self', blank = True, related_name = "%(class)s_deps") credits = models.PositiveSmallIntegerField() - progress = models.PositiveSmallIntegerField() + progress = models.PositiveSmallIntegerField(default = 0) mentors = models.ManyToManyField(User, related_name = "%(class)s_mentors") created_by = models.ForeignKey(User, related_name = "%(class)s_created_by") diff -r c2001db39937 -r d28fcc644fbb pytask/taskapp/views/task.py --- a/pytask/taskapp/views/task.py Fri Jan 29 23:34:19 2010 +0530 +++ b/pytask/taskapp/views/task.py Sat Jan 30 13:03:09 2010 +0530 @@ -2,7 +2,11 @@ from django.http import HttpResponse from django.shortcuts import render_to_response, redirect + from pytask.taskapp.models import Task, Comment +from pytask.taskapp.forms.task import TaskCreateForm +from pytask.taskapp.events.task import createTask, addMentor, publishTask +from pytask.taskapp.views.user import show_msg def browse_tasks(request): """ display all the tasks """ @@ -50,3 +54,57 @@ return render_to_response('task/view.html', context) else: return render_to_response('task/view.html', context) + +def create_task(request): + """ check for rights and create a task if applicable. + if user cannot create a task, redirect to homepage. + """ + + user = request.user + is_guest = True if not user.is_authenticated() else False + + if not is_guest: + user_profile = user.get_profile() + can_create_task = False if user_profile.rights == "CT" else True + if can_create_task: + if request.method == "POST": + form = TaskCreateForm(request.POST) + if form.is_valid(): + data = form.cleaned_data + title = data['title'] + desc = data['desc'] + credits = data['credits'] + publish = data['publish'] + task = createTask(title,desc,user,credits) + + if not task: + error_msg = "Another task with the same title exists" + return render_to_response('task/create.html',{'form':form, 'error_msg':error_msg}) + + addMentor(task, user) + if publish: publishTask(task) + task_url = '/task/view/tid=%s'%task.id + return redirect(task_url) + else: + return render_to_response('task/create.html',{'form':form}) + else: + form = TaskCreateForm() + return render_to_response('task/create.html',{'form':form}) + else: + return show_msg('You are not authorised to create a task.') + else: + return show_msg('You are not authorised to create a task.') + + + + + + + + + + + + + + diff -r c2001db39937 -r d28fcc644fbb pytask/taskapp/views/user.py --- a/pytask/taskapp/views/user.py Fri Jan 29 23:34:19 2010 +0530 +++ b/pytask/taskapp/views/user.py Sat Jan 30 13:03:09 2010 +0530 @@ -6,10 +6,10 @@ from django.contrib.auth import login, logout, authenticate from django.contrib.auth.models import User -def redirect_to_homepage(request): +def show_msg(error_msg): """ simply redirect to homepage """ - return redirect('/') + return render_to_response('error.html',{'error_msg':error_msg}) def homepage(request): """ check for authentication and display accordingly. """ @@ -81,7 +81,7 @@ login(request, user) return redirect('/')# Redirect to a success page. else: - return HttpResponse('username is not active, please contact the administrator')# Return a 'disabled account' error message + return show_msg('username is not active, please contact the administrator')# Return a 'disabled account' error message else: errors = ['Please check your username and password'] form = LoginForm() @@ -93,4 +93,4 @@ def user_logout(request): logout(request) - return HttpResponse('You have logged off successfully!!!') + return show_msg('You have logged off successfully!!!') diff -r c2001db39937 -r d28fcc644fbb pytask/templates/task/create.html --- a/pytask/templates/task/create.html Fri Jan 29 23:34:19 2010 +0530 +++ b/pytask/templates/task/create.html Sat Jan 30 13:03:09 2010 +0530 @@ -1,2 +1,10 @@ {% extends 'base.html' %} +{% block content %} + {% if error_msg %} + {{ error_msg }}
+ {% endif %} +
+ {{form.as_p}} + +
{% endblock %} diff -r c2001db39937 -r d28fcc644fbb pytask/urls.py --- a/pytask/urls.py Fri Jan 29 23:34:19 2010 +0530 +++ b/pytask/urls.py Sat Jan 30 13:03:09 2010 +0530 @@ -4,8 +4,8 @@ from django.contrib import admin admin.autodiscover() -from pytask.taskapp.views.user import redirect_to_homepage, homepage, register, user_login, user_logout -from pytask.taskapp.views.task import browse_tasks, view_task +from pytask.taskapp.views.user import homepage, register, user_login, user_logout +from pytask.taskapp.views.task import browse_tasks, view_task, create_task urlpatterns = patterns('', # Example: @@ -17,7 +17,8 @@ (r'^$', homepage), (r'^task/browse/$', browse_tasks), - (r'^task/view/tid=(\d+)', view_task), + (r'^task/view/tid=(\d+)$', view_task), + (r'^task/create/$', create_task), (r'^admin/', include(admin.site.urls)),