mirror of
https://github.com/OpenNebula/one.git
synced 2025-01-25 06:03:36 +03:00
This reverts commit 1bcd3832bdf250f4ce6719e8ed85a0759917c7b3. This reverts commit 9e68ee24d7078650203ffb79f43f232958e0359f.
This commit is contained in:
parent
dba279a963
commit
83256b1bec
@ -406,7 +406,6 @@ tabs:
|
|||||||
VM.unlock: true
|
VM.unlock: true
|
||||||
VM.edit_labels: true
|
VM.edit_labels: true
|
||||||
VM.menu_labels: true
|
VM.menu_labels: true
|
||||||
autorefresh_info: 5000 # ms
|
|
||||||
oneflow-services-tab:
|
oneflow-services-tab:
|
||||||
panel_tabs:
|
panel_tabs:
|
||||||
service_info_tab: true
|
service_info_tab: true
|
||||||
|
@ -405,7 +405,6 @@ tabs:
|
|||||||
VM.unlock: true
|
VM.unlock: true
|
||||||
VM.edit_labels: true
|
VM.edit_labels: true
|
||||||
VM.menu_labels: true
|
VM.menu_labels: true
|
||||||
autorefresh_info: 5000 # ms
|
|
||||||
oneflow-services-tab:
|
oneflow-services-tab:
|
||||||
panel_tabs:
|
panel_tabs:
|
||||||
service_info_tab: true
|
service_info_tab: true
|
||||||
|
@ -398,7 +398,6 @@ tabs:
|
|||||||
VM.unlock: true
|
VM.unlock: true
|
||||||
VM.edit_labels: true
|
VM.edit_labels: true
|
||||||
VM.menu_labels: true
|
VM.menu_labels: true
|
||||||
autorefresh_info: 5000 # ms
|
|
||||||
oneflow-services-tab:
|
oneflow-services-tab:
|
||||||
panel_tabs:
|
panel_tabs:
|
||||||
service_info_tab: true
|
service_info_tab: true
|
||||||
|
@ -406,7 +406,6 @@ tabs:
|
|||||||
VM.unlock: true
|
VM.unlock: true
|
||||||
VM.edit_labels: true
|
VM.edit_labels: true
|
||||||
VM.menu_labels: true
|
VM.menu_labels: true
|
||||||
autorefresh_info: 5000 # ms
|
|
||||||
oneflow-services-tab:
|
oneflow-services-tab:
|
||||||
panel_tabs:
|
panel_tabs:
|
||||||
service_info_tab: true
|
service_info_tab: true
|
||||||
|
@ -405,7 +405,6 @@ tabs:
|
|||||||
VM.unlock: true
|
VM.unlock: true
|
||||||
VM.edit_labels: true
|
VM.edit_labels: true
|
||||||
VM.menu_labels: true
|
VM.menu_labels: true
|
||||||
autorefresh_info: 5000 # ms
|
|
||||||
oneflow-services-tab:
|
oneflow-services-tab:
|
||||||
panel_tabs:
|
panel_tabs:
|
||||||
service_info_tab: true
|
service_info_tab: true
|
||||||
|
@ -398,7 +398,6 @@ tabs:
|
|||||||
VM.unlock: true
|
VM.unlock: true
|
||||||
VM.edit_labels: true
|
VM.edit_labels: true
|
||||||
VM.menu_labels: true
|
VM.menu_labels: true
|
||||||
autorefresh_info: 5000 # ms
|
|
||||||
oneflow-services-tab:
|
oneflow-services-tab:
|
||||||
panel_tabs:
|
panel_tabs:
|
||||||
service_info_tab: true
|
service_info_tab: true
|
||||||
|
@ -404,7 +404,6 @@ tabs:
|
|||||||
VM.unlock: true
|
VM.unlock: true
|
||||||
VM.edit_labels: true
|
VM.edit_labels: true
|
||||||
VM.menu_labels: true
|
VM.menu_labels: true
|
||||||
autorefresh_info: 5000 # ms
|
|
||||||
oneflow-services-tab:
|
oneflow-services-tab:
|
||||||
panel_tabs:
|
panel_tabs:
|
||||||
service_info_tab: true
|
service_info_tab: true
|
||||||
|
@ -405,7 +405,6 @@ tabs:
|
|||||||
VM.unlock: true
|
VM.unlock: true
|
||||||
VM.edit_labels: true
|
VM.edit_labels: true
|
||||||
VM.menu_labels: true
|
VM.menu_labels: true
|
||||||
autorefresh_info: 5000 # ms
|
|
||||||
oneflow-services-tab:
|
oneflow-services-tab:
|
||||||
panel_tabs:
|
panel_tabs:
|
||||||
service_info_tab: true
|
service_info_tab: true
|
||||||
|
@ -398,7 +398,6 @@ tabs:
|
|||||||
VM.unlock: true
|
VM.unlock: true
|
||||||
VM.edit_labels: true
|
VM.edit_labels: true
|
||||||
VM.menu_labels: true
|
VM.menu_labels: true
|
||||||
autorefresh_info: 5000 # ms
|
|
||||||
oneflow-services-tab:
|
oneflow-services-tab:
|
||||||
panel_tabs:
|
panel_tabs:
|
||||||
service_info_tab: true
|
service_info_tab: true
|
||||||
|
@ -130,10 +130,6 @@ define(function(require) {
|
|||||||
return _config['user_config']["table_order"];
|
return _config['user_config']["table_order"];
|
||||||
},
|
},
|
||||||
|
|
||||||
"autorefreshInfo": function(tabName) {
|
|
||||||
return _config['view']['tabs'][tabName]['autorefresh_info'] || 10000;
|
|
||||||
},
|
|
||||||
|
|
||||||
"provision": {
|
"provision": {
|
||||||
"dashboard": {
|
"dashboard": {
|
||||||
"isEnabled": function(widget) {
|
"isEnabled": function(widget) {
|
||||||
|
@ -1185,11 +1185,7 @@ define(function(require) {
|
|||||||
};
|
};
|
||||||
|
|
||||||
var _rightInfoVisible = function(context) {
|
var _rightInfoVisible = function(context) {
|
||||||
return $(".sunstone-info", context).is(":visible")
|
return $(".sunstone-info", context).is(":visible");
|
||||||
};
|
|
||||||
|
|
||||||
var _infoTabVisible = function(context, tab) {
|
|
||||||
return $(tab, $(".sunstone-info", context)).is(":visible")
|
|
||||||
};
|
};
|
||||||
|
|
||||||
var _rightListVisible = function(context) {
|
var _rightListVisible = function(context) {
|
||||||
@ -1289,7 +1285,6 @@ define(function(require) {
|
|||||||
|
|
||||||
|
|
||||||
"rightInfoVisible": _rightInfoVisible,
|
"rightInfoVisible": _rightInfoVisible,
|
||||||
"infoTabVisible": _infoTabVisible,
|
|
||||||
"rightListVisible": _rightListVisible,
|
"rightListVisible": _rightListVisible,
|
||||||
"rightInfoResourceId": _rightInfoResourceId,
|
"rightInfoResourceId": _rightInfoResourceId,
|
||||||
|
|
||||||
|
@ -122,7 +122,6 @@ define(function(require) {
|
|||||||
$(context).off("click", "#import_vcenter_images");
|
$(context).off("click", "#import_vcenter_images");
|
||||||
$(context).on("click", "#import_vcenter_images", function(){
|
$(context).on("click", "#import_vcenter_images", function(){
|
||||||
that.vCenterImages.import(context);
|
that.vCenterImages.import(context);
|
||||||
$("#images-tabrefresh_buttons button").click();
|
|
||||||
return false;
|
return false;
|
||||||
});
|
});
|
||||||
|
|
||||||
|
@ -116,7 +116,6 @@ define(function(require) {
|
|||||||
$(context).off("click", "#import_vcenter_templates");
|
$(context).off("click", "#import_vcenter_templates");
|
||||||
$(context).on("click", "#import_vcenter_templates", function(){
|
$(context).on("click", "#import_vcenter_templates", function(){
|
||||||
that.vCenterTemplates.import(context);
|
that.vCenterTemplates.import(context);
|
||||||
$("#templates-tabrefresh_buttons button").click();
|
|
||||||
return false;
|
return false;
|
||||||
});
|
});
|
||||||
|
|
||||||
|
@ -27,8 +27,8 @@ define(function(require) {
|
|||||||
var TemplateTableVcenter = require("utils/panel/template-table");
|
var TemplateTableVcenter = require("utils/panel/template-table");
|
||||||
var OpenNebula = require("opennebula");
|
var OpenNebula = require("opennebula");
|
||||||
var Sunstone = require("sunstone");
|
var Sunstone = require("sunstone");
|
||||||
var Navigation = require("utils/navigation");
|
|
||||||
var Config = require("sunstone-config");
|
var Config = require("sunstone-config");
|
||||||
|
var Navigation = require("utils/navigation");
|
||||||
|
|
||||||
/*
|
/*
|
||||||
TEMPLATES
|
TEMPLATES
|
||||||
@ -45,13 +45,6 @@ define(function(require) {
|
|||||||
var RESOURCE = "VM";
|
var RESOURCE = "VM";
|
||||||
var XML_ROOT = "VM";
|
var XML_ROOT = "VM";
|
||||||
|
|
||||||
setInterval(function() {
|
|
||||||
var tab = $('#' + TAB_ID);
|
|
||||||
if (Sunstone.infoTabVisible(tab, "#vm_info_tab")){
|
|
||||||
$("#vms-tabrefresh_buttons button").click();
|
|
||||||
}
|
|
||||||
}, Config.autorefreshInfo("vms-tab"));
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
CONSTRUCTOR
|
CONSTRUCTOR
|
||||||
*/
|
*/
|
||||||
@ -174,6 +167,5 @@ define(function(require) {
|
|||||||
|
|
||||||
TemplateTable.setup(strippedTemplate, RESOURCE, this.element.ID, context, unshownValues, strippedTemplateVcenter);
|
TemplateTable.setup(strippedTemplate, RESOURCE, this.element.ID, context, unshownValues, strippedTemplateVcenter);
|
||||||
TemplateTableVcenter.setup(strippedTemplateVcenter, RESOURCE, this.element.ID, context, unshownValues, strippedTemplate);
|
TemplateTableVcenter.setup(strippedTemplateVcenter, RESOURCE, this.element.ID, context, unshownValues, strippedTemplate);
|
||||||
|
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
@ -115,7 +115,6 @@ define(function(require) {
|
|||||||
$(context).off("click", "#import_vcenter_networks");
|
$(context).off("click", "#import_vcenter_networks");
|
||||||
$(context).on("click", "#import_vcenter_networks", function(){
|
$(context).on("click", "#import_vcenter_networks", function(){
|
||||||
that.vCenterNetworks.import(context);
|
that.vCenterNetworks.import(context);
|
||||||
$("#vnets-tabrefresh_buttons button").click();
|
|
||||||
return false;
|
return false;
|
||||||
});
|
});
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user