etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

new UI - disk offering page, service offering page - check if $midmenuItem1, jsonObj is null before getting its property.

This commit is contained in:
Jessica Wang 2010-11-24 16:11:03 -08:00
parent e8eb8f4703
commit f546436682
2 changed files with 34 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
ui/scripts/cloud.core.diskoffering.js
View File

@ -130,9 +130,8 @@ function doEditDiskOffering($actionLink, $detailsTab, $midmenuItem1) {
});
}
function doEditDiskOffering2($actionLink, $detailsTab, $midmenuItem1, $readonlyFields, $editFields) {
var $detailsTab = $("#right_panel_content #tab_content_details");
var jsonObj = $detailsTab.data("jsonObj");
function doEditDiskOffering2($actionLink, $detailsTab, $midmenuItem1, $readonlyFields, $editFields) {
var jsonObj = $midmenuItem1.data("jsonObj");
var id = jsonObj.id;
// validate values
@ -185,12 +184,19 @@ function diskOfferingToRightPanel($midmenuItem1) {
}
function diskOfferingJsonToDetailsTab() {
var $midmenuItem1 = $("#right_panel_content").data("$midmenuItem1");
if($midmenuItem1 == null)
return;
var jsonObj = $midmenuItem1.data("jsonObj");
if(jsonObj == null)
return;
var $thisTab = $("#right_panel_content #tab_content_details");
$thisTab.find("#tab_container").hide();
$thisTab.find("#tab_spinning_wheel").show();
$thisTab.find("#tab_spinning_wheel").show();
var $midmenuItem1 = $("#right_panel_content").data("$midmenuItem1");
var id = $midmenuItem1.data("jsonObj").id;
var id = jsonObj.id;
var jsonObj;
$.ajax({
@ -201,11 +207,10 @@ function diskOfferingJsonToDetailsTab() {
var items = json.listdiskofferingsresponse.diskoffering;
if(items != null && items.length > 0)
jsonObj = items[0];
$midmenuItem1.data("jsonObj", jsonObj);
}
});
$thisTab.data("jsonObj", jsonObj);
$midmenuItem1.data("jsonObj", jsonObj);
});
$thisTab.find("#id").text(noNull(jsonObj.id));
$thisTab.find("#grid_header_title").text(fromdb(jsonObj.name));
@ -247,8 +252,9 @@ function diskOfferingClearRightPanel() {
}
function diskOfferingClearDetailsTab() {
var $thisTab = $("#right_panel_content #tab_content_details");
var $thisTab = $("#right_panel_content").find("#tab_content_details");
$thisTab.find("#id").text("");
$thisTab.find("#grid_header_title").text("");
$thisTab.find("#name").text("");
$thisTab.find("#name_edit").val("");
$thisTab.find("#displaytext").text("");

29
ui/scripts/cloud.core.serviceoffering.js
View File

@ -133,9 +133,8 @@ function doEditServiceOffering($actionLink, $detailsTab, $midmenuItem1) {
});
}
function doEditServiceOffering2($actionLink, $detailsTab, $midmenuItem1, $readonlyFields, $editFields) {
var $detailsTab = $("#right_panel_content #tab_content_details");
var jsonObj = $detailsTab.data("jsonObj");
function doEditServiceOffering2($actionLink, $detailsTab, $midmenuItem1, $readonlyFields, $editFields) {
var jsonObj = $midmenuItem1.data("jsonObj");
var id = jsonObj.id;
// validate values
@ -195,14 +194,20 @@ function serviceOfferingToRightPanel($midmenuItem1) {
}
function serviceOfferingJsonToDetailsTab() {
var $midmenuItem1 = $("#right_panel_content").data("$midmenuItem1");
if($midmenuItem1 == null)
return;
var jsonObj = $midmenuItem1.data("jsonObj");
if(jsonObj == null)
return;
var $thisTab = $("#right_panel_content #tab_content_details");
$thisTab.find("#tab_container").hide();
$thisTab.find("#tab_spinning_wheel").show();
var $midmenuItem1 = $("#right_panel_content").data("$midmenuItem1");
var id = $midmenuItem1.data("jsonObj").id;
var jsonObj;
var id = jsonObj.id;
$.ajax({
data: createURL("command=listServiceOfferings&id="+id),
dataType: "json",
@ -211,11 +216,10 @@ function serviceOfferingJsonToDetailsTab() {
var items = json.listserviceofferingsresponse.serviceoffering;
if(items != null && items.length > 0)
jsonObj = items[0];
$midmenuItem1.data("jsonObj", jsonObj);
}
});
$thisTab.data("jsonObj", jsonObj);
$midmenuItem1.data("jsonObj", jsonObj);
$thisTab.find("#id").text(noNull(jsonObj.id));
$thisTab.find("#grid_header_title").text(fromdb(jsonObj.name));
@ -256,7 +260,8 @@ function serviceOfferingClearRightPanel() {
function serviceOfferingClearDetailsTab() {
var $thisTab = $("#right_panel_content #tab_content_details");
$thisTab.find("#id").text("");
$thisTab.find("#id").text("");
$thisTab.find("#grid_header_title").text("");
$thisTab.find("#name").text("");
$thisTab.find("#name_edit").val("");
$thisTab.find("#displaytext").text("");