openstack/sahara-dashboard
Code Issues Proposed changes

Merge "Restoring special search handling for job table"

Browse Source
This commit is contained in:
Jenkins 2016-02-23 10:54:41 +00:00 committed by Gerrit Code Review
commit 63c9a10315
2 changed files with 9 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sahara_dashboard/content/data_processing/jobs/jobs/tabs.py
View File

@ -32,6 +32,8 @@ class JobsTab(sahara_tabs.SaharaTableTab):
name = _("Jobs")
slug = "jobs_tab"
template_name = "horizon/common/_detail_table.html"
SEARCH_MAPPING = {"cluster": "cluster.name",
"job": "job.name"}
def get_jobs_data(self):
try:
@ -39,7 +41,13 @@ class JobsTab(sahara_tabs.SaharaTableTab):
search_opts = {}
filter = self.get_server_filter_info(table.request, table)
if filter['value'] and filter['field']:
search_opts = {filter['field']: filter['value']}
if filter['field'] in self.SEARCH_MAPPING:
# Handle special cases for cluster and job
# since they are in different database tables.
search_opts = {
self.SEARCH_MAPPING[filter['field']]: filter['value']}
else:
search_opts = {filter['field']: filter['value']}
jobs = saharaclient.job_execution_list(self.request, search_opts)
except Exception:
jobs = []

29
sahara_dashboard/content/data_processing/jobs/jobs/views.py
View File

@ -15,7 +15,6 @@ from django.core.urlresolvers import reverse
from django.utils.translation import ugettext_lazy as _
from horizon import exceptions
from horizon import tables
from horizon import tabs
from horizon.utils import memoized
@ -27,34 +26,6 @@ import sahara_dashboard.content.data_processing \
.jobs.jobs.tabs as _tabs
class JobsView(tables.DataTableView):
SEARCH_MAPPING = {"cluster": "cluster.name",
"job": "job.name"}
table_class = je_tables.JobsTable
template_name = 'jobs/job_executions.html'
page_title = _("Jobs")
def get_data(self):
try:
search_opts = {}
filter = self.get_server_filter_info(self.request)
if filter['value'] and filter['field']:
if filter['field'] in self.SEARCH_MAPPING:
# Handle special cases for cluster and job
# since they are in different database tables.
search_opts = {
self.SEARCH_MAPPING[filter['field']]: filter['value']}
else:
search_opts = {filter['field']: filter['value']}
jobs = saharaclient.job_execution_list(self.request, search_opts)
except Exception:
jobs = []
exceptions.handle(self.request,
_("Unable to fetch job executions."))
return jobs
class JobDetailsView(tabs.TabView):
tab_group_class = _tabs.JobExecutionDetailsTabs
template_name = 'horizon/common/_detail.html'