Commit 51d0dbc9 by Kálmán Viktor

dashboard: appliance columns for disk list

parent 2faa9566
......@@ -21,10 +21,12 @@ from django.contrib.auth.models import Group, User
from django_tables2 import Table, A
from django_tables2.columns import (TemplateColumn, Column, LinkColumn,
from django.utils.safestring import mark_safe
from django.utils.html import escape
from vm.models import Node, InstanceTemplate, Lease
from storage.models import Disk
from django.utils.translation import ugettext_lazy as _
from django.utils.translation import ugettext_lazy as _, ugettext
from django_sshkey.models import UserKey
from dashboard.models import ConnectCommand
......@@ -37,6 +39,22 @@ class FileSizeColumn(Column):
return size
class ApplianceColumn(TemplateColumn):
def render(self, *args, **kwargs):
value = super(ApplianceColumn, self).render(*args, **kwargs)
abbr = '<abbr title="%s">%s</abbr>'
appliance = kwargs['record'].get_appliance()
if appliance is None:
return value
elif isinstance(appliance, InstanceTemplate):
# Translators: [T] as Template
title, text = ugettext("Template"), ugettext("[T]")
# Translators: [VM] as Virtual Machine
title, text = ugettext("Virtual machine"), ugettext("[VM]")
return mark_safe("%s %s" % (abbr % (title, text), value))
class NodeListTable(Table):
pk = Column(
......@@ -306,12 +324,20 @@ class ConnectCommandListTable(Table):
class DiskListTable(Table):
size = FileSizeColumn()
appliance = ApplianceColumn(
is_ready = BooleanColumn(
class Meta:
model = Disk
attrs = {'class': "table table-bordered table-striped table-hover",
'id': "disk-list-table"}
fields = ("pk", "name", "filename", "size", "is_ready")
fields = ("pk", "appliance", "filename", "size", "is_ready")
prefix = "disk-"
order_by = ("-pk", )
per_page = 65536
{% load i18n %}
{% with app=record.get_appliance %}
{% if app %}
<a href="{{ app.get_absolute_url }}">{{ }}</a>
{% else %}
{% endif %}
{% endwith %}
......@@ -27,6 +27,7 @@ import re
from celery.contrib.abortable import AbortableAsyncResult
from django.db.models import (Model, BooleanField, CharField, DateTimeField,
from django.core.exceptions import ObjectDoesNotExist
from django.utils import timezone
from django.utils.translation import ugettext_lazy as _, ugettext_noop
from model_utils.models import TimeStampedModel
......@@ -290,9 +291,10 @@ class Disk(TimeStampedModel):
from vm.models import Instance
return self.instance_set.get()
except Instance.DoesNotExist:
return self.template_set.get()
app = self.template_set.all() or self.instance_set.all()
return app.get()
except ObjectDoesNotExist:
return None
def get_exclusive(self):
"""Get an instance of the disk for exclusive usage.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment