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

M #-: Remove stashed tags

Browse Source
This commit is contained in:
Tino Vazquez 2020-05-05 18:01:23 +02:00
parent 5b1b2d4868
commit ebe6755fac
No known key found for this signature in database
GPG Key ID: 2FE9C32E94AEABBE
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/general/capacity-create.js
View File

@ -145,8 +145,6 @@ define(function(require) {
_totalCost();
}
<<<<<<< Updated upstream
=======
function _generateCores(context){
$('#CORES_PER_SOCKET').find('option').remove();
$("#CORES_PER_SOCKET", context).append($('<option>').val("").text(""));
@ -173,7 +171,6 @@ define(function(require) {
}
>>>>>>> Stashed changes
function _setup(context) {
context.on("change", "#MEMORY", function() {
_calculatedRealMemory(context);
@ -199,7 +196,7 @@ define(function(require) {
context.on("change", "#CORES_PER_SOCKET", function(){
_calculateSockets(context);
});
// MB to GB
context.on("input", "div.memory_input input", function(){
$("div.memory_gb_input input", context).val(_m2g(this.value));