openstack
/
sahara-dashboard
Code Issues Proposed changes

Fix job and data sources time values 

This patch fixes Job Execution and Data Sources time values for the
Job Execution and Data Sources details views. Now they are shown with
time according to timezone which set in settings.
Also imported 'filters' module from horizon.utils as a workaround for
proper compressing (see bug 1551009)

Change-Id: I5c0173b431919348e3f0a0aa9cbdc5bc943acd60
partial-bug: 1563419
closes-bug: 1551009
This commit is contained in:
Michael Ionkin 2016-03-30 12:12:35 +03:00
parent 9d6e353c5a
commit 7b37946334
3 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sahara_dashboard/content/data_processing/jobs/templates/data_sources/_details.html
View File

@ -19,6 +19,6 @@
<dt>{% trans "Protected" %}</dt>
<dd>{{ data_source.is_protected|yesno }}</dd>
<dt>{% trans "Create time" %}</dt>
<dd>{{ data_source.created_at }}</dd>
<dd>{{ data_source.created_at|parse_isotime }}</dd>
</dl>
</div>

8
sahara_dashboard/content/data_processing/jobs/templates/jobs/_details.html
View File

@ -25,17 +25,17 @@
<dt>{% trans "Cluster" %}</dt>
<dd><a href="{% url 'horizon:project:data_processing.clusters:details' job_execution.cluster_id %}">{{ object_names.cluster_name }}</a></dd>
<dt>{% trans "Last Updated" %}</dt>
<dd>{{ job_execution.updated_at }}</dd>
<dd>{{ job_execution.updated_at|parse_isotime }}</dd>
<dt>{% trans "Started" context "Start time" %}</dt>
<dd>{{ job_execution.start_time }}</dd>
<dd>{{ job_execution.start_time|parse_isotime }}</dd>
<dt>{% trans "Ended" context "End time" %}</dt>
<dd>{{ job_execution.end_time }}</dd>
<dd>{{ job_execution.end_time|parse_isotime }}</dd>
<dt>{% trans "Return Code" %}</dt>
<dd>{{ job_execution.return_code }}</dd>
<dt>{% trans "Oozie Job ID" %}</dt>
<dd>{{ job_execution.oozie_job_id }}</dd>
<dt>{% trans "Created" context "Created time" %}</dt>
<dd>{{ job_execution.created_at }}</dd>
<dd>{{ job_execution.created_at|parse_isotime }}</dd>
<dt>{% trans "Job Configuration" %}</dt>
<dd>{% for group, vals in job_execution.job_configs.iteritems %}
<ul><li><span style="font-weight:bold">{% blocktrans %}{{ group }}:{% endblocktrans %}</span>

16
sahara_dashboard/content/data_processing/jobs/templatetags/__init__.py Normal file
View File

@ -0,0 +1,16 @@
# Copyright (c) 2016 Mirantis Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
# implied.
# See the License for the specific language governing permissions and
# limitations under the License.
from horizon.utils import filters # noqa