summaryrefslogtreecommitdiffstats
path: root/bitbake/lib/toaster/toastergui
diff options
context:
space:
mode:
Diffstat (limited to 'bitbake/lib/toaster/toastergui')
-rw-r--r--bitbake/lib/toaster/toastergui/api.py3
-rw-r--r--bitbake/lib/toaster/toastergui/tables.py9
-rw-r--r--bitbake/lib/toaster/toastergui/templatetags/objects_to_dictionaries_filter.py1
-rw-r--r--bitbake/lib/toaster/toastergui/templatetags/projecttags.py2
-rw-r--r--bitbake/lib/toaster/toastergui/urls.py5
-rw-r--r--bitbake/lib/toaster/toastergui/views.py9
6 files changed, 8 insertions, 21 deletions
diff --git a/bitbake/lib/toaster/toastergui/api.py b/bitbake/lib/toaster/toastergui/api.py
index 8b49b3ee3f..a4afc9e704 100644
--- a/bitbake/lib/toaster/toastergui/api.py
+++ b/bitbake/lib/toaster/toastergui/api.py
@@ -13,7 +13,6 @@ import logging
13import json 13import json
14import subprocess 14import subprocess
15from collections import Counter 15from collections import Counter
16from shutil import copyfile
17 16
18from orm.models import Project, ProjectTarget, Build, Layer_Version 17from orm.models import Project, ProjectTarget, Build, Layer_Version
19from orm.models import LayerVersionDependency, LayerSource, ProjectLayer 18from orm.models import LayerVersionDependency, LayerSource, ProjectLayer
@@ -29,8 +28,6 @@ from django.core.urlresolvers import reverse
29from django.db.models import Q, F 28from django.db.models import Q, F
30from django.db import Error 29from django.db import Error
31from toastergui.templatetags.projecttags import filtered_filesizeformat 30from toastergui.templatetags.projecttags import filtered_filesizeformat
32from django.utils import timezone
33import pytz
34 31
35# development/debugging support 32# development/debugging support
36verbose = 2 33verbose = 2
diff --git a/bitbake/lib/toaster/toastergui/tables.py b/bitbake/lib/toaster/toastergui/tables.py
index b3ea2227e0..528dd32b0c 100644
--- a/bitbake/lib/toaster/toastergui/tables.py
+++ b/bitbake/lib/toaster/toastergui/tables.py
@@ -7,15 +7,10 @@
7# 7#
8 8
9from toastergui.widgets import ToasterTable 9from toastergui.widgets import ToasterTable
10from orm.models import Recipe, ProjectLayer, Layer_Version, Machine, Project 10from orm.models import Recipe, ProjectLayer, Layer_Version, Project
11from orm.models import CustomImageRecipe, Package, Target, Build, LogMessage, Task 11from orm.models import CustomImageRecipe, Package, Target, Build, LogMessage, Task
12from orm.models import CustomImagePackage, Package_DependencyManager 12from orm.models import CustomImagePackage, Package_DependencyManager
13from orm.models import Distro 13from django.db.models import Q, Sum, Count, When, Case, Value, IntegerField
14from django.db.models import Q, Max, Sum, Count, When, Case, Value, IntegerField
15from django.conf.urls import url
16from django.core.urlresolvers import reverse, resolve
17from django.http import HttpResponse
18from django.views.generic import TemplateView
19 14
20from toastergui.tablefilter import TableFilter 15from toastergui.tablefilter import TableFilter
21from toastergui.tablefilter import TableFilterActionToggle 16from toastergui.tablefilter import TableFilterActionToggle
diff --git a/bitbake/lib/toaster/toastergui/templatetags/objects_to_dictionaries_filter.py b/bitbake/lib/toaster/toastergui/templatetags/objects_to_dictionaries_filter.py
index 048d533871..e242234bfd 100644
--- a/bitbake/lib/toaster/toastergui/templatetags/objects_to_dictionaries_filter.py
+++ b/bitbake/lib/toaster/toastergui/templatetags/objects_to_dictionaries_filter.py
@@ -3,7 +3,6 @@
3# 3#
4 4
5from django import template 5from django import template
6import json
7 6
8register = template.Library() 7register = template.Library()
9 8
diff --git a/bitbake/lib/toaster/toastergui/templatetags/projecttags.py b/bitbake/lib/toaster/toastergui/templatetags/projecttags.py
index 1dbab3bdb9..354b61f081 100644
--- a/bitbake/lib/toaster/toastergui/templatetags/projecttags.py
+++ b/bitbake/lib/toaster/toastergui/templatetags/projecttags.py
@@ -6,7 +6,7 @@
6# SPDX-License-Identifier: GPL-2.0-only 6# SPDX-License-Identifier: GPL-2.0-only
7# 7#
8 8
9from datetime import datetime, timedelta 9from datetime import timedelta
10from os.path import relpath 10from os.path import relpath
11import re 11import re
12from django import template 12from django import template
diff --git a/bitbake/lib/toaster/toastergui/urls.py b/bitbake/lib/toaster/toastergui/urls.py
index 673d9ae967..d2df4e6048 100644
--- a/bitbake/lib/toaster/toastergui/urls.py
+++ b/bitbake/lib/toaster/toastergui/urls.py
@@ -6,10 +6,9 @@
6# SPDX-License-Identifier: GPL-2.0-only 6# SPDX-License-Identifier: GPL-2.0-only
7# 7#
8 8
9from django.conf.urls import include, url 9from django.conf.urls import url
10from django.views.generic import RedirectView, TemplateView 10from django.views.generic import RedirectView
11 11
12from django.http import HttpResponseBadRequest
13from toastergui import tables 12from toastergui import tables
14from toastergui import buildtables 13from toastergui import buildtables
15from toastergui import typeaheads 14from toastergui import typeaheads
diff --git a/bitbake/lib/toaster/toastergui/views.py b/bitbake/lib/toaster/toastergui/views.py
index d7acaff892..7fecdaa973 100644
--- a/bitbake/lib/toaster/toastergui/views.py
+++ b/bitbake/lib/toaster/toastergui/views.py
@@ -20,7 +20,7 @@ from orm.models import TargetKernelFile, TargetSDKFile, Target_Image_File
20from orm.models import BitbakeVersion, CustomImageRecipe 20from orm.models import BitbakeVersion, CustomImageRecipe
21 21
22from django.core.urlresolvers import reverse, resolve 22from django.core.urlresolvers import reverse, resolve
23from django.core.exceptions import MultipleObjectsReturned, ObjectDoesNotExist 23from django.core.exceptions import ObjectDoesNotExist
24from django.core.paginator import Paginator, EmptyPage, PageNotAnInteger 24from django.core.paginator import Paginator, EmptyPage, PageNotAnInteger
25from django.http import HttpResponseNotFound, JsonResponse 25from django.http import HttpResponseNotFound, JsonResponse
26from django.utils import timezone 26from django.utils import timezone
@@ -664,7 +664,6 @@ def recipe_packages(request, build_id, recipe_id):
664 _set_parameters_values(pagesize, orderby, request) 664 _set_parameters_values(pagesize, orderby, request)
665 return response 665 return response
666 666
667from django.core.serializers.json import DjangoJSONEncoder
668from django.http import HttpResponse 667from django.http import HttpResponse
669def xhr_dirinfo(request, build_id, target_id): 668def xhr_dirinfo(request, build_id, target_id):
670 top = request.GET.get('start', '/') 669 top = request.GET.get('start', '/')
@@ -1340,7 +1339,7 @@ def json_build(request,build_id):
1340 1339
1341import toastermain.settings 1340import toastermain.settings
1342 1341
1343from orm.models import Project, ProjectLayer, ProjectTarget, ProjectVariable 1342from orm.models import Project, ProjectLayer, ProjectVariable
1344from bldcontrol.models import BuildEnvironment 1343from bldcontrol.models import BuildEnvironment
1345 1344
1346# we have a set of functions if we're in managed mode, or 1345# we have a set of functions if we're in managed mode, or
@@ -1349,10 +1348,8 @@ from bldcontrol.models import BuildEnvironment
1349if True: 1348if True:
1350 from django.contrib.auth.models import User 1349 from django.contrib.auth.models import User
1351 from django.contrib.auth import authenticate, login 1350 from django.contrib.auth import authenticate, login
1352 from django.contrib.auth.decorators import login_required
1353 1351
1354 from orm.models import LayerSource, ToasterSetting, Release, Machine, LayerVersionDependency 1352 from orm.models import LayerSource, ToasterSetting, Release
1355 from bldcontrol.models import BuildRequest
1356 1353
1357 import traceback 1354 import traceback
1358 1355