1
0
mirror of https://github.com/OpenNebula/one.git synced 2025-01-06 13:17:42 +03:00

Solves bugs:

* issue with DISK_COST attribute for regaular users (cherry picked from commit 8353763bc7)

  * IPv6 remove attribute from AR (cherry picked from commit 54ecd1e2ab)
This commit is contained in:
abelCoronado93 2017-03-23 10:39:17 +01:00 committed by Ruben S. Montero
parent 11b636133a
commit 5e9dbba515
3 changed files with 3 additions and 3 deletions

View File

@ -182,7 +182,7 @@ define(function(require) {
templateJSON["DISK_COST"] = templateJSON["DISK_COST"] * 1024;
}
else{
templateJSON["DISK_COST"] = "0";
delete templateJSON["MEMORY_UNIT_COST"];
}
if(templateJSON["MEMORY_UNIT_COST"] == "GB")
templateJSON["MEMORY_COST"] = templateJSON["MEMORY_COST"] * 1024;

View File

@ -106,7 +106,7 @@
<div class="row">
<div class="medium-6 columns">
<label for="IP6_GLOBAL">
{{tr "Global address"}}
{{tr "IP"}}
</label>
<input type="text" wizard_field="IP6_GLOBAL" id="IP6_GLOBAL" name="IP6_GLOBAL" size="3" />
</div>

View File

@ -44,7 +44,7 @@
<div class="row collapse ar_input type_ip4_6 type_ip6 switch left">
<label for="{{str_ar_tab_id}}_">{{tr "SLAAC"}}
</label>
<input class="switch-input slaac" wizard_field="SLAAC" name="SLAAC" id="{{str_ar_tab_id}}_slaac" type="checkbox">
<input class="switch-input slaac" id="{{str_ar_tab_id}}_slaac" type="checkbox">
<label class="switch-paddle" for="{{str_ar_tab_id}}_slaac">
</label>
</div>