Merge remote-tracking branch 'origin/master'

[qcg-portal.git] / qcg / views.py

diff --git a/qcg/views.py b/qcg/views.py
index f0de4dc..7a8f351 100644 (file)
--- a/qcg/views.py
+++ b/qcg/views.py
@@ -5,7 +5,7 @@ from django.contrib.auth import REDIRECT_FIELD_NAME
 from django.contrib.auth.decorators import login_required
 from django.core.urlresolvers import reverse
 from django.db.models import Q
-from django.http import HttpResponse
+from django.http import HttpResponse, QueryDict
 from django.shortcuts import render, get_object_or_404
 from django.utils.http import urlencode
 from django.utils.timezone import UTC
@@ -13,7 +13,7 @@ from django_openid_auth.views import make_consumer
 from openid.extensions import ax
 from pyqcg import QCG
 
-from qcg.forms import FiltersForm, JobDescriptionForm, EnvFormSet
+from qcg.forms import FiltersForm, ColumnsForm, JobDescriptionForm, EnvFormSet
 from qcg.utils import update_user_data, paginator_context
 
 
@@ -115,7 +115,17 @@ def jobs_list(request):
 
     checked_status = {i: widget.is_checked() for i, widget in enumerate(filters['status'])}
 
-    context = {'filters': filters, 'checked_status': checked_status, 'selected_filters': selected_filters}
+    if 'columns' in request.COOKIES:
+        columns = ColumnsForm(QueryDict(request.COOKIES.get('columns')))
+
+    if 'columns' not in request.COOKIES or not columns.is_valid():
+        columns = ColumnsForm(QueryDict('columns=1&columns=2&columns=3&columns=4&columns=5&columns=6'))
+        columns.is_valid()
+
+    context = {'filters': filters, 'checked_status': checked_status, 'selected_filters': selected_filters,
+               'columns': ColumnsForm(initial={'columns': columns.cleaned_data['columns']}),
+               'displayed': {int(c) for c in columns.cleaned_data['columns']}}
+
     context.update(paginator_context(request, tasks))
 
     return render(request, 'qcg/jobs.html', context)