shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-02-14 01:57:24 +03:00
Code Releases Wiki Activity

F #~: registration time changed to start time (#741)

Browse Source 
Signed-off-by: Jorge Lobo <jlobo@opennebula.io>
This commit is contained in:
Jorge Miguel Lobo Escalona 2021-02-02 18:20:10 +01:00 committed by GitHub
parent 4ef730c166
commit d5a6e24d1a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/sunstone/public/app/tabs/oneflow-services-tab/datatable.js
View File

@ -19,14 +19,14 @@ define(function(require) {
DEPENDENCIES
*/
var TabDataTable = require('utils/tab-datatable');
var SunstoneConfig = require('sunstone-config');
var Locale = require('utils/locale');
var OpenNebulaService = require('opennebula/service');
var LabelsUtils = require('utils/labels/utils');
var SearchDropdown = require('hbs!./datatable/search');
var Status = require('utils/status');
var Humanize = require('utils/humanize');
var TabDataTable = require("utils/tab-datatable");
var SunstoneConfig = require("sunstone-config");
var Locale = require("utils/locale");
var OpenNebulaService = require("opennebula/service");
var LabelsUtils = require("utils/labels/utils");
var SearchDropdown = require("hbs!./datatable/search");
var Status = require("utils/status");
var Humanize = require("utils/humanize");
/*
CONSTANTS
@ -34,10 +34,10 @@ define(function(require) {
var RESOURCE = "Service";
var XML_ROOT = "DOCUMENT";
var TAB_NAME = require('./tabId');
var TAB_NAME = require("./tabId");
var LABELS_COLUMN = 7;
var SEARCH_COLUMN = 8;
var TEMPLATE_ATTR = 'TEMPLATE';
var TEMPLATE_ATTR = "TEMPLATE";
/*
CONSTRUCTOR
@ -59,7 +59,7 @@ define(function(require) {
{"bSortable": false, "aTargets": ["check"]},
{"sWidth": "35px", "aTargets": [0]},
{"bVisible": true, "aTargets": SunstoneConfig.tabTableColumns(TAB_NAME)},
{"bVisible": false, "aTargets": ['_all']},
{"bVisible": false, "aTargets": ["_all"]},
{"sType": "num", "aTargets": [1]}
]
};
@ -70,7 +70,7 @@ define(function(require) {
Locale.tr("Group"),
Locale.tr("Name"),
Locale.tr("State"),
Locale.tr("Registration time"),
Locale.tr("Start time"),
Locale.tr("Labels"),
"search_data"
];
@ -110,22 +110,22 @@ define(function(require) {
UNAME: element.UNAME,
GNAME: element.GNAME,
STATE: state
}
};
var color_html = Status.state_lock_to_color("SERVICE",state, element_json[XML_ROOT]["LOCK"]);
return [
'<input class="check_item" type="checkbox" '+
'style="vertical-align: inherit;" id="'+this.resource.toLowerCase()+'_' +
element.ID + '" name="selected_items" value="' +
element.ID + '"/>'+color_html,
"<input class=\"check_item\" type=\"checkbox\" "+
"style=\"vertical-align: inherit;\" id=\""+this.resource.toLowerCase()+"_" +
element.ID + "\" name=\"selected_items\" value=\"" +
element.ID + "\"/>"+color_html,
element.ID,
element.UNAME,
element.GNAME,
element.NAME,
state,
Humanize.prettyTime(element.TEMPLATE.BODY['registration_time']),
(LabelsUtils.labelsStr(element[TEMPLATE_ATTR])||''),
Humanize.prettyTime(element.TEMPLATE.BODY["registration_time"]),
(LabelsUtils.labelsStr(element[TEMPLATE_ATTR])||""),
btoa(unescape(encodeURIComponent(JSON.stringify(search))))
];
}

2
src/sunstone/public/app/tabs/oneflow-services-tab/panels/info/html.hbs
View File

@ -29,7 +29,7 @@
</tr>
{{{renameTrHTML}}}
<tr>
<td class="key_td">{{tr "Register time"}}</td>
<td class="key_td">{{tr "Start time"}}</td>
<td class="value_td">{{prettyRegTime}}</td>
<td></td>
</tr>