Skip to content

Initialize current owner on the new task and new project form #300

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
livike wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Initialize current owner on the new task and new project form #300

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0f7199c
added owner data to the project pages
livike Jun 4, 2015
f889a2f
Initialize current owner on the new task form
livike Jun 4, 2015
17f667a
Initialize current owner on the new project form
livike Jun 4, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions web/templates/pages/project_detail.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion web/templates/pages/projects.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 %}
Expand Down
11 changes: 6 additions & 5 deletions web/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand All @@ -77,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})

Expand Down Expand Up @@ -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):
Expand All @@ -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})

Expand Down