cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From csui...@apache.org
Subject [1/4] git commit: updated refs/heads/4.4 to 390dfb1
Date Sat, 12 Apr 2014 15:18:00 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/4.4 3854e5b10 -> 390dfb167
  refs/heads/master bd3fbc5dc -> a3bfda135


Fixed issue with labels being displayed in dialog

CLOUDSTACK-6368


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/390dfb16
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/390dfb16
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/390dfb16

Branch: refs/heads/4.4
Commit: 390dfb167e39c0d04af321c69e2b4a5147b3eb3c
Parents: 418b275
Author: Chris Suich <csuich2@gmail.com>
Authored: Sat Apr 12 11:14:32 2014 -0400
Committer: Chris Suich <csuich2@gmail.com>
Committed: Sat Apr 12 11:16:20 2014 -0400

----------------------------------------------------------------------
 ui/scripts/ui/dialog.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/390dfb16/ui/scripts/ui/dialog.js
----------------------------------------------------------------------
diff --git a/ui/scripts/ui/dialog.js b/ui/scripts/ui/dialog.js
index 82e7fd4..50e12f9 100644
--- a/ui/scripts/ui/dialog.js
+++ b/ui/scripts/ui/dialog.js
@@ -274,17 +274,17 @@
                                         id = this[field.valueField];
                                     else
                                         id = this.id !== undefined ? this.id : this.name;
-                                    var description = this.description;
 
+                                    var desc;
                                     if (args.descriptionField)
-                                        description = this[args.descriptionField];
+                                        desc = this[args.descriptionField];
                                     else
-                                        description = this.description;
+                                        desc = _l(this.description);
 
                                     var $option = $('<option>')
                                             .appendTo($input)
                                             .val(_s(id))
-                                            .html(_s(description));
+                                            .html(_s(desc));
                                 });
 
                                 if (field.defaultValue) {


Mime
View raw message