summaryrefslogtreecommitdiffstats
path: root/bitbake/lib/toaster/toastergui/views.py
diff options
context:
space:
mode:
Diffstat (limited to 'bitbake/lib/toaster/toastergui/views.py')
-rwxr-xr-xbitbake/lib/toaster/toastergui/views.py11
1 files changed, 6 insertions, 5 deletions
diff --git a/bitbake/lib/toaster/toastergui/views.py b/bitbake/lib/toaster/toastergui/views.py
index ec65903080..82650d0a02 100755
--- a/bitbake/lib/toaster/toastergui/views.py
+++ b/bitbake/lib/toaster/toastergui/views.py
@@ -165,8 +165,8 @@ def _lv_to_dict(prj, x = None):
165 165
166 return {"id": x.pk, 166 return {"id": x.pk,
167 "name": x.layer.name, 167 "name": x.layer.name,
168 "tooltip": x.layer.vcs_url+" | "+x.get_vcs_reference(), 168 "tooltip": "%s | %s" % (x.layer.vcs_url,x.get_vcs_reference()),
169 "detail": "(" + x.layer.vcs_url + (")" if x.up_branch == None else " | "+x.get_vcs_reference()+")"), 169 "detail": "(%s" % x.layer.vcs_url + (")" if x.up_branch == None else " | "+x.get_vcs_reference()+")"),
170 "giturl": x.layer.vcs_url, 170 "giturl": x.layer.vcs_url,
171 "layerdetailurl" : reverse('layerdetails', args=(prj.id,x.pk)), 171 "layerdetailurl" : reverse('layerdetails', args=(prj.id,x.pk)),
172 "revision" : x.get_vcs_reference(), 172 "revision" : x.get_vcs_reference(),
@@ -559,10 +559,10 @@ def task( request, build_id, task_id ):
559 uri_list= [ ] 559 uri_list= [ ]
560 variables = Variable.objects.filter(build=build_id) 560 variables = Variable.objects.filter(build=build_id)
561 v=variables.filter(variable_name='SSTATE_DIR') 561 v=variables.filter(variable_name='SSTATE_DIR')
562 if v.count > 0: 562 if v.count() > 0:
563 uri_list.append(v[0].variable_value) 563 uri_list.append(v[0].variable_value)
564 v=variables.filter(variable_name='SSTATE_MIRRORS') 564 v=variables.filter(variable_name='SSTATE_MIRRORS')
565 if (v.count > 0): 565 if (v.count() > 0):
566 for mirror in v[0].variable_value.split('\\n'): 566 for mirror in v[0].variable_value.split('\\n'):
567 s=re.sub('.* ','',mirror.strip(' \t\n\r')) 567 s=re.sub('.* ','',mirror.strip(' \t\n\r'))
568 if len(s): uri_list.append(s) 568 if len(s): uri_list.append(s)
@@ -2124,9 +2124,10 @@ if True:
2124 login(request, user) 2124 login(request, user)
2125 2125
2126 # save the project 2126 # save the project
2127 release = Release.objects.get(pk = request.POST.get('projectversion', None ))
2128 if ptype == "analysis": 2127 if ptype == "analysis":
2129 release = None 2128 release = None
2129 else:
2130 release = Release.objects.get(pk = request.POST.get('projectversion', None ))
2130 2131
2131 prj = Project.objects.create_project(name = request.POST['projectname'], release = release) 2132 prj = Project.objects.create_project(name = request.POST['projectname'], release = release)
2132 prj.user_id = request.user.pk 2133 prj.user_id = request.user.pk