cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jessicaw...@apache.org
Subject git commit: updated refs/heads/4.5 to f8cbd6a
Date Thu, 16 Oct 2014 19:10:10 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/4.5 c49a09fad -> f8cbd6ad4


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

Branch: refs/heads/4.5
Commit: f8cbd6ad46f5e75de3354ffe4dc646b819aa40a1
Parents: c49a09f
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:09:48 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/f8cbd6ad/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