shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-03-25 02:50:08 +03:00
Code Releases Wiki Activity

F #4966: Add service template reg time (#466)

Browse Source
This commit is contained in:
Sergio Betanzos 2020-11-23 19:21:10 +01:00 committed by GitHub
parent fd3f1c8226
commit 8a3e5cb0da
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
12 changed files with 58 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/sunstone/etc/sunstone-views/kvm/admin.yaml
View File

@ -284,11 +284,12 @@ tabs:
table_columns:
- 0 # Checkbox
- 1 # ID
- 2 # Name
- 3 # Owner
- 4 # Group
#- 5 # Labels
#- 6 # Search data
- 2 # Owner
- 3 # Group
- 4 # Name
#- 5 # Registration time
#- 6 # Labels
#- 7 # Search data
actions:
ServiceTemplate.refresh: true
ServiceTemplate.create_dialog: true

11
src/sunstone/etc/sunstone-views/kvm/groupadmin.yaml
View File

@ -283,11 +283,12 @@ tabs:
table_columns:
- 0 # Checkbox
- 1 # ID
- 2 # Name
- 3 # Owner
- 4 # Group
#- 5 # Labels
#- 6 # Search data
- 2 # Owner
- 3 # Group
- 4 # Name
#- 5 # Registration time
#- 6 # Labels
#- 7 # Search data
actions:
ServiceTemplate.refresh: true
ServiceTemplate.create_dialog: false

5
src/sunstone/etc/sunstone-views/kvm/user.yaml
View File

@ -279,8 +279,9 @@ tabs:
- 2 # Owner
- 3 # Group
- 4 # Name
#- 5 # Labels
#- 6 # Search data
#- 5 # Registration time
#- 6 # Labels
#- 7 # Search data
actions:
ServiceTemplate.refresh: true
ServiceTemplate.create_dialog: true

11
src/sunstone/etc/sunstone-views/mixed/admin.yaml
View File

@ -284,11 +284,12 @@ tabs:
table_columns:
- 0 # Checkbox
- 1 # ID
- 2 # Name
- 3 # Owner
- 4 # Group
#- 5 # Labels
#- 6 # Search data
- 2 # Owner
- 3 # Group
- 4 # Name
#- 5 # Registration time
#- 6 # Labels
#- 7 # Search data
actions:
ServiceTemplate.refresh: true
ServiceTemplate.create_dialog: true

11
src/sunstone/etc/sunstone-views/mixed/groupadmin.yaml
View File

@ -283,11 +283,12 @@ tabs:
table_columns:
- 0 # Checkbox
- 1 # ID
- 2 # Name
- 3 # Owner
- 4 # Group
#- 5 # Labels
#- 6 # Search data
- 2 # Owner
- 3 # Group
- 4 # Name
#- 5 # Registration time
#- 6 # Labels
#- 7 # Search data
actions:
ServiceTemplate.refresh: true
ServiceTemplate.create_dialog: false

5
src/sunstone/etc/sunstone-views/mixed/user.yaml
View File

@ -279,8 +279,9 @@ tabs:
- 2 # Owner
- 3 # Group
- 4 # Name
#- 5 # Labels
#- 6 # Search data
#- 5 # Registration time
#- 6 # Labels
#- 7 # Search data
actions:
ServiceTemplate.refresh: true
ServiceTemplate.create_dialog: true

11
src/sunstone/etc/sunstone-views/vcenter/admin.yaml
View File

@ -282,11 +282,12 @@ tabs:
table_columns:
- 0 # Checkbox
- 1 # ID
- 2 # Name
- 3 # Owner
- 4 # Group
#- 5 # Labels
#- 6 # Search data
- 2 # Owner
- 3 # Group
- 4 # Name
#- 5 # Registration time
#- 6 # Labels
#- 7 # Search data
actions:
ServiceTemplate.refresh: true
ServiceTemplate.create_dialog: true

11
src/sunstone/etc/sunstone-views/vcenter/groupadmin.yaml
View File

@ -283,11 +283,12 @@ tabs:
table_columns:
- 0 # Checkbox
- 1 # ID
- 2 # Name
- 3 # Owner
- 4 # Group
#- 5 # Labels
#- 6 # Search data
- 2 # Owner
- 3 # Group
- 4 # Name
#- 5 # Registration time
#- 6 # Labels
#- 7 # Search data
actions:
ServiceTemplate.refresh: true
ServiceTemplate.create_dialog: false

5
src/sunstone/etc/sunstone-views/vcenter/user.yaml
View File

@ -279,8 +279,9 @@ tabs:
- 2 # Owner
- 3 # Group
- 4 # Name
#- 5 # Labels
#- 6 # Search data
#- 5 # Registration time
#- 6 # Labels
#- 7 # Search data
actions:
ServiceTemplate.refresh: true
ServiceTemplate.create_dialog: true

7
src/sunstone/public/app/tabs/oneflow-templates-tab/datatable.js
View File

@ -20,6 +20,7 @@ define(function(require) {
*/
var TabDataTable = require('utils/tab-datatable');
var Humanize = require('utils/humanize');
var SunstoneConfig = require('sunstone-config');
var Locale = require('utils/locale');
var LabelsUtils = require('utils/labels/utils');
@ -33,8 +34,8 @@ define(function(require) {
var RESOURCE = "ServiceTemplate";
var XML_ROOT = "DOCUMENT";
var TAB_NAME = require('./tabId');
var LABELS_COLUMN = 5;
var SEARCH_COLUMN = 6;
var LABELS_COLUMN = 6;
var SEARCH_COLUMN = 7;
var TEMPLATE_ATTR = 'TEMPLATE';
/*
@ -67,6 +68,7 @@ define(function(require) {
Locale.tr("Owner"),
Locale.tr("Group"),
Locale.tr("Name"),
Locale.tr("Registration time"),
Locale.tr("Labels"),
"search_data"
];
@ -113,6 +115,7 @@ define(function(require) {
element.UNAME,
element.GNAME,
element.NAME,
Humanize.prettyTime(element.TEMPLATE.BODY['registration_time']),
(LabelsUtils.labelsStr(element[TEMPLATE_ATTR])||''),
btoa(unescape(encodeURIComponent(JSON.stringify(search))))
];

4
src/sunstone/public/app/tabs/oneflow-templates-tab/panels/info.js
View File

@ -20,6 +20,7 @@ define(function(require) {
*/
var Locale = require('utils/locale');
var Humanize = require('utils/humanize');
var RenameTr = require('utils/panel/rename-tr');
var PermissionsTable = require('utils/panel/permissions-table');
@ -66,7 +67,7 @@ define(function(require) {
var renameTrHTML = RenameTr.html(TAB_ID, RESOURCE, this.element.NAME);
var permissionsTableHTML = PermissionsTable.html(TAB_ID, RESOURCE, this.element);
var prettyRegTime = Humanize.prettyTime(this.element.TEMPLATE.BODY['registration_time']);
var customAttrs = [];
if ( ! $.isEmptyObject( this.element.TEMPLATE.BODY['custom_attrs'] ) ) {
@ -103,6 +104,7 @@ define(function(require) {
return TemplateHTML({
'element': this.element,
'prettyRegTime': prettyRegTime,
'renameTrHTML': renameTrHTML,
'permissionsTableHTML': permissionsTableHTML,
'customAttrs': customAttrs

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

@ -28,6 +28,11 @@
<td class="value_td" colspan="2">{{element.ID}}</td>
</tr>
{{{renameTrHTML}}}
<tr>
<td class="key_td">{{tr "Register time"}}</td>
<td class="value_td">{{prettyRegTime}}</td>
<td></td>
</tr>
<tr>
<td class="key_td">{{tr "Description"}}</td>
<td class="value_td" colspan="2">{{element.TEMPLATE.BODY.description}}</td>