diff --git a/api/src/main/java/org/apache/cloudstack/api/ApiConstants.java b/api/src/main/java/org/apache/cloudstack/api/ApiConstants.java index fb44a8a11f48..e8595e677459 100644 --- a/api/src/main/java/org/apache/cloudstack/api/ApiConstants.java +++ b/api/src/main/java/org/apache/cloudstack/api/ApiConstants.java @@ -187,6 +187,7 @@ public class ApiConstants { public static final String IP_LIMIT = "iplimit"; public static final String IP_TOTAL = "iptotal"; public static final String IS_CLEANUP_REQUIRED = "iscleanuprequired"; + public static final String IS_DYNAMIC = "isdynamic"; public static final String IS_EXTRACTABLE = "isextractable"; public static final String IS_FEATURED = "isfeatured"; public static final String IS_PORTABLE = "isportable"; diff --git a/api/src/main/java/org/apache/cloudstack/api/response/ConfigurationResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/ConfigurationResponse.java index 2d815deb286b..c42307c265a1 100644 --- a/api/src/main/java/org/apache/cloudstack/api/response/ConfigurationResponse.java +++ b/api/src/main/java/org/apache/cloudstack/api/response/ConfigurationResponse.java @@ -48,6 +48,10 @@ public class ConfigurationResponse extends BaseResponse { @Param(description = "the description of the configuration") private String description; + @SerializedName(ApiConstants.IS_DYNAMIC) + @Param(description = "true if the configuration is dynamic") + private boolean isDynamic; + public String getCategory() { return category; } @@ -87,4 +91,13 @@ public String getScope() { public void setScope(String scope) { this.scope = scope; } + + public boolean isDynamic() { + return isDynamic; + } + + public void setIsDynamic(boolean isDynamic) { + this.isDynamic = isDynamic; + } + } diff --git a/server/src/main/java/com/cloud/api/ApiResponseHelper.java b/server/src/main/java/com/cloud/api/ApiResponseHelper.java index 8e6731dd20d0..b8e60325ea22 100644 --- a/server/src/main/java/com/cloud/api/ApiResponseHelper.java +++ b/server/src/main/java/com/cloud/api/ApiResponseHelper.java @@ -491,6 +491,7 @@ public ConfigurationResponse createConfigurationResponse(Configuration cfg) { } else { cfgResponse.setValue(cfg.getValue()); } + cfgResponse.setIsDynamic(cfg.isDynamic()); cfgResponse.setObjectName("configuration"); return cfgResponse; diff --git a/ui/scripts/globalSettings.js b/ui/scripts/globalSettings.js index 3e926ea678fc..5d34982de29e 100644 --- a/ui/scripts/globalSettings.js +++ b/ui/scripts/globalSettings.js @@ -41,11 +41,11 @@ data: data, success: function(json) { var item = json.updateconfigurationresponse.configuration; - if (item.category == "Usage") + if (item.category == "Usage" && item.isdynamic == false) cloudStack.dialog.notice({ message: _l('message.restart.mgmt.usage.server') }); - else + else if (item.isdynamic == false) cloudStack.dialog.notice({ message: _l('message.restart.mgmt.server') });