cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bfede...@apache.org
Subject git commit: updated refs/heads/4.2 to e256794
Date Tue, 08 Oct 2013 22:48:03 GMT
Updated Branches:
  refs/heads/4.2 c5e565289 -> e256794a3


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/e256794a
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/e256794a
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/e256794a

Branch: refs/heads/4.2
Commit: e256794a358e81b740136e05d511ac7f52043c03
Parents: c5e5652
Author: Brian Federle <brian.federle@citrix.com>
Authored: Tue Oct 8 15:47:48 2013 -0700
Committer: Brian Federle <brian.federle@citrix.com>
Committed: Tue Oct 8 15:48:00 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/e256794a/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 4fc09ee..50f7a65 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/e256794a/ui/dictionary.jsp
----------------------------------------------------------------------
diff --git a/ui/dictionary.jsp b/ui/dictionary.jsp
index 3dfdefe..8d6a716 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/e256794a/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
                         },


Mime
View raw message