From 419ff950a08ca96868cb3716904b04f83b82922f Mon Sep 17 00:00:00 2001
From: Sanjay Tripathi <sanjay.tripathi@citrix.com>
Date: Wed, 2 May 2012 12:10:20 +0530
Subject: [PATCH] bug 13461: Usage server restart required after some
 configuration changes.

---
 client/WEB-INF/classes/resources/messages.properties | 1 +
 ui/index.jsp                                         | 1 +
 ui/scripts/globalSettings.js                         | 5 ++++-
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/client/WEB-INF/classes/resources/messages.properties b/client/WEB-INF/classes/resources/messages.properties
index 61e739c1a07..876a1dbc0c6 100644
--- a/client/WEB-INF/classes/resources/messages.properties
+++ b/client/WEB-INF/classes/resources/messages.properties
@@ -1354,6 +1354,7 @@ message.number.storage=<h2><span> # of </span> Primary Storage Volumes</h2>
 message.number.zones=<h2><span> # of </span> Zones</h2>
 message.remove.vpn.access=Please confirm that you want to remove VPN access from the following user.
 message.restart.mgmt.server=Please restart your management server(s) for your new settings to take effect.
+message.restart.mgmt.usage.server=Please restart your management server(s) and usage server(s) for your new settings to take effect.
 message.security.group.usage=(Use <strong>Ctrl-click</strong> to select all applicable security groups)
 message.snapshot.schedule=You can setup recurring snapshot schedules by selecting from the available options below and applying your policy preference
 message.step.1.continue=Please select a template or ISO to continue
diff --git a/ui/index.jsp b/ui/index.jsp
index c4b198ffe39..20156783e4e 100644
--- a/ui/index.jsp
+++ b/ui/index.jsp
@@ -2788,6 +2788,7 @@ dictionary = {
 'message.number.zones': '<fmt:message key="message.number.zones" />',
 'message.remove.vpn.access': '<fmt:message key="message.remove.vpn.access" />',
 'message.restart.mgmt.server': '<fmt:message key="message.restart.mgmt.server" />',
+'message.restart.mgmt.usage.server': '<fmt:message key="message.restart.mgmt.usage.server" />',
 'message.security.group.usage': '<fmt:message key="message.security.group.usage" />',
 'message.snapshot.schedule': '<fmt:message key="message.snapshot.schedule" />',
 'message.step.1.continue': '<fmt:message key="message.step.1.continue" />',
diff --git a/ui/scripts/globalSettings.js b/ui/scripts/globalSettings.js
index 35bab25eb52..fdaaa0413ef 100644
--- a/ui/scripts/globalSettings.js
+++ b/ui/scripts/globalSettings.js
@@ -38,7 +38,10 @@
                   async: true,
                   success: function(json) {                
                     var item = json.updateconfigurationresponse.configuration;
-                    cloudStack.dialog.notice({ message: _l('message.restart.mgmt.server') });
+                    if(item.category == "Usage")
+                      cloudStack.dialog.notice({ message: _l('message.restart.mgmt.usage.server') });
+                    else
+                      cloudStack.dialog.notice({ message: _l('message.restart.mgmt.server') });	
                     args.response.success({data: item});
                   },
                   error: function(json) {