mirror of
https://github.com/OpenNebula/one.git
synced 2026-11-20 20:02:38 +09:00
feature #3306: Fix template-tab.js merge
This commit is contained in:
1 parent
713a09b7a1
commit
f154facff4
1 file changed
+1
-5
@@ -2461,10 +2461,6 @@ function setup_disk_tab_content(disk_section, str_disk_tab_id) {
|
||||
size_input.val(10);
|
||||
update_final_size_input();
|
||||
|
||||
if (Config.isTemplateCreationTabEnabled('network')){
|
||||
str += "<dd class='hypervisor only_kvm only_vmware only_xen only_vcenter'><a href='#networkTab'><i class='fa fa-globe'></i><br>"+tr("Network")+"</a></dd>";
|
||||
}
|
||||
|
||||
// init::start is ignored for some reason
|
||||
size_slider.val(1000);
|
||||
|
||||
@@ -2896,7 +2892,7 @@ function wizard_tab_dd(){
|
||||
}
|
||||
|
||||
if (Config.isTemplateCreationTabEnabled('network')){
|
||||
str += "<dd class='hypervisor only_kvm only_vmware only_xen'><a href='#networkTab'><i class='fa fa-globe'></i><br>"+tr("Network")+"</a></dd>";
|
||||
str += "<dd class='hypervisor only_kvm only_vmware only_xen only_vcenter'><a href='#networkTab'><i class='fa fa-globe'></i><br>"+tr("Network")+"</a></dd>";
|
||||
}
|
||||
|
||||
if (Config.isTemplateCreationTabEnabled('os_booting')){
|
||||
|
||||
Reference in new issue
Block a user