cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kis...@apache.org
Subject [39/50] [abbrv] git commit: updated refs/heads/baremetal-systemvm to 23482b1
Date Tue, 21 Oct 2014 14:57:17 GMT
CLOUDSTACK-7736: UI - listView widget - select view dropdown on top of listView - prefilter()
- include original args.context when passing it to prefilter().


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

Branch: refs/heads/baremetal-systemvm
Commit: a3eaff8bb689f6d41e85acf8c424a96606edbb05
Parents: 8fb7cfa
Author: Jessica Wang <jessicawang@apache.org>
Authored: Wed Oct 15 17:00:11 2014 -0700
Committer: Jessica Wang <jessicawang@apache.org>
Committed: Thu Oct 16 12:34:26 2014 -0700

----------------------------------------------------------------------
 ui/scripts/ui/widgets/listView.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a3eaff8b/ui/scripts/ui/widgets/listView.js
----------------------------------------------------------------------
diff --git a/ui/scripts/ui/widgets/listView.js b/ui/scripts/ui/widgets/listView.js
index 38a9cd5..07b60d9 100644
--- a/ui/scripts/ui/widgets/listView.js
+++ b/ui/scripts/ui/widgets/listView.js
@@ -1589,7 +1589,7 @@
 
             sectionPreFilter = args.sectionSelect.preFilter ?
                 args.sectionSelect.preFilter({
-                    context: cloudStack.context
+                    context: $.extend({}, cloudStack.context, args.context)
                 }) : null;
         } else {
             $sectionSelect.hide();


Mime
View raw message