Multi-edit: edit rule UI: fix regression and restore functionality
Conflicts:
ui/scripts/ui/dialog.js
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/f2391366
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/f2391366
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/f2391366
Branch: refs/heads/4.2
Commit: f2391366053dda2a26ea8570269101bc1d828d78
Parents: b48d99b
Author: Brian Federle <[email protected]>
Authored: Mon Jul 1 14:28:52 2013 -0700
Committer: Brian Federle <[email protected]>
Committed: Mon Jul 8 11:33:28 2013 -0700
----------------------------------------------------------------------
ui/scripts/ui/dialog.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f2391366/ui/scripts/ui/dialog.js
----------------------------------------------------------------------
diff --git a/ui/scripts/ui/dialog.js b/ui/scripts/ui/dialog.js
index e4ca389..7f82eea 100644
--- a/ui/scripts/ui/dialog.js
+++ b/ui/scripts/ui/dialog.js
@@ -236,7 +236,7 @@
response: {
success: function(args) {
$(args.data).each(function() {
- var id = this.id ? this.id : this.name;
+ var id = this.id !== undefined ? this.id : this.name;
var description = this.description;
if (args.descriptionField)
