You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bf...@apache.org on 2012/10/22 21:18:02 UTC
git commit: UI Quick view: don't render for function-based detail view
Updated Branches:
refs/heads/master d5607bc56 -> d3040de21
UI Quick view: don't render for function-based detail view
Disables quick view if detail view is returned via a closure, as it
breaks the quick view in this case.
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/d3040de2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/d3040de2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/d3040de2
Branch: refs/heads/master
Commit: d3040de21de7b039ada843a479dc402048ce04f5
Parents: d5607bc
Author: Brian Federle <br...@citrix.com>
Authored: Mon Oct 22 12:12:19 2012 -0700
Committer: Brian Federle <br...@citrix.com>
Committed: Mon Oct 22 12:17:55 2012 -0700
----------------------------------------------------------------------
ui/scripts/ui/widgets/listView.js | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/d3040de2/ui/scripts/ui/widgets/listView.js
----------------------------------------------------------------------
diff --git a/ui/scripts/ui/widgets/listView.js b/ui/scripts/ui/widgets/listView.js
index cd8e784..02c69f7 100644
--- a/ui/scripts/ui/widgets/listView.js
+++ b/ui/scripts/ui/widgets/listView.js
@@ -652,7 +652,9 @@
}
// Quick view
- if (detailView && !detailView.noCompact && !uiCustom) {
+ if (detailView &&
+ !$.isFunction(detailView) &&
+ !detailView.noCompact && !uiCustom) {
$thead.find('tr').append(
$('<th></th>')
.html(_l('label.quickview'))
@@ -1031,7 +1033,10 @@
}
// Add quick view
- if (detailView && !detailView.noCompact && !uiCustom) {
+ if (detailView &&
+ !$.isFunction(detailView) &&
+ !detailView.noCompact &&
+ !uiCustom) {
$quickView = $('<td>').addClass('quick-view reduced-hide')
.append(
$('<span>').addClass('icon').html(' ')