Removed duplicate label id entry from dictionary files and update the template.js file.
Signed-off-by: vetrivelc <vetrivel.chinnas...@citrix.com> Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/dd145a39 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/dd145a39 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/dd145a39 Branch: refs/heads/hotfix/scp-exception Commit: dd145a397aa658f7f8cfa328f6b07ca76632b52f Parents: aa92f5d Author: vetrivelc <vetrivel.chinnas...@citrix.com> Authored: Fri Dec 12 18:27:53 2014 +0530 Committer: Brian Federle <brian.fede...@citrix.com> Committed: Fri Dec 12 09:31:09 2014 -0800 ---------------------------------------------------------------------- ui/dictionary2.jsp | 1 - ui/scripts/templates.js | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/dd145a39/ui/dictionary2.jsp ---------------------------------------------------------------------- diff --git a/ui/dictionary2.jsp b/ui/dictionary2.jsp index 98ecd51..52fd480 100644 --- a/ui/dictionary2.jsp +++ b/ui/dictionary2.jsp @@ -671,7 +671,6 @@ $.extend(dictionary, { 'state.Expunging': '<fmt:message key="state.Expunging" />', 'state.Migrating': '<fmt:message key="state.Migrating" />', 'state.Pending': '<fmt:message key="state.Pending" />', -'state.ready': '<fmt:message key="state.ready" />', 'state.Ready': '<fmt:message key="state.Ready" />', 'state.Running': '<fmt:message key="state.Running" />', 'state.Starting': '<fmt:message key="state.Starting" />', http://git-wip-us.apache.org/repos/asf/cloudstack/blob/dd145a39/ui/scripts/templates.js ---------------------------------------------------------------------- diff --git a/ui/scripts/templates.js b/ui/scripts/templates.js index a8e8dad..c3d8022 100644 --- a/ui/scripts/templates.js +++ b/ui/scripts/templates.js @@ -1068,7 +1068,7 @@ label: 'label.status' }, isready: { - label: 'state.ready', + label: 'state.Ready', converter: cloudStack.converters.toBooleanText } }, @@ -1283,7 +1283,7 @@ label: 'label.zone.id' }, isready: { - label: 'state.ready', + label: 'state.Ready', converter: cloudStack.converters.toBooleanText }, status: { @@ -2067,7 +2067,7 @@ label: 'label.status' }, isready: { - label: 'state.ready', + label: 'state.Ready', converter: cloudStack.converters.toBooleanText } },
