Revision ac5a4134
b/snf-cyclades-app/synnefo/ui/static/snf/js/models.js | ||
---|---|---|
1955 | 1955 |
if (index.disk.indexOf(disk_size) == -1) { |
1956 | 1956 |
var disk = el.disk_to_bytes(); |
1957 | 1957 |
if (disk > disk_available) { |
1958 |
index.disk.push(disk_size);
|
|
1958 |
index.disk.push(el.get('disk'));
|
|
1959 | 1959 |
} |
1960 | 1960 |
} |
1961 | 1961 |
|
... | ... | |
1989 | 1989 |
var img_size = size; |
1990 | 1990 |
var flv_size = el.get_disk_size(); |
1991 | 1991 |
if (flv_size < img_size) { |
1992 |
if (index.disk.indexOf(flv_size) == -1) {
|
|
1993 |
index.disk.push(flv_size);
|
|
1992 |
if (index.disk.indexOf(el.get("disk")) == -1) {
|
|
1993 |
index.disk.push(el.get("disk"));
|
|
1994 | 1994 |
} |
1995 | 1995 |
}; |
1996 | 1996 |
}); |
b/snf-cyclades-app/synnefo/ui/static/snf/js/ui/web/ui_create_view.js | ||
---|---|---|
617 | 617 |
} |
618 | 618 |
|
619 | 619 |
// not available for image |
620 |
if (self.unavailable_values && self.unavailable_values.disk.indexOf(existing.get_disk_size()) > -1) { |
|
621 |
return false |
|
620 |
if (self.unavailable_values && self.unavailable_values.disk.indexOf( |
|
621 |
existing.get("disk")) > -1) { |
|
622 |
return false |
|
622 | 623 |
} |
623 | 624 |
|
624 | 625 |
return key; |
... | ... | |
693 | 694 |
var existing = storage.flavors.get_flavor(flv.get("cpu"), flv.get("ram"), flv.get("disk"), flv.get("disk_template"), this.flavors); |
694 | 695 |
if (!existing) { return false }; |
695 | 696 |
|
696 |
if (this.unavailable_values && (this.unavailable_values.disk.indexOf(parseInt(flv.get("disk")) * 1000) > -1)) {
|
|
697 |
if (this.unavailable_values && (this.unavailable_values.disk.indexOf(parseInt(flv.get("disk"))) > -1)) { |
|
697 | 698 |
return false; |
698 | 699 |
} |
699 | 700 |
if (this.unavailable_values && (this.unavailable_values.ram.indexOf(parseInt(flv.get("ram"))) > -1)) { |
... | ... | |
750 | 751 |
if (!this.unavailable_values) { return } |
751 | 752 |
|
752 | 753 |
this.$("#create-vm-flavor-options .flavor-options.disk li").each(_.bind(function(i, el){ |
753 |
var el_value = $(el).data("value") * 1000;
|
|
754 |
var el_value = $(el).data("value"); |
|
754 | 755 |
if (this.unavailable_values.disk.indexOf(el_value) > -1) { |
755 | 756 |
$(el).addClass("disabled"); |
756 | 757 |
$(el).removeClass("selected"); |
Also available in: Unified diff