From 0f7199c09bbf9dc9413b50becb63bc21a1664598 Mon Sep 17 00:00:00 2001
From: Livia Dobai <livia.dobai@gmail.com>
Date: Thu, 4 Jun 2015 11:00:30 +0200
Subject: [PATCH 1/3] added owner data to the project pages

---
 web/templates/pages/project_detail.html | 1 +
 web/templates/pages/projects.html       | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/web/templates/pages/project_detail.html b/web/templates/pages/project_detail.html
index aba20b0..23638e5 100644
--- a/web/templates/pages/project_detail.html
+++ b/web/templates/pages/project_detail.html
@@ -30,6 +30,7 @@ <h1>{{ project.project_name }}</h1>
 				{% if project.website_test %}
 					<p><strong>Test site:</strong> <a href="{{ project.website_test }}">{{ project.website_test }}</a></p>
 				{% endif %}
+				<p><strong>Owner:</strong> {{ project.project_owner }}</p>
 			</div>
 			<div class="col-md-6 col-sm-6">
 				<p><strong>Project members:</strong></p>
diff --git a/web/templates/pages/projects.html b/web/templates/pages/projects.html
index cf059fb..a02779d 100644
--- a/web/templates/pages/projects.html
+++ b/web/templates/pages/projects.html
@@ -32,7 +32,7 @@ <h3 class="tcname"><a href="{% url 'project-detail' project_id=project.project_i
 				<p>{{ project.project_description }}</p>
 				<p><strong>Status:</strong> {{ project.get_status_display }}</p>
 				<p><strong>Project launch:</strong> {{ project.date_created|date:"m. Y" }}</p>
-
+				<p><strong>Owner:</strong> {{ project.project_owner }}</p>
 				{% if project.project_deadline %}
 					<p><strong>Project deadline:</strong> {{ project.project_deadline|date:"d.m.Y" }}</p>
 				{% endif %}

From f889a2f06e452ab60785b16911fb33ed45488beb Mon Sep 17 00:00:00 2001
From: Livia Dobai <livia.dobai@gmail.com>
Date: Thu, 4 Jun 2015 11:06:31 +0200
Subject: [PATCH 2/3] Initialize current owner on the new task form

---
 web/views.py | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/web/views.py b/web/views.py
index 5f4335d..9ccb86f 100644
--- a/web/views.py
+++ b/web/views.py
@@ -53,6 +53,7 @@ def member_edit(request):
 
 def projects(request):
 	project_list = Project.objects.all().exclude(status = 'DELETED')
+	
 	return render(request, 'pages/projects.html',{'project_list': project_list})
 
 def project_detail(request, project_id):
@@ -110,9 +111,9 @@ def project_delete(request, project_id):
 
 @login_required
 def tasks(request):
-	task_owned = Task.objects.filter(project_id__in=Project.objects.exclude(status='DELETED')).filter(owner_id=request.user).exclude(status = 'DELETED')
-	task_assigned = Task.objects.filter(project_id__in=Project.objects.exclude(status='DELETED')).filter(assigned_id=request.user).exclude(status = 'DELETED')
-	return render(request, 'pages/tasks.html', {'task_owned': task_owned, 'task_assigned': task_assigned})
+	task_owned = Task.objects.filter(project_id__in=Project.objects.exclude(status='DELETED')).filter(owner_id=request.user.userprofile).exclude(status = 'DELETED')
+	task_assigned = Task.objects.filter(project_id__in=Project.objects.exclude(status='DELETED')).filter(assigned_id=request.user.userprofile).exclude(status = 'DELETED')
+	return render(request, 'pages/tasks.html', {'task_owned': task_owned , 'task_assigned': task_assigned})
 
 @permission_required('api.change_task', login_url='/login/')
 def task_edit(request, task_id):
@@ -139,7 +140,7 @@ def task_new(request, project_id = None):
 			task = taskform.save()
 			return redirect('pages-tasks')
 	else:
-		taskform = TaskForm(initial={'project_id':project_id})
+		taskform = TaskForm(initial={'project_id':project_id, 'owner_id':request.user.userprofile})
 
 	return render(request, 'pages/task_edit.html', {'taskform': taskform})
 

From 17f667a252376bcd494bd6a92e2d858414b2663e Mon Sep 17 00:00:00 2001
From: Livia Dobai <livia.dobai@gmail.com>
Date: Thu, 4 Jun 2015 11:12:52 +0200
Subject: [PATCH 3/3] Initialize current owner on the new project form

---
 web/views.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/views.py b/web/views.py
index 9ccb86f..195be88 100644
--- a/web/views.py
+++ b/web/views.py
@@ -78,7 +78,7 @@ def project_new(request):
 			project = projectform.save()
 			return redirect('project-detail', project_id=project.project_id)
 	else:
-		projectform = ProjectForm()
+		projectform = ProjectForm(initial={'project_owner':request.user.userprofile})
 
 	return render(request, 'pages/project_edit.html', {'projectform': projectform})