openstack
/
freezer-web-ui
Code Issues Proposed changes

Merge "Fix for sessions that point to non-existing urls"

This commit is contained in:
Jenkins 2016-01-18 18:59:21 +00:00 committed by Gerrit Code Review
parent dd40a9438a c0d59cc838
commit a49a0c6d20
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
disaster_recovery/api/api.py
View File

@ -305,14 +305,18 @@ class Session(object):
def jobs(self, session_id): def jobs(self, session_id):
session = self.get(session_id, json=True) session = self.get(session_id, json=True)
jobs = [] jobs = []
if session is None:
return jobs
try: try:
jobs = [utils.JobsInSessionObject(k, jobs = [utils.JobsInSessionObject(k,
session_id, session_id,
v['client_id'], v['client_id'],
v['result']) v['result'])
for k, v in session['jobs'].iteritems()] for k, v in session['jobs'].iteritems()]
except AttributeError: except AttributeError as error:
pass LOG.error(error.message)
return jobs return jobs
def _build(self, session): def _build(self, session):

4
disaster_recovery/sessions/views.py
View File

@ -32,11 +32,11 @@ class SessionsView(browsers.ResourceBrowserView):
browser_class = project_browsers.SessionBrowser browser_class = project_browsers.SessionBrowser
template_name = "disaster_recovery/sessions/browser.html" template_name = "disaster_recovery/sessions/browser.html"
@shield('Unable to get sessions list.', redirect='actions:index') @shield('Unable to get sessions list.', redirect='sessions:index')
def get_sessions_data(self): def get_sessions_data(self):
return freezer_api.Session(self.request).list(limit=100) return freezer_api.Session(self.request).list(limit=100)
@shield('Unable to get job list.', redirect='actions:index') @shield('Unable to get job list.', redirect='sessions:index')
def get_jobs_data(self): def get_jobs_data(self):
if self.kwargs['session_id']: if self.kwargs['session_id']:
return freezer_api.Session(self.request).jobs( return freezer_api.Session(self.request).jobs(