CLOUDSTACK-110: cloudstack UI - domain page - allow root domain to have Edit option, but only network domain field is editable, Resource Limits fields and domain name field is not editable.

ui/scripts/domains.js

@@ -97,18 +97,28 @@
             },
             action: function(args) {
               var domainObj;
-              var array1 = [];
+							
-              array1.push("&name=" + todb(args.data.name));
+							var data = {
-              array1.push("&networkdomain=" + todb(args.data.networkdomain));
+							  id: args.context.domains[0].id,
+							  networkdomain: args.data.networkdomain
+							};
+														
+							if(args.data.name != null) {
+							  $.extend(data, {
+								  name: args.data.name
+								});
+							}							             
+							
               $.ajax({
-                url: createURL("updateDomain&id=" + args.context.domains[0].id + array1.join("")),
+                url: createURL("updateDomain"),
                 async: false,
-                dataType: "json",
+                data: data,
                 success: function(json) {
                   domainObj = json.updatedomainresponse.domain;
                 }
               });
 
+							if(args.data.vmLimit != null) {
 								$.ajax({
 									url: createURL("updateResourceLimit&domainid=" + args.context.domains[0].id + "&resourceType=0&max=" + args.data.vmLimit),
 									dataType: "json",
@@ -117,6 +127,9 @@
 										domainObj["vmLimit"] = args.data.vmLimit;
 									}
 								});
+							}
+							
+							if(args.data.ipLimit != null) {
 								$.ajax({
 									url: createURL("updateResourceLimit&domainid=" + args.context.domains[0].id + "&resourceType=1&max=" + args.data.ipLimit),
 									dataType: "json",
@@ -125,6 +138,9 @@
 										domainObj["ipLimit"] = args.data.ipLimit;
 									}
 								});
+							}
+
+              if(args.data.volumeLimit != null) {							
 								$.ajax({
 									url: createURL("updateResourceLimit&domainid=" + args.context.domains[0].id + "&resourceType=2&max=" + args.data.volumeLimit),
 									dataType: "json",
@@ -133,6 +149,9 @@
 										domainObj["volumeLimit"] = args.data.volumeLimit;
 									}
 								});
+							}
+
+              if(args.data.snapshotLimit != null) {						
 								$.ajax({
 									url: createURL("updateResourceLimit&domainid=" + args.context.domains[0].id + "&resourceType=3&max=" + args.data.snapshotLimit),
 									dataType: "json",
@@ -141,6 +160,9 @@
 										domainObj["snapshotLimit"] = args.data.snapshotLimit;
 									}
 								});
+							}
+
+              if(args.data.templateLimit != null) {							
 								$.ajax({
 									url: createURL("updateResourceLimit&domainid=" + args.context.domains[0].id + "&resourceType=4&max=" + args.data.templateLimit),
 									dataType: "json",
@@ -149,6 +171,9 @@
 										domainObj["templateLimit"] = args.data.templateLimit;
 									}
 								});
+							}
+
+              if(args.data.vpcLimit != null) {						
 								$.ajax({
 									url: createURL("updateResourceLimit&domainid=" + args.context.domains[0].id + "&resourceType=7&max=" + args.data.vpcLimit),
 									dataType: "json",
@@ -157,6 +182,7 @@
 										domainObj["vpcLimit"] = args.data.vpcLimit;
 									}
 								});
+							}
 
               args.response.success({data: domainObj});
             }
@@ -243,7 +269,15 @@
             title: 'label.details',
             fields: [
               {
-                name: { label: 'label.name', isEditable: true }
+                name: { 
+								  label: 'label.name', 
+									isEditable: function(context) {		                    
+                    if(context.domains[0].level != 0) //ROOT domain (whose level is 0) is not allowed to change domain name 												
+										  return true;
+										else
+											return false;
+									}
+								}
               },
               {
                 id: { label: 'ID' },
@@ -256,27 +290,57 @@
                 },
                 vmLimit: {
                   label: 'label.instance.limits',
-                  isEditable: true
+                  isEditable: function(context) {		                    
+                    if(context.domains[0].level != 0) //ROOT domain (whose level is 0) is not allowed to updateResourceLimits 												
+										  return true;
+										else
+											return false;
+									}
                 },
                 ipLimit: {
                   label: 'label.ip.limits',
-                  isEditable: true
+                  isEditable: function(context) {		                    
+                    if(context.domains[0].level != 0) //ROOT domain (whose level is 0) is not allowed to updateResourceLimits 												
+										  return true;
+										else
+											return false;
+									}
                 },
                 volumeLimit: {
                   label: 'label.volume.limits',
-                  isEditable: true
+                  isEditable: function(context) {		                    
+                    if(context.domains[0].level != 0) //ROOT domain (whose level is 0) is not allowed to updateResourceLimits 												
+										  return true;
+										else
+											return false;
+									}
                 },
                 snapshotLimit: {
                   label: 'label.snapshot.limits',
-                  isEditable: true
+                  isEditable: function(context) {		                    
+                    if(context.domains[0].level != 0) //ROOT domain (whose level is 0) is not allowed to updateResourceLimits 												
+										  return true;
+										else
+											return false;
+									}
                 },
                 templateLimit: {
                   label: 'label.template.limits',
-                  isEditable: true
+                  isEditable: function(context) {		                    
+                    if(context.domains[0].level != 0) //ROOT domain (whose level is 0) is not allowed to updateResourceLimits 												
+										  return true;
+										else
+											return false;
+									}
                 },
                 vpcLimit: {
                   label: 'VPC limits',
-                  isEditable: true
+                  isEditable: function(context) {		                    
+                    if(context.domains[0].level != 0) //ROOT domain (whose level is 0) is not allowed to updateResourceLimits 												
+										  return true;
+										else
+											return false;
+									}
                 },
                 accountTotal: { label: 'label.accounts' },
                 vmTotal: { label: 'label.instances' },
@@ -412,8 +476,8 @@
     var allowedActions = [];
     if(isAdmin()) {
       allowedActions.push("create");     
-			if(jsonObj.level != 0) { //ROOT domain (whose level is 0) is not allowed to edit or delete
 			allowedActions.push("edit"); //merge updateResourceLimit into edit
+			if(jsonObj.level != 0) { //ROOT domain (whose level is 0) is not allowed to delete         
         allowedActions.push("delete");
       }
     }