diff --git a/senlin_dashboard/cluster/clusters/tables.py b/senlin_dashboard/cluster/clusters/tables.py index fd9cc493..5be1f4fa 100644 --- a/senlin_dashboard/cluster/clusters/tables.py +++ b/senlin_dashboard/cluster/clusters/tables.py @@ -17,7 +17,6 @@ from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ungettext_lazy from horizon import tables -from horizon.utils import filters from senlin_dashboard import api from senlin_dashboard import exceptions @@ -46,7 +45,7 @@ def get_profile_link(cluster): def get_updated_time(object): - return filters.parse_isotime(object.updated_at) or None + return object.updated_at or None class DeleteCluster(tables.DeleteAction): @@ -126,9 +125,6 @@ class ClustersTable(tables.DataTable): created = tables.Column( "created_at", verbose_name=_("Created"), - filters=( - filters.parse_isotime, - ) ) updated = tables.Column( get_updated_time, diff --git a/senlin_dashboard/cluster/clusters/templates/clusters/_detail_overview.html b/senlin_dashboard/cluster/clusters/templates/clusters/_detail_overview.html index a6a08ac8..0d292e8c 100644 --- a/senlin_dashboard/cluster/clusters/templates/clusters/_detail_overview.html +++ b/senlin_dashboard/cluster/clusters/templates/clusters/_detail_overview.html @@ -1,4 +1,4 @@ -{% load i18n parse_date nbsp %} +{% load i18n nbsp %}

{% trans "Information" %}

@@ -13,10 +13,10 @@
{% trans "Status" %}
{{ cluster.status }}
{% trans "Created" context "Created time" %}
-
{{ cluster.created_at|parse_date }}
+
{{ cluster.created_at }}
{% if cluster.updated_at %}
{% trans "Updated" context "Updated time" %}
-
{{ cluster.updated_at|parse_date }}
+
{{ cluster.updated_at }}
{% endif %}
diff --git a/senlin_dashboard/cluster/nodes/tables.py b/senlin_dashboard/cluster/nodes/tables.py index 0f9c237e..9754787a 100644 --- a/senlin_dashboard/cluster/nodes/tables.py +++ b/senlin_dashboard/cluster/nodes/tables.py @@ -16,7 +16,6 @@ from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ungettext_lazy from horizon import tables -from horizon.utils import filters from senlin_dashboard import api from senlin_dashboard import exceptions @@ -82,7 +81,7 @@ def get_cluster_link(node): def get_updated_time(object): - return filters.parse_isotime(object.updated_at) or None + return object.updated_at or None class NodesTable(tables.DataTable): @@ -130,9 +129,6 @@ class NodesTable(tables.DataTable): created = tables.Column( "created_at", verbose_name=_("Created"), - filters=( - filters.parse_isotime, - ) ) updated = tables.Column( get_updated_time, diff --git a/senlin_dashboard/cluster/nodes/templates/nodes/_detail_overview.html b/senlin_dashboard/cluster/nodes/templates/nodes/_detail_overview.html index fe590925..d32aa55a 100644 --- a/senlin_dashboard/cluster/nodes/templates/nodes/_detail_overview.html +++ b/senlin_dashboard/cluster/nodes/templates/nodes/_detail_overview.html @@ -1,4 +1,4 @@ -{% load i18n parse_date nbsp %} +{% load i18n nbsp %}

{% trans "Information" %}

@@ -19,10 +19,10 @@
{{ node.role }}
{% endif %}
{% trans "Created" context "Created time" %}
-
{{ node.created_at|parse_date }}
+
{{ node.created_at }}
{% if node.updated_at %}
{% trans "Updated" context "Updated time" %}
-
{{ node.updated_at|parse_date }}
+
{{ node.updated_at }}
{% endif %} diff --git a/senlin_dashboard/cluster/policies/tables.py b/senlin_dashboard/cluster/policies/tables.py index df087d0d..1690e815 100644 --- a/senlin_dashboard/cluster/policies/tables.py +++ b/senlin_dashboard/cluster/policies/tables.py @@ -14,7 +14,6 @@ from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ungettext_lazy from horizon import tables -from horizon.utils import filters from senlin_dashboard import api from senlin_dashboard.cluster.policies import forms as policies_forms @@ -51,7 +50,7 @@ class DeletePolicy(tables.DeleteAction): def get_updated_time(object): - return filters.parse_isotime(object.updated_at) or None + return object.updated_at or None class PoliciesTable(tables.DataTable): @@ -61,9 +60,6 @@ class PoliciesTable(tables.DataTable): created = tables.Column( "created_at", verbose_name=_("Created"), - filters=( - filters.parse_isotime, - ) ) updated = tables.Column( get_updated_time, diff --git a/senlin_dashboard/cluster/policies/templates/policies/_detail_overview.html b/senlin_dashboard/cluster/policies/templates/policies/_detail_overview.html index 098fb6fa..af99049f 100644 --- a/senlin_dashboard/cluster/policies/templates/policies/_detail_overview.html +++ b/senlin_dashboard/cluster/policies/templates/policies/_detail_overview.html @@ -1,4 +1,4 @@ -{% load i18n parse_date nbsp %} +{% load i18n nbsp %}

{% trans "Information" %}

@@ -11,10 +11,10 @@
{% trans "Spec" %}
{{ policy.policy_spec|force_escape|nbsp|linebreaksbr }}
{% trans "Created" context "Created time" %}
-
{{ policy.created_at|parse_date }}
+
{{ policy.created_at }}
{% if node.updated_at %}
{% trans "Updated" context "Updated time" %}
-
{{ policy.updated_at|parse_date }}
+
{{ policy.updated_at }}
{% endif %}
diff --git a/senlin_dashboard/cluster/profiles/tables.py b/senlin_dashboard/cluster/profiles/tables.py index f7287b61..39a86675 100644 --- a/senlin_dashboard/cluster/profiles/tables.py +++ b/senlin_dashboard/cluster/profiles/tables.py @@ -14,7 +14,6 @@ from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ungettext_lazy from horizon import tables -from horizon.utils import filters from senlin_dashboard import api from senlin_dashboard.cluster.profiles import forms as profiles_forms @@ -59,7 +58,7 @@ class DeleteProfile(tables.DeleteAction): def get_updated_time(object): - return filters.parse_isotime(object.updated_at) or None + return object.updated_at or None class ProfilesTable(tables.DataTable): @@ -69,9 +68,6 @@ class ProfilesTable(tables.DataTable): created = tables.Column( "created_at", verbose_name=_("Created"), - filters=( - filters.parse_isotime, - ) ) updated = tables.Column( get_updated_time, diff --git a/senlin_dashboard/cluster/profiles/templates/profiles/_detail_overview.html b/senlin_dashboard/cluster/profiles/templates/profiles/_detail_overview.html index cef41118..ae881c25 100644 --- a/senlin_dashboard/cluster/profiles/templates/profiles/_detail_overview.html +++ b/senlin_dashboard/cluster/profiles/templates/profiles/_detail_overview.html @@ -1,4 +1,4 @@ -{% load i18n parse_date nbsp %} +{% load i18n nbsp %}

{% trans "Information" %}

@@ -17,10 +17,10 @@
{{ profile.permission }}
{% endif %}
{% trans "Created" context "Created time" %}
-
{{ profile.created_at|parse_date }}
+
{{ profile.created_at }}
{% if profile.updated_at %}
{% trans "Updated" context "Updated time" %}
-
{{ profile.updated_at|parse_date }}
+
{{ profile.updated_at }}
{% endif %} diff --git a/senlin_dashboard/cluster/receivers/tables.py b/senlin_dashboard/cluster/receivers/tables.py index fa008d49..57b35b9e 100644 --- a/senlin_dashboard/cluster/receivers/tables.py +++ b/senlin_dashboard/cluster/receivers/tables.py @@ -14,7 +14,6 @@ from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ungettext_lazy from horizon import tables -from horizon.utils import filters from senlin_dashboard import api @@ -51,7 +50,7 @@ class DeleteReceiver(tables.DeleteAction): def get_updated_time(object): - return filters.parse_isotime(object.updated_at) or None + return object.updated_at or None class ReceiversTable(tables.DataTable): @@ -63,9 +62,6 @@ class ReceiversTable(tables.DataTable): created = tables.Column( "created_at", verbose_name=_("Created"), - filters=( - filters.parse_isotime, - ) ) updated = tables.Column( get_updated_time, diff --git a/senlin_dashboard/cluster/receivers/templates/receivers/_detail_overview.html b/senlin_dashboard/cluster/receivers/templates/receivers/_detail_overview.html index 87a9cbe3..445365cd 100644 --- a/senlin_dashboard/cluster/receivers/templates/receivers/_detail_overview.html +++ b/senlin_dashboard/cluster/receivers/templates/receivers/_detail_overview.html @@ -1,4 +1,4 @@ -{% load i18n parse_date %} +{% load i18n %}

{% trans "Information" %}

@@ -15,10 +15,10 @@
{% trans "Channel" %}
{{ receiver.channel }}
{% trans "Created" context "Created time" %}
-
{{ receiver.created_at|parse_date }}
+
{{ receiver.created_at }}
{% if profile.updated_at %}
{% trans "Updated" context "Updated time" %}
-
{{ receiver.updated_at|parse_date }}
+
{{ receiver.updated_at }}
{% endif %}