[ganeti/ganeti_webmgr] d54ca04 Fix case where cluster info is none in ClusterDetailView

[g...@osuosl.org]

The branch, bug/15375 has been updated

Old revision: 5335304651efa60f14d45cc227cd975f7fc397ce, new revision: d54ca0449861829abf57ffa1ff82b4a538f9a1f1.
via d54ca0449861829abf57ffa1ff82b4a538f9a1f1 (commit)
from 5335304651efa60f14d45cc227cd975f7fc397ce (commit)

- Log -----------------------------------------------------------------
commit d54ca0449861829abf57ffa1ff82b4a538f9a1f1
Author: Chance Zibolski <chance....@gmail.com>
Date: Fri Dec 27 13:52:42 2013 -0800

Fix case where cluster info is none in ClusterDetailView

refs #15375


Summary of changes:
ganeti_webmgr/clusters/views.py | 15 +++++++++------
1 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/ganeti_webmgr/clusters/views.py b/ganeti_webmgr/clusters/views.py
index fbacfd0..e4d04d9 100644
--- a/ganeti_webmgr/clusters/views.py
+++ b/ganeti_webmgr/clusters/views.py
@@ -68,10 +68,12 @@ class ClusterDetailView(LoginRequiredMixin, DetailView):
template_name = "ganeti/cluster/detail.html"

def get_object(self, queryset=None):
- return get_object_or_404(Cluster, slug=self.kwargs["cluster_slug"])
+ self.cluster = get_object_or_404(Cluster,
+ slug=self.kwargs["cluster_slug"])
+ return self.cluster

def get_context_data(self, **kwargs):
- cluster = kwargs["object"]
+ cluster = self.cluster
user = self.request.user
admin = user.is_superuser or user.has_perm("admin", cluster)

@@ -81,10 +83,11 @@ class ClusterDetailView(LoginRequiredMixin, DetailView):
VirtualMachine, perms=['admin']).filter(cluster=cluster)

master_node = {"exists": False}
- master_node['hostname'] = cluster.info.get("master", None)
- if master_node['hostname']:
- master_node['exists'] = cluster.nodes.filter(
- hostname=master_node['hostname']).exists()
+ if cluster.info:
+ master_node['hostname'] = cluster.info.get("master", None)
+ if master_node['hostname']:
+ master_node['exists'] = cluster.nodes.filter(
+ hostname=master_node['hostname']).exists()

return {
"cluster": cluster,