diff options
Diffstat (limited to 'bitbake/lib/toaster/toastergui/views.py')
-rwxr-xr-x | bitbake/lib/toaster/toastergui/views.py | 37 |
1 files changed, 18 insertions, 19 deletions
diff --git a/bitbake/lib/toaster/toastergui/views.py b/bitbake/lib/toaster/toastergui/views.py index f70cf205b7..0e248a7435 100755 --- a/bitbake/lib/toaster/toastergui/views.py +++ b/bitbake/lib/toaster/toastergui/views.py | |||
@@ -20,7 +20,6 @@ | |||
20 | # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. | 20 | # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. |
21 | 21 | ||
22 | import operator,re | 22 | import operator,re |
23 | import HTMLParser | ||
24 | 23 | ||
25 | from django.db.models import Q, Sum, Count, Max | 24 | from django.db.models import Q, Sum, Count, Max |
26 | from django.db import IntegrityError | 25 | from django.db import IntegrityError |
@@ -278,11 +277,11 @@ def _get_parameters_values(request, default_count, default_order): | |||
278 | 277 | ||
279 | # set cookies for parameters. this is usefull in case parameters are set | 278 | # set cookies for parameters. this is usefull in case parameters are set |
280 | # manually from the GET values of the link | 279 | # manually from the GET values of the link |
281 | def _save_parameters_cookies(response, pagesize, orderby, request): | 280 | def _set_parameters_values(pagesize, orderby, request): |
282 | html_parser = HTMLParser.HTMLParser() | 281 | from django.core.urlresolvers import resolve |
283 | response.set_cookie(key='count', value=pagesize, path=request.path) | 282 | current_url = resolve(request.path_info).url_name |
284 | response.set_cookie(key='orderby', value=html_parser.unescape(orderby), path=request.path) | 283 | request.session['%s_count' % current_url] = pagesize |
285 | return response | 284 | request.session['%s_orderby' % current_url] =orderby |
286 | 285 | ||
287 | # date range: normalize GUI's dd/mm/yyyy to date object | 286 | # date range: normalize GUI's dd/mm/yyyy to date object |
288 | def _normalize_input_date(date_str,default): | 287 | def _normalize_input_date(date_str,default): |
@@ -563,7 +562,7 @@ def recipe_packages(request, build_id, recipe_id): | |||
563 | ] | 562 | ] |
564 | } | 563 | } |
565 | response = render(request, template, context) | 564 | response = render(request, template, context) |
566 | _save_parameters_cookies(response, pagesize, orderby, request) | 565 | _set_parameters_values(pagesize, orderby, request) |
567 | return response | 566 | return response |
568 | 567 | ||
569 | def target_common( request, build_id, target_id, variant ): | 568 | def target_common( request, build_id, target_id, variant ): |
@@ -737,7 +736,7 @@ eans multiple licenses exist that cover different parts of the source', | |||
737 | context['tablecols'].append(tc_layerDir) | 736 | context['tablecols'].append(tc_layerDir) |
738 | 737 | ||
739 | response = render(request, template, context) | 738 | response = render(request, template, context) |
740 | _save_parameters_cookies(response, pagesize, orderby, request) | 739 | _set_parameters_values(pagesize, orderby, request) |
741 | return response | 740 | return response |
742 | 741 | ||
743 | def target( request, build_id, target_id ): | 742 | def target( request, build_id, target_id ): |
@@ -1129,7 +1128,7 @@ def tasks_common(request, build_id, variant, task_anchor): | |||
1129 | context['tablecols'].append(tc_log) | 1128 | context['tablecols'].append(tc_log) |
1130 | 1129 | ||
1131 | response = render(request, template, context) | 1130 | response = render(request, template, context) |
1132 | _save_parameters_cookies(response, pagesize, orderby, request) | 1131 | _set_parameters_values(pagesize, orderby, request) |
1133 | return response | 1132 | return response |
1134 | 1133 | ||
1135 | def tasks(request, build_id): | 1134 | def tasks(request, build_id): |
@@ -1265,7 +1264,7 @@ def recipes(request, build_id): | |||
1265 | 1264 | ||
1266 | 1265 | ||
1267 | response = render(request, template, context) | 1266 | response = render(request, template, context) |
1268 | _save_parameters_cookies(response, pagesize, orderby, request) | 1267 | _set_parameters_values(pagesize, orderby, request) |
1269 | return response | 1268 | return response |
1270 | 1269 | ||
1271 | def configuration(request, build_id): | 1270 | def configuration(request, build_id): |
@@ -1378,7 +1377,7 @@ def configvars(request, build_id): | |||
1378 | } | 1377 | } |
1379 | 1378 | ||
1380 | response = render(request, template, context) | 1379 | response = render(request, template, context) |
1381 | _save_parameters_cookies(response, pagesize, orderby, request) | 1380 | _set_parameters_values(pagesize, orderby, request) |
1382 | return response | 1381 | return response |
1383 | 1382 | ||
1384 | def bpackage(request, build_id): | 1383 | def bpackage(request, build_id): |
@@ -1479,7 +1478,7 @@ def bpackage(request, build_id): | |||
1479 | context['tablecols'].append(tc_layerDir) | 1478 | context['tablecols'].append(tc_layerDir) |
1480 | 1479 | ||
1481 | response = render(request, template, context) | 1480 | response = render(request, template, context) |
1482 | _save_parameters_cookies(response, pagesize, orderby, request) | 1481 | _set_parameters_values(pagesize, orderby, request) |
1483 | return response | 1482 | return response |
1484 | 1483 | ||
1485 | def bfile(request, build_id, package_id): | 1484 | def bfile(request, build_id, package_id): |
@@ -1640,7 +1639,7 @@ def package_built_detail(request, build_id, package_id): | |||
1640 | context['disable_sort'] = True; | 1639 | context['disable_sort'] = True; |
1641 | 1640 | ||
1642 | response = render(request, template, context) | 1641 | response = render(request, template, context) |
1643 | _save_parameters_cookies(response, pagesize, orderby, request) | 1642 | _set_parameters_values(pagesize, orderby, request) |
1644 | return response | 1643 | return response |
1645 | 1644 | ||
1646 | def package_built_dependencies(request, build_id, package_id): | 1645 | def package_built_dependencies(request, build_id, package_id): |
@@ -1705,7 +1704,7 @@ def package_included_detail(request, build_id, target_id, package_id): | |||
1705 | if paths.all().count() < 2: | 1704 | if paths.all().count() < 2: |
1706 | context['disable_sort'] = True | 1705 | context['disable_sort'] = True |
1707 | response = render(request, template, context) | 1706 | response = render(request, template, context) |
1708 | _save_parameters_cookies(response, pagesize, orderby, request) | 1707 | _set_parameters_values(pagesize, orderby, request) |
1709 | return response | 1708 | return response |
1710 | 1709 | ||
1711 | def package_included_dependencies(request, build_id, target_id, package_id): | 1710 | def package_included_dependencies(request, build_id, target_id, package_id): |
@@ -1780,7 +1779,7 @@ def package_included_reverse_dependencies(request, build_id, target_id, package_ | |||
1780 | if objects.all().count() < 2: | 1779 | if objects.all().count() < 2: |
1781 | context['disable_sort'] = True | 1780 | context['disable_sort'] = True |
1782 | response = render(request, template, context) | 1781 | response = render(request, template, context) |
1783 | _save_parameters_cookies(response, pagesize, orderby, request) | 1782 | _set_parameters_values(pagesize, orderby, request) |
1784 | return response | 1783 | return response |
1785 | 1784 | ||
1786 | def image_information_dir(request, build_id, target_id, packagefile_id): | 1785 | def image_information_dir(request, build_id, target_id, packagefile_id): |
@@ -1842,7 +1841,7 @@ if toastermain.settings.MANAGED: | |||
1842 | return _redirect_parameters( builds, request.GET, e.response) | 1841 | return _redirect_parameters( builds, request.GET, e.response) |
1843 | 1842 | ||
1844 | response = render(request, template, context) | 1843 | response = render(request, template, context) |
1845 | _save_parameters_cookies(response, pagesize, orderby, request) | 1844 | _set_parameters_values(pagesize, orderby, request) |
1846 | return response | 1845 | return response |
1847 | 1846 | ||
1848 | 1847 | ||
@@ -2748,7 +2747,7 @@ if toastermain.settings.MANAGED: | |||
2748 | return _redirect_parameters(projectbuilds, request.GET, e.response, pid = pid) | 2747 | return _redirect_parameters(projectbuilds, request.GET, e.response, pid = pid) |
2749 | 2748 | ||
2750 | response = render(request, template, context) | 2749 | response = render(request, template, context) |
2751 | _save_parameters_cookies(response, pagesize, orderby, request) | 2750 | _set_parameters_values(pagesize, orderby, request) |
2752 | 2751 | ||
2753 | return response | 2752 | return response |
2754 | 2753 | ||
@@ -2967,7 +2966,7 @@ if toastermain.settings.MANAGED: | |||
2967 | } | 2966 | } |
2968 | 2967 | ||
2969 | response = render(request, template, context) | 2968 | response = render(request, template, context) |
2970 | _save_parameters_cookies(response, pagesize, orderby, request) | 2969 | _set_parameters_values(pagesize, orderby, request) |
2971 | return response | 2970 | return response |
2972 | 2971 | ||
2973 | def buildrequestdetails(request, pid, brid): | 2972 | def buildrequestdetails(request, pid, brid): |
@@ -3171,7 +3170,7 @@ else: | |||
3171 | context.update(context_date) | 3170 | context.update(context_date) |
3172 | 3171 | ||
3173 | response = render(request, template, context) | 3172 | response = render(request, template, context) |
3174 | _save_parameters_cookies(response, pagesize, orderby, request) | 3173 | _set_parameters_values(pagesize, orderby, request) |
3175 | return response | 3174 | return response |
3176 | 3175 | ||
3177 | 3176 | ||