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

F #1377: Resolved Bugs

Browse Source
This commit is contained in:
juanmont 2018-01-24 17:04:17 +01:00 committed by Ruben S. Montero
parent 6d86753f64
commit 5399f21a8e
9 changed files with 34 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/sunstone/public/app/sunstone.js
View File

@ -430,6 +430,10 @@ define(function(require) {
$("button[data-toggle=" + customId + "lock_buttons]", actionBlock).remove(); $("button[data-toggle=" + customId + "lock_buttons]", actionBlock).remove();
} }
if ($("#" + customId + "vmspause_buttons li", actionBlock).length == 0) {
$("button[data-toggle=" + customId + "vmspause_buttons]", actionBlock).remove();
}
if ($("#" + customId + "vmsrepeat_buttons li", actionBlock).length == 0) { if ($("#" + customId + "vmsrepeat_buttons li", actionBlock).length == 0) {
$("button[data-toggle=" + customId + "vmsrepeat_buttons]", actionBlock).remove(); $("button[data-toggle=" + customId + "vmsrepeat_buttons]", actionBlock).remove();
} }

8
src/sunstone/public/app/tabs/images-tab/buttons.js
View File

@ -87,25 +87,25 @@ define(function(require) {
}, },
"Image.lockA" : { "Image.lockA" : {
type: "action", type: "action",
text: Locale.tr("Admin") + "<span class='right'>&nbsp;" + Tips.html(Locale.tr("Lock Admin actions")) + "</span>", text: Locale.tr("Admin"),
layout: "lock_buttons", layout: "lock_buttons",
data: 3 data: 3
}, },
"Image.lockM" : { "Image.lockM" : {
type: "action", type: "action",
text: Locale.tr("Manage") + "<span class='right'>&nbsp;" + Tips.html(Locale.tr("Lock Manage actions")) + "</span>", text: Locale.tr("Manage"),
layout: "lock_buttons", layout: "lock_buttons",
data: 2 data: 2
}, },
"Image.lockU" : { "Image.lockU" : {
type: "action", type: "action",
text: Locale.tr("Use") + "<span class='right'>&nbsp;" + Tips.html(Locale.tr("Lock Use actions")) + "</span>", text: Locale.tr("Use"),
layout: "lock_buttons", layout: "lock_buttons",
data: 1 data: 1
}, },
"Image.unlock" : { "Image.unlock" : {
type: "action", type: "action",
text: Locale.tr("Unlock") + "<span class='right'>&nbsp;" + Tips.html(Locale.tr("Unlock all actions")) + "</span>", text: Locale.tr("Unlock"),
layout: "lock_buttons" layout: "lock_buttons"
} }
} }

8
src/sunstone/public/app/tabs/marketplaceapps-tab/buttons.js
View File

@ -70,25 +70,25 @@ define(function(require) {
}, },
"MarketPlaceApp.lockA" : { "MarketPlaceApp.lockA" : {
type: "action", type: "action",
text: Locale.tr("Admin") + "<span class='right'>&nbsp;" + Tips.html(Locale.tr("Lock Admin actions")) + "</span>", text: Locale.tr("Admin"),
layout: "lock_buttons", layout: "lock_buttons",
data: 3 data: 3
}, },
"MarketPlaceApp.lockM" : { "MarketPlaceApp.lockM" : {
type: "action", type: "action",
text: Locale.tr("Manage") + "<span class='right'>&nbsp;" + Tips.html(Locale.tr("Lock Manage actions")) + "</span>", text: Locale.tr("Manage"),
layout: "lock_buttons", layout: "lock_buttons",
data: 2 data: 2
}, },
"MarketPlaceApp.lockU" : { "MarketPlaceApp.lockU" : {
type: "action", type: "action",
text: Locale.tr("Use") + "<span class='right'>&nbsp;" + Tips.html(Locale.tr("Lock Use actions")) + "</span>", text: Locale.tr("Use"),
layout: "lock_buttons", layout: "lock_buttons",
data: 1 data: 1
}, },
"MarketPlaceApp.unlock" : { "MarketPlaceApp.unlock" : {
type: "action", type: "action",
text: Locale.tr("Unlock") + "<span class='right'>&nbsp;" + Tips.html(Locale.tr("Unlock all actions")) + "</span>", text: Locale.tr("Unlock"),
layout: "lock_buttons" layout: "lock_buttons"
} }
}; };

8
src/sunstone/public/app/tabs/templates-tab/buttons.js
View File

@ -86,25 +86,25 @@ define(function(require) {
}, },
"Template.lockA" : { "Template.lockA" : {
type: "action", type: "action",
text: Locale.tr("Admin") + "<span class='right'>&nbsp;" + Tips.html(Locale.tr("Lock Admin actions")) + "</span>", text: Locale.tr("Admin"),
layout: "lock_buttons", layout: "lock_buttons",
data: 3 data: 3
}, },
"Template.lockM" : { "Template.lockM" : {
type: "action", type: "action",
text: Locale.tr("Manage") + "<span class='right'>&nbsp;" + Tips.html(Locale.tr("Lock Manage actions")) + "</span>", text: Locale.tr("Manage"),
layout: "lock_buttons", layout: "lock_buttons",
data: 2 data: 2
}, },
"Template.lockU" : { "Template.lockU" : {
type: "action", type: "action",
text: Locale.tr("Use") + "<span class='right'>&nbsp;" + Tips.html(Locale.tr("Lock Use actions")) + "</span>", text: Locale.tr("Use"),
layout: "lock_buttons", layout: "lock_buttons",
data: 1 data: 1
}, },
"Template.unlock" : { "Template.unlock" : {
type: "action", type: "action",
text: Locale.tr("Unlock") + "<span class='right'>&nbsp;" + Tips.html(Locale.tr("Unlock all actions")) + "</span>", text: Locale.tr("Unlock"),
layout: "lock_buttons" layout: "lock_buttons"
} }
}; };

8
src/sunstone/public/app/tabs/vmgroup-tab/buttons.js
View File

@ -55,25 +55,25 @@ define(function(require) {
}, },
"VMGroup.lockA" : { "VMGroup.lockA" : {
type: "action", type: "action",
text: Locale.tr("Admin") + "<span class='right'>&nbsp;" + Tips.html(Locale.tr("Lock Admin actions")) + "</span>", text: Locale.tr("Admin"),
layout: "lock_buttons", layout: "lock_buttons",
data: 3 data: 3
}, },
"VMGroup.lockM" : { "VMGroup.lockM" : {
type: "action", type: "action",
text: Locale.tr("Manage") + "<span class='right'>&nbsp;" + Tips.html(Locale.tr("Lock Manage actions")) + "</span>", text: Locale.tr("Manage"),
layout: "lock_buttons", layout: "lock_buttons",
data: 2 data: 2
}, },
"VMGroup.lockU" : { "VMGroup.lockU" : {
type: "action", type: "action",
text: Locale.tr("Use") + "<span class='right'>&nbsp;" + Tips.html(Locale.tr("Lock Use actions")) + "</span>", text: Locale.tr("Use"),
layout: "lock_buttons", layout: "lock_buttons",
data: 1 data: 1
}, },
"VMGroup.unlock" : { "VMGroup.unlock" : {
type: "action", type: "action",
text: Locale.tr("Unlock") + "<span class='right'>&nbsp;" + Tips.html(Locale.tr("Unlock all actions")) + "</span>", text: Locale.tr("Unlock"),
layout: "lock_buttons" layout: "lock_buttons"
}/*, }/*,
"VMGroup.edit_labels" : { "VMGroup.edit_labels" : {

8
src/sunstone/public/app/tabs/vms-tab/buttons.js
View File

@ -200,25 +200,25 @@ define(function(require) {
}, },
"VM.lockA" : { "VM.lockA" : {
type: "action", type: "action",
text: Locale.tr("Admin") + "<span class='right'>&nbsp;" + Tips.html(Locale.tr("Lock Admin actions")) + "</span>", text: Locale.tr("Admin"),
layout: "lock_buttons", layout: "lock_buttons",
data: 3 data: 3
}, },
"VM.lockM" : { "VM.lockM" : {
type: "action", type: "action",
text: Locale.tr("Manage") + "<span class='right'>&nbsp;" + Tips.html(Locale.tr("Lock Manage actions")) + "</span>", text: Locale.tr("Manage"),
layout: "lock_buttons", layout: "lock_buttons",
data: 2 data: 2
}, },
"VM.lockU" : { "VM.lockU" : {
type: "action", type: "action",
text: Locale.tr("Use") + "<span class='right'>&nbsp;" + Tips.html(Locale.tr("Lock Use actions")) + "</span>", text: Locale.tr("Use"),
layout: "lock_buttons", layout: "lock_buttons",
data: 1 data: 1
}, },
"VM.unlock" : { "VM.unlock" : {
type: "action", type: "action",
text: Locale.tr("Unlock") + "<span class='right'>&nbsp;" + Tips.html(Locale.tr("Unlock all actions")) + "</span>", text: Locale.tr("Unlock"),
layout: "lock_buttons" layout: "lock_buttons"
} }
} }

5
src/sunstone/public/app/tabs/vms-tab/hooks/header.js
View File

@ -49,10 +49,9 @@ define(function(require) {
$('.resource-info-header-small', '#' + TAB_ID).text(state); $('.resource-info-header-small', '#' + TAB_ID).text(state);
if (element.LOCK){ if (element.LOCK){
$('.resource-lock-header-small', '#' + TAB_ID).html("<i class='header-title fa fa-lock'> "+Locale.tr(Humanize.lock_to_str(element.LOCK.LOCKED))+"</i>"); $('.resource-lock-header-small', '#' + contextTabId).html("<span data-tooltip aria-haspopup='true' class='has-tip' data-disable-hover='false' tabindex='1' title="+Locale.tr(Humanize.lock_to_str(element.LOCK.LOCKED))+"><i class='fa fa-lock fa-2x'/></span>");
$('.resource-lock-header-small', '#' + TAB_ID).show();
} else { } else {
$('.resource-lock-header-small', '#' + TAB_ID).hide(); $('.resource-lock-header-small', '#' + contextTabId).html("<i style='color: #cacedd;' class='fa fa-unlock-alt fa-2x'/>");
} }
} }

8
src/sunstone/public/app/tabs/vnets-tab/buttons.js
View File

@ -77,25 +77,25 @@ define(function(require) {
}, },
"Network.lockA" : { "Network.lockA" : {
type: "action", type: "action",
text: Locale.tr("Admin") + "<span class='right'>&nbsp;" + Tips.html(Locale.tr("Lock Admin actions")) + "</span>", text: Locale.tr("Admin"),
layout: "lock_buttons", layout: "lock_buttons",
data: 3 data: 3
}, },
"Network.lockM" : { "Network.lockM" : {
type: "action", type: "action",
text: Locale.tr("Manage") + "<span class='right'>&nbsp;" + Tips.html(Locale.tr("Lock Manage actions")) + "</span>", text: Locale.tr("Manage"),
layout: "lock_buttons", layout: "lock_buttons",
data: 2 data: 2
}, },
"Network.lockU" : { "Network.lockU" : {
type: "action", type: "action",
text: Locale.tr("Use") + "<span class='right'>&nbsp;" + Tips.html(Locale.tr("Lock Use actions")) + "</span>", text: Locale.tr("Use"),
layout: "lock_buttons", layout: "lock_buttons",
data: 1 data: 1
}, },
"Network.unlock" : { "Network.unlock" : {
type: "action", type: "action",
text: Locale.tr("Unlock") + "<span class='right'>&nbsp;" + Tips.html(Locale.tr("Unlock all actions")) + "</span>", text: Locale.tr("Unlock"),
layout: "lock_buttons" layout: "lock_buttons"
} }
}; };

8
src/sunstone/public/app/tabs/vrouters-tab/buttons.js
View File

@ -57,25 +57,25 @@ define(function(require) {
}, },
"VirtualRouter.lockA" : { "VirtualRouter.lockA" : {
type: "action", type: "action",
text: Locale.tr("Admin") + "<span class='right'>&nbsp;" + Tips.html(Locale.tr("Lock Admin actions")) + "</span>", text: Locale.tr("Admin"),
layout: "lock_buttons", layout: "lock_buttons",
data: 3 data: 3
}, },
"VirtualRouter.lockM" : { "VirtualRouter.lockM" : {
type: "action", type: "action",
text: Locale.tr("Manage") + "<span class='right'>&nbsp;" + Tips.html(Locale.tr("Lock Manage actions")) + "</span>", text: Locale.tr("Manage"),
layout: "lock_buttons", layout: "lock_buttons",
data: 2 data: 2
}, },
"VirtualRouter.lockU" : { "VirtualRouter.lockU" : {
type: "action", type: "action",
text: Locale.tr("Use") + "<span class='right'>&nbsp;" + Tips.html(Locale.tr("Lock Use actions")) + "</span>", text: Locale.tr("Use"),
layout: "lock_buttons", layout: "lock_buttons",
data: 1 data: 1
}, },
"VirtualRouter.unlock" : { "VirtualRouter.unlock" : {
type: "action", type: "action",
text: Locale.tr("Unlock") + "<span class='right'>&nbsp;" + Tips.html(Locale.tr("Unlock all actions")) + "</span>", text: Locale.tr("Unlock"),
layout: "lock_buttons" layout: "lock_buttons"
} }
}; };