diff options
| -rwxr-xr-x | bitbake/lib/toaster/toastergui/views.py | 37 |
1 files changed, 10 insertions, 27 deletions
diff --git a/bitbake/lib/toaster/toastergui/views.py b/bitbake/lib/toaster/toastergui/views.py index 4d00fbd551..7a11bbd807 100755 --- a/bitbake/lib/toaster/toastergui/views.py +++ b/bitbake/lib/toaster/toastergui/views.py | |||
| @@ -1725,10 +1725,10 @@ if toastermain.settings.MANAGED: | |||
| 1725 | return _redirect_parameters( builds, request.GET, e.response) | 1725 | return _redirect_parameters( builds, request.GET, e.response) |
| 1726 | 1726 | ||
| 1727 | context['tablecols'].append( | 1727 | context['tablecols'].append( |
| 1728 | {'name': 'Project', 'clclass': 'project', | 1728 | {'name': 'Project', 'clclass': 'projectx', |
| 1729 | 'filter': {'class': 'project', | 1729 | 'filter': {'class': 'project', |
| 1730 | 'label': 'Project:', | 1730 | 'label': 'Project:', |
| 1731 | 'options': map(lambda x: (x.name,'',x.build_set.filter(outcome__lt=BuildRequest.REQ_INPROGRESS).count()), Project.objects.all()), | 1731 | 'options': map(lambda x: (x.name,'project:%d' % x.id,x.build_set.filter(outcome__lt=BuildRequest.REQ_INPROGRESS).count()), Project.objects.all()), |
| 1732 | 1732 | ||
| 1733 | } | 1733 | } |
| 1734 | } | 1734 | } |
| @@ -3152,6 +3152,14 @@ else: | |||
| 3152 | ] | 3152 | ] |
| 3153 | } | 3153 | } |
| 3154 | }, | 3154 | }, |
| 3155 | {'name': 'Log', | ||
| 3156 | 'dclass': "span4", | ||
| 3157 | 'qhelp': "Path to the build main log file", | ||
| 3158 | 'clclass': 'log', 'hidden': 1, | ||
| 3159 | 'orderfield': _get_toggle_order(request, "cooker_log_path"), | ||
| 3160 | 'ordericon':_get_toggle_order_icon(request, "cooker_log_path"), | ||
| 3161 | 'orderkey' : 'cooker_log_path', | ||
| 3162 | }, | ||
| 3155 | {'name': 'Time', 'clclass': 'time', 'hidden' : 1, | 3163 | {'name': 'Time', 'clclass': 'time', 'hidden' : 1, |
| 3156 | 'qhelp': "How long it took the build to finish", | 3164 | 'qhelp': "How long it took the build to finish", |
| 3157 | 'orderfield': _get_toggle_order(request, "timespent", True), | 3165 | 'orderfield': _get_toggle_order(request, "timespent", True), |
| @@ -3165,31 +3173,6 @@ else: | |||
| 3165 | ] | 3173 | ] |
| 3166 | } | 3174 | } |
| 3167 | 3175 | ||
| 3168 | if not toastermain.settings.MANAGED: | ||
| 3169 | context['tablecols'].insert(-2, | ||
| 3170 | {'name': 'Log1', | ||
| 3171 | 'dclass': "span4", | ||
| 3172 | 'qhelp': "Path to the build main log file", | ||
| 3173 | 'clclass': 'log', 'hidden': 1, | ||
| 3174 | 'orderfield': _get_toggle_order(request, "cooker_log_path"), | ||
| 3175 | 'ordericon':_get_toggle_order_icon(request, "cooker_log_path"), | ||
| 3176 | 'orderkey' : 'cooker_log_path', | ||
| 3177 | } | ||
| 3178 | ) | ||
| 3179 | |||
| 3180 | |||
| 3181 | if toastermain.settings.MANAGED: | ||
| 3182 | context['tablecols'].append( | ||
| 3183 | {'name': 'Project', 'clclass': 'project', | ||
| 3184 | 'filter': {'class': 'project', | ||
| 3185 | 'label': 'Project:', | ||
| 3186 | 'options': map(lambda x: (x.name,'',x.build_set.filter(outcome__lt=Build.IN_PROGRESS).count()), Project.objects.all()), | ||
| 3187 | |||
| 3188 | } | ||
| 3189 | } | ||
| 3190 | ) | ||
| 3191 | |||
| 3192 | |||
| 3193 | response = render(request, template, context) | 3176 | response = render(request, template, context) |
| 3194 | _save_parameters_cookies(response, pagesize, orderby, request) | 3177 | _save_parameters_cookies(response, pagesize, orderby, request) |
| 3195 | return response | 3178 | return response |
