You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by sw...@apache.org on 2016/04/19 16:50:17 UTC
[1/4] git commit: updated refs/heads/master to 3393555
Repository: cloudstack
Updated Branches:
refs/heads/master a3371d282 -> 339355594
CLOUDSTACK-9268: Display VM in Load balancing rule in UI
Added jsonObj to newly created row in multiedit.js to stop listing the same VM again.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/a68918fe
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/a68918fe
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/a68918fe
Branch: refs/heads/master
Commit: a68918fef7746823f79e096a70d136d2b4f31921
Parents: e5ef933
Author: Nitin Kumar Maharana <ni...@gmail.com>
Authored: Tue Feb 2 22:54:53 2016 +0530
Committer: Nitin Kumar Maharana <ni...@gmail.com>
Committed: Tue Feb 2 22:54:53 2016 +0530
----------------------------------------------------------------------
ui/scripts/ui/widgets/multiEdit.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a68918fe/ui/scripts/ui/widgets/multiEdit.js
----------------------------------------------------------------------
diff --git a/ui/scripts/ui/widgets/multiEdit.js b/ui/scripts/ui/widgets/multiEdit.js
index 36ae27b..3e88b92 100755
--- a/ui/scripts/ui/widgets/multiEdit.js
+++ b/ui/scripts/ui/widgets/multiEdit.js
@@ -104,7 +104,7 @@
$(data).each(function() {
var item = this;
var $itemRow = _medit.multiItem.itemRow(item, options.itemActions, multiRule, $tbody);
-
+ $itemRow.data('json-obj', item);
$itemRow.appendTo($tbody);
newItemRows.push($itemRow);
[2/4] git commit: updated refs/heads/master to 3393555
Posted by sw...@apache.org.
Merge pull request #1394 from nitin-maharana/CloudStack-Nitin25_4.7
CLOUDSTACK-9268: Display VM in Load balancing rule in UISteps of Repro:
=============
1:Create VMs
2:Make LoadBalancing rule in GUI
Name:WWW
PrivatePort:80
PublicPort:80
Add VMs:some VMs
Expected Result:
==============
The VMs which has been already assigned is should not be listed when you add the VM to an existing rule.
Actual Result:
===========
The VMs which has been already assigned is still being listed when you add the VM to an existing rule.
Fix:
===
Added jsonObj to newly created row in multiedit.js to stop listing the same VM again.
* pr/1394:
CLOUDSTACK-9268: Display VM in Load balancing rule in UI
Signed-off-by: Koushik Das <ko...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/e3e5be8d
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/e3e5be8d
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/e3e5be8d
Branch: refs/heads/master
Commit: e3e5be8dedb3f270c45b1e8b65952ac62fbe46a6
Parents: 6f703c4 a68918f
Author: Koushik Das <ko...@apache.org>
Authored: Tue Apr 19 16:31:50 2016 +0530
Committer: Koushik Das <ko...@apache.org>
Committed: Tue Apr 19 16:31:50 2016 +0530
----------------------------------------------------------------------
ui/scripts/ui/widgets/multiEdit.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
[4/4] git commit: updated refs/heads/master to 3393555
Posted by sw...@apache.org.
Merge release branch 4.8 to master
* 4.8:
CLOUDSTACK-9268: Display VM in Load balancing rule in UI
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/33935559
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/33935559
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/33935559
Branch: refs/heads/master
Commit: 339355594ca537ebbc8e0a0f6e49a63ee4b884ac
Parents: a3371d2 e17c64d
Author: Will Stevens <wi...@gmail.com>
Authored: Tue Apr 19 10:49:53 2016 -0400
Committer: Will Stevens <wi...@gmail.com>
Committed: Tue Apr 19 10:49:53 2016 -0400
----------------------------------------------------------------------
ui/scripts/ui/widgets/multiEdit.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
[3/4] git commit: updated refs/heads/master to 3393555
Posted by sw...@apache.org.
Merge release branch 4.7 to 4.8
* 4.7:
CLOUDSTACK-9268: Display VM in Load balancing rule in UI
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/e17c64db
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/e17c64db
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/e17c64db
Branch: refs/heads/master
Commit: e17c64dbc0ecb8fe27292deeec81de588202adfe
Parents: f8e71b0 e3e5be8
Author: Will Stevens <wi...@gmail.com>
Authored: Tue Apr 19 10:49:03 2016 -0400
Committer: Will Stevens <wi...@gmail.com>
Committed: Tue Apr 19 10:49:03 2016 -0400
----------------------------------------------------------------------
ui/scripts/ui/widgets/multiEdit.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------