CLOUDSTACK-3803: Fix duplicate label causing validation error
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/76460637 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/76460637 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/76460637 Branch: refs/heads/ui-restyle Commit: 76460637353c3ae040c1871a9db5adfdab9f7b76 Parents: 5586a22 Author: Brian Federle <brian.fede...@citrix.com> Authored: Tue Oct 8 15:47:48 2013 -0700 Committer: Brian Federle <brian.fede...@citrix.com> Committed: Tue Oct 8 15:48:19 2013 -0700 ---------------------------------------------------------------------- client/WEB-INF/classes/resources/messages.properties | 2 ++ ui/dictionary.jsp | 2 ++ ui/scripts/zoneWizard.js | 4 ++-- 3 files changed, 6 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/76460637/client/WEB-INF/classes/resources/messages.properties ---------------------------------------------------------------------- diff --git a/client/WEB-INF/classes/resources/messages.properties b/client/WEB-INF/classes/resources/messages.properties index f92b85a..7970369 100644 --- a/client/WEB-INF/classes/resources/messages.properties +++ b/client/WEB-INF/classes/resources/messages.properties @@ -14,6 +14,8 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. +label.s3.nfs.server=S3 NFS Server +label.s3.nfs.path=S3 NFS Path label.delete.events=Delete events label.delete.alerts=Delete alerts label.archive.alerts=Archive alerts http://git-wip-us.apache.org/repos/asf/cloudstack/blob/76460637/ui/dictionary.jsp ---------------------------------------------------------------------- diff --git a/ui/dictionary.jsp b/ui/dictionary.jsp index f93f9dc..3563376 100644 --- a/ui/dictionary.jsp +++ b/ui/dictionary.jsp @@ -25,6 +25,8 @@ under the License. <% long now = System.currentTimeMillis(); %> <script language="javascript"> dictionary = { +'label.s3.nfs.path': '<fmt:message key="label.s3.nfs.path" />', +'label.s3.nfs.server': '<fmt:message key="label.s3.nfs.server" />', 'label.delete.events': '<fmt:message key="label.delete.events" />', 'label.delete.alerts': '<fmt:message key="label.delete.alerts" />', 'label.archive.events': '<fmt:message key="label.archive.events" />', http://git-wip-us.apache.org/repos/asf/cloudstack/blob/76460637/ui/scripts/zoneWizard.js ---------------------------------------------------------------------- diff --git a/ui/scripts/zoneWizard.js b/ui/scripts/zoneWizard.js index 960fcb7..617c6e6 100755 --- a/ui/scripts/zoneWizard.js +++ b/ui/scripts/zoneWizard.js @@ -2047,7 +2047,7 @@ }, nfsCacheNfsServer: { dependsOn: 'createNfsCache', - label: 'label.nfs.server', + label: 'label.s3.nfs.server', validation: { required: true }, @@ -2055,7 +2055,7 @@ }, nfsCachePath: { dependsOn: 'createNfsCache', - label: 'label.path', + label: 'label.s3.nfs.path', validation: { required: true },
