Yaniv Dary has uploaded a new change for review. Change subject: reports: fixed 'show deleted' in reports. (#768712) ......................................................................
reports: fixed 'show deleted' in reports. (#768712) https://bugzilla.redhat.com/768712 Change-Id: Ib4ed35597569f22cf10c718a829fce654c714df8 Signed-off-by: Yaniv Dary <[email protected]> --- M reports/repository_files/resources/Reports/Executive/active_vms_by_os_br18_files/full details.jrxml.data M reports/repository_files/resources/Reports/Executive/cluster_capacity_vs_usage_br19_files/full details br19.jrxml.data M reports/repository_files/resources/Reports/Executive/host_os_break_down_BR22_files/full details.jrxml.data M reports/repository_files/resources/Reports/Executive/summary_of_host_usage_resources_br17_files/full details.jrxml.data M reports/repository_files/resources/Reports/Inventory/Hosts_Inventory_files/full details br1.jrxml.data M reports/repository_files/resources/Reports/Inventory/VM_Inventory_files/full details.jrxml.data M reports/repository_files/resources/Reports/Service_level/Hosts/cluster_quality_of_service_hosts_br6_files/full details br13.jrxml.data M reports/repository_files/resources/Reports/Service_level/Hosts/cluster_uptime_br7_files/br7 full details.jrxml.data M reports/repository_files/resources/Reports/Service_level/Hosts/top_10_downtime_hosts_br7b_files/br7b full details.jrxml.data M reports/repository_files/resources/Reports/Service_level/VMs/cluster_quality_of_service_vms_br13_files/full details.jrxml.data M reports/repository_files/resources/Reports/Service_level/VMs/virtual_servers_uptime_br14_files/br14 full details.jrxml.data M reports/repository_files/resources/Reports/Trend/Hosts/Five_most_utilized_hosts_over_time_files/br7 full details.jrxml.data M reports/repository_files/resources/Reports/Trend/Hosts/five_least_utilized_hosts_br5_files/br7 full details.jrxml.data M reports/repository_files/resources/Reports/Trend/Virtual_machines/five_least_utilized_vms_Over_Time_BR12_files/full details.jrxml.data M reports/repository_files/resources/Reports/Trend/Virtual_machines/five_most_utilized_vms_over_time_br11_files/full details.jrxml.data 15 files changed, 30 insertions(+), 30 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-reports refs/changes/29/7629/1 diff --git a/reports/repository_files/resources/Reports/Executive/active_vms_by_os_br18_files/full details.jrxml.data b/reports/repository_files/resources/Reports/Executive/active_vms_by_os_br18_files/full details.jrxml.data index 22ad453..e59122f 100644 --- a/reports/repository_files/resources/Reports/Executive/active_vms_by_os_br18_files/full details.jrxml.data +++ b/reports/repository_files/resources/Reports/Executive/active_vms_by_os_br18_files/full details.jrxml.data @@ -133,8 +133,8 @@ <textElement textAlignment="Justified" verticalAlignment="Middle" markup="html"> <font fontName="DejaVu Sans" size="11" isBold="false"/> </textElement> - <textFieldExpression class="java.lang.String"><![CDATA[$P{is_deleted} == "/**/" ? "<b>" + $R{full.details.show.deleted.vms} + ":</b> " + $R{full.details.yes} : "<b>" + $R{full.details.show.deleted.vms} + ":</b> " + $R{full.details.no}]]></textFieldExpression> - <hyperlinkTooltipExpression><![CDATA[$P{is_deleted} == "/**/" ? $R{full.details.yes} :$R{full.details.no}]]></hyperlinkTooltipExpression> + <textFieldExpression class="java.lang.String"><![CDATA[$P{is_deleted} == "" ? "<b>" + $R{full.details.show.deleted.vms} + ":</b> " + $R{full.details.yes} : "<b>" + $R{full.details.show.deleted.vms} + ":</b> " + $R{full.details.no}]]></textFieldExpression> + <hyperlinkTooltipExpression><![CDATA[$P{is_deleted} == "" ? $R{full.details.yes} :$R{full.details.no}]]></hyperlinkTooltipExpression> </textField> </frame> <textField evaluationTime="Report" isBlankWhenNull="false"> diff --git a/reports/repository_files/resources/Reports/Executive/cluster_capacity_vs_usage_br19_files/full details br19.jrxml.data b/reports/repository_files/resources/Reports/Executive/cluster_capacity_vs_usage_br19_files/full details br19.jrxml.data index f109c63..6f6952e 100644 --- a/reports/repository_files/resources/Reports/Executive/cluster_capacity_vs_usage_br19_files/full details br19.jrxml.data +++ b/reports/repository_files/resources/Reports/Executive/cluster_capacity_vs_usage_br19_files/full details br19.jrxml.data @@ -116,8 +116,8 @@ <textElement textAlignment="Justified" verticalAlignment="Middle" markup="html"> <font fontName="DejaVu Sans" size="11" isBold="false"/> </textElement> - <textFieldExpression class="java.lang.String"><![CDATA[$P{is_deleted} == "/**/" ? "<b>" + $R{full.details.show.deleted.entities} + ":</b> " + $R{full.details.yes} : "<b>" + $R{full.details.show.deleted.entities} + ":</b> " + $R{full.details.no}]]></textFieldExpression> - <hyperlinkTooltipExpression><![CDATA[$P{is_deleted} == "/**/" ? $R{full.details.yes} : $R{full.details.no}]]></hyperlinkTooltipExpression> + <textFieldExpression class="java.lang.String"><![CDATA[$P{is_deleted} == "" ? "<b>" + $R{full.details.show.deleted.entities} + ":</b> " + $R{full.details.yes} : "<b>" + $R{full.details.show.deleted.entities} + ":</b> " + $R{full.details.no}]]></textFieldExpression> + <hyperlinkTooltipExpression><![CDATA[$P{is_deleted} == "" ? $R{full.details.yes} : $R{full.details.no}]]></hyperlinkTooltipExpression> </textField> </frame> <textField evaluationTime="Report" isBlankWhenNull="false"> diff --git a/reports/repository_files/resources/Reports/Executive/host_os_break_down_BR22_files/full details.jrxml.data b/reports/repository_files/resources/Reports/Executive/host_os_break_down_BR22_files/full details.jrxml.data index a42ecd9..cb6f6bf 100644 --- a/reports/repository_files/resources/Reports/Executive/host_os_break_down_BR22_files/full details.jrxml.data +++ b/reports/repository_files/resources/Reports/Executive/host_os_break_down_BR22_files/full details.jrxml.data @@ -116,8 +116,8 @@ <textElement textAlignment="Justified" verticalAlignment="Middle" markup="html"> <font fontName="DejaVu Sans" size="11" isBold="false"/> </textElement> - <textFieldExpression class="java.lang.String"><![CDATA[$P{is_deleted} == "/**/" ? "<b>" + $R{full.details.show.deleted.hosts} + ":</b> " + $R{full.details.yes} : "<b>" + $R{full.details.show.deleted.hosts} + ":</b> " + $R{full.details.no}]]></textFieldExpression> - <hyperlinkTooltipExpression><![CDATA[$P{is_deleted} == "/**/" ? $R{full.details.yes} :$R{full.details.no}]]></hyperlinkTooltipExpression> + <textFieldExpression class="java.lang.String"><![CDATA[$P{is_deleted} == "" ? "<b>" + $R{full.details.show.deleted.hosts} + ":</b> " + $R{full.details.yes} : "<b>" + $R{full.details.show.deleted.hosts} + ":</b> " + $R{full.details.no}]]></textFieldExpression> + <hyperlinkTooltipExpression><![CDATA[$P{is_deleted} == "" ? $R{full.details.yes} :$R{full.details.no}]]></hyperlinkTooltipExpression> </textField> </frame> <textField evaluationTime="Report" isBlankWhenNull="false"> diff --git a/reports/repository_files/resources/Reports/Executive/summary_of_host_usage_resources_br17_files/full details.jrxml.data b/reports/repository_files/resources/Reports/Executive/summary_of_host_usage_resources_br17_files/full details.jrxml.data index 839ef4f..da4f942 100644 --- a/reports/repository_files/resources/Reports/Executive/summary_of_host_usage_resources_br17_files/full details.jrxml.data +++ b/reports/repository_files/resources/Reports/Executive/summary_of_host_usage_resources_br17_files/full details.jrxml.data @@ -116,8 +116,8 @@ <textElement textAlignment="Justified" verticalAlignment="Middle" markup="html"> <font fontName="DejaVu Sans" size="11" isBold="false"/> </textElement> - <textFieldExpression class="java.lang.String"><![CDATA[$P{is_deleted} == "/**/" ? "<b>" + $R{full.details.show.deleted.hosts} + ":</b> " + $R{full.details.yes} : "<b>" + $R{full.details.show.deleted.hosts} + ":</b> " + $R{full.details.no}]]></textFieldExpression> - <hyperlinkTooltipExpression><![CDATA[$P{is_deleted} == "/**/" ? $R{full.details.yes} : $R{full.details.no}]]></hyperlinkTooltipExpression> + <textFieldExpression class="java.lang.String"><![CDATA[$P{is_deleted} == "" ? "<b>" + $R{full.details.show.deleted.hosts} + ":</b> " + $R{full.details.yes} : "<b>" + $R{full.details.show.deleted.hosts} + ":</b> " + $R{full.details.no}]]></textFieldExpression> + <hyperlinkTooltipExpression><![CDATA[$P{is_deleted} == "" ? $R{full.details.yes} : $R{full.details.no}]]></hyperlinkTooltipExpression> </textField> </frame> <textField evaluationTime="Report" isBlankWhenNull="false"> diff --git a/reports/repository_files/resources/Reports/Inventory/Hosts_Inventory_files/full details br1.jrxml.data b/reports/repository_files/resources/Reports/Inventory/Hosts_Inventory_files/full details br1.jrxml.data index 12cfb66..0a028e9 100644 --- a/reports/repository_files/resources/Reports/Inventory/Hosts_Inventory_files/full details br1.jrxml.data +++ b/reports/repository_files/resources/Reports/Inventory/Hosts_Inventory_files/full details br1.jrxml.data @@ -103,8 +103,8 @@ <textElement textAlignment="Justified" verticalAlignment="Middle" markup="html"> <font fontName="DejaVu Sans" size="11" isBold="false"/> </textElement> - <textFieldExpression><![CDATA[$P{active_hosts_select} == "/**/" ? "<b>" + $R{full.details.show.deleted.hosts} + ":</b> " + $R{full.details.yes} : "<b>" + $R{full.details.show.deleted.hosts} + ":</b> " + $R{full.details.no}]]></textFieldExpression> - <hyperlinkTooltipExpression><![CDATA[$P{active_hosts_select} == "/**/" ? $R{full.details.yes} :$R{full.details.no}]]></hyperlinkTooltipExpression> + <textFieldExpression><![CDATA[$P{active_hosts_select} == "" ? "<b>" + $R{full.details.show.deleted.hosts} + ":</b> " + $R{full.details.yes} : "<b>" + $R{full.details.show.deleted.hosts} + ":</b> " + $R{full.details.no}]]></textFieldExpression> + <hyperlinkTooltipExpression><![CDATA[$P{active_hosts_select} == "" ? $R{full.details.yes} :$R{full.details.no}]]></hyperlinkTooltipExpression> </textField> </frame> <textField evaluationTime="Report" isBlankWhenNull="false"> diff --git a/reports/repository_files/resources/Reports/Inventory/VM_Inventory_files/full details.jrxml.data b/reports/repository_files/resources/Reports/Inventory/VM_Inventory_files/full details.jrxml.data index 9d1bd86..8fd6fdb 100644 --- a/reports/repository_files/resources/Reports/Inventory/VM_Inventory_files/full details.jrxml.data +++ b/reports/repository_files/resources/Reports/Inventory/VM_Inventory_files/full details.jrxml.data @@ -102,8 +102,8 @@ <textElement textAlignment="Justified" verticalAlignment="Middle" markup="html"> <font fontName="DejaVu Sans" size="11" isBold="false"/> </textElement> - <textFieldExpression><![CDATA[$P{Active_VMs} == "/**/" ? "<b>" + $R{full.details.show.deleted.vms} + ":</b> " + $R{full.details.yes} : "<b>" + $R{full.details.show.deleted.vms} + ":</b> " + $R{full.details.no}]]></textFieldExpression> - <hyperlinkTooltipExpression><![CDATA[$P{Active_VMs} == "/**/" ? $R{full.details.yes} :$R{full.details.no}]]></hyperlinkTooltipExpression> + <textFieldExpression><![CDATA[$P{Active_VMs} == "" ? "<b>" + $R{full.details.show.deleted.vms} + ":</b> " + $R{full.details.yes} : "<b>" + $R{full.details.show.deleted.vms} + ":</b> " + $R{full.details.no}]]></textFieldExpression> + <hyperlinkTooltipExpression><![CDATA[$P{Active_VMs} == "" ? $R{full.details.yes} :$R{full.details.no}]]></hyperlinkTooltipExpression> </textField> </frame> <textField evaluationTime="Report" isBlankWhenNull="false"> diff --git a/reports/repository_files/resources/Reports/Service_level/Hosts/cluster_quality_of_service_hosts_br6_files/full details br13.jrxml.data b/reports/repository_files/resources/Reports/Service_level/Hosts/cluster_quality_of_service_hosts_br6_files/full details br13.jrxml.data index ae0b952..db96212 100644 --- a/reports/repository_files/resources/Reports/Service_level/Hosts/cluster_quality_of_service_hosts_br6_files/full details br13.jrxml.data +++ b/reports/repository_files/resources/Reports/Service_level/Hosts/cluster_quality_of_service_hosts_br6_files/full details br13.jrxml.data @@ -157,8 +157,8 @@ <textElement textAlignment="Justified" verticalAlignment="Middle" markup="html"> <font fontName="DejaVu Sans" size="11" isBold="false"/> </textElement> - <textFieldExpression class="java.lang.String"><![CDATA[$P{is_deleted} == "/**/" ? "<b>" + $R{full.details.show.deleted.hosts} + ":</b> " + $R{full.details.yes} : "<b>" + $R{full.details.show.deleted.hosts} + ":</b> " + $R{full.details.no}]]></textFieldExpression> - <hyperlinkTooltipExpression><![CDATA[$P{is_deleted} == "/**/" ? $R{full.details.yes} :$R{full.details.no}]]></hyperlinkTooltipExpression> + <textFieldExpression class="java.lang.String"><![CDATA[$P{is_deleted} == "" ? "<b>" + $R{full.details.show.deleted.hosts} + ":</b> " + $R{full.details.yes} : "<b>" + $R{full.details.show.deleted.hosts} + ":</b> " + $R{full.details.no}]]></textFieldExpression> + <hyperlinkTooltipExpression><![CDATA[$P{is_deleted} == "" ? $R{full.details.yes} :$R{full.details.no}]]></hyperlinkTooltipExpression> </textField> </frame> <textField evaluationTime="Report" isBlankWhenNull="false"> diff --git a/reports/repository_files/resources/Reports/Service_level/Hosts/cluster_uptime_br7_files/br7 full details.jrxml.data b/reports/repository_files/resources/Reports/Service_level/Hosts/cluster_uptime_br7_files/br7 full details.jrxml.data index cc636e4..0f15544 100644 --- a/reports/repository_files/resources/Reports/Service_level/Hosts/cluster_uptime_br7_files/br7 full details.jrxml.data +++ b/reports/repository_files/resources/Reports/Service_level/Hosts/cluster_uptime_br7_files/br7 full details.jrxml.data @@ -132,8 +132,8 @@ <textElement textAlignment="Justified" verticalAlignment="Middle" markup="html"> <font fontName="DejaVu Sans" size="11" isBold="false"/> </textElement> - <textFieldExpression class="java.lang.String"><![CDATA[$P{is_deleted} == "/**/" ? "<b>" + $R{full.details.show.deleted.hosts} + ":</b> " + $R{full.details.yes} : "<b>" + $R{full.details.show.deleted.hosts} + ":</b> " + $R{full.details.no}]]></textFieldExpression> - <hyperlinkTooltipExpression><![CDATA[$P{is_deleted} == "/**/" ? $R{full.details.yes} :$R{full.details.no}]]></hyperlinkTooltipExpression> + <textFieldExpression class="java.lang.String"><![CDATA[$P{is_deleted} == "" ? "<b>" + $R{full.details.show.deleted.hosts} + ":</b> " + $R{full.details.yes} : "<b>" + $R{full.details.show.deleted.hosts} + ":</b> " + $R{full.details.no}]]></textFieldExpression> + <hyperlinkTooltipExpression><![CDATA[$P{is_deleted} == "" ? $R{full.details.yes} :$R{full.details.no}]]></hyperlinkTooltipExpression> </textField> </frame> <textField evaluationTime="Report" isBlankWhenNull="false"> diff --git a/reports/repository_files/resources/Reports/Service_level/Hosts/top_10_downtime_hosts_br7b_files/br7b full details.jrxml.data b/reports/repository_files/resources/Reports/Service_level/Hosts/top_10_downtime_hosts_br7b_files/br7b full details.jrxml.data index 0bbda7d..a591f8c 100644 --- a/reports/repository_files/resources/Reports/Service_level/Hosts/top_10_downtime_hosts_br7b_files/br7b full details.jrxml.data +++ b/reports/repository_files/resources/Reports/Service_level/Hosts/top_10_downtime_hosts_br7b_files/br7b full details.jrxml.data @@ -132,8 +132,8 @@ <textElement textAlignment="Justified" verticalAlignment="Middle" markup="html"> <font fontName="DejaVu Sans" size="11" isBold="false"/> </textElement> - <textFieldExpression class="java.lang.String"><![CDATA[$P{is_deleted} == "/**/" ? "<b>" + $R{full.details.show.deleted.hosts} + ":</b> " + $R{full.details.yes} : "<b>" + $R{full.details.show.deleted.hosts} + ":</b> " + $R{full.details.no}]]></textFieldExpression> - <hyperlinkTooltipExpression><![CDATA[$P{is_deleted} == "/**/" ? $R{full.details.yes} :$R{full.details.no}]]></hyperlinkTooltipExpression> + <textFieldExpression class="java.lang.String"><![CDATA[$P{is_deleted} == "" ? "<b>" + $R{full.details.show.deleted.hosts} + ":</b> " + $R{full.details.yes} : "<b>" + $R{full.details.show.deleted.hosts} + ":</b> " + $R{full.details.no}]]></textFieldExpression> + <hyperlinkTooltipExpression><![CDATA[$P{is_deleted} == "" ? $R{full.details.yes} :$R{full.details.no}]]></hyperlinkTooltipExpression> </textField> </frame> <textField evaluationTime="Report" isBlankWhenNull="false"> diff --git a/reports/repository_files/resources/Reports/Service_level/VMs/cluster_quality_of_service_vms_br13_files/full details.jrxml.data b/reports/repository_files/resources/Reports/Service_level/VMs/cluster_quality_of_service_vms_br13_files/full details.jrxml.data index 93b1fc4..31ec79c 100644 --- a/reports/repository_files/resources/Reports/Service_level/VMs/cluster_quality_of_service_vms_br13_files/full details.jrxml.data +++ b/reports/repository_files/resources/Reports/Service_level/VMs/cluster_quality_of_service_vms_br13_files/full details.jrxml.data @@ -157,8 +157,8 @@ <textElement textAlignment="Justified" verticalAlignment="Middle" markup="html"> <font fontName="DejaVu Sans" size="11" isBold="false"/> </textElement> - <textFieldExpression class="java.lang.String"><![CDATA[$P{is_deleted} == "/**/" ? "<b>" + $R{full.details.short.show.deleted.vms} + ":</b> " + $R{full.details.yes} : "<b>" + $R{full.details.short.show.deleted.vms} + ":</b> " + $R{full.details.no}]]></textFieldExpression> - <hyperlinkTooltipExpression><![CDATA[$P{is_deleted} == "/**/" ? $R{full.details.yes} : $R{full.details.no}]]></hyperlinkTooltipExpression> + <textFieldExpression class="java.lang.String"><![CDATA[$P{is_deleted} == "" ? "<b>" + $R{full.details.short.show.deleted.vms} + ":</b> " + $R{full.details.yes} : "<b>" + $R{full.details.short.show.deleted.vms} + ":</b> " + $R{full.details.no}]]></textFieldExpression> + <hyperlinkTooltipExpression><![CDATA[$P{is_deleted} == "" ? $R{full.details.yes} : $R{full.details.no}]]></hyperlinkTooltipExpression> </textField> </frame> <textField evaluationTime="Report" isBlankWhenNull="false"> diff --git a/reports/repository_files/resources/Reports/Service_level/VMs/virtual_servers_uptime_br14_files/br14 full details.jrxml.data b/reports/repository_files/resources/Reports/Service_level/VMs/virtual_servers_uptime_br14_files/br14 full details.jrxml.data index cc937e9..89e0fcb 100644 --- a/reports/repository_files/resources/Reports/Service_level/VMs/virtual_servers_uptime_br14_files/br14 full details.jrxml.data +++ b/reports/repository_files/resources/Reports/Service_level/VMs/virtual_servers_uptime_br14_files/br14 full details.jrxml.data @@ -116,8 +116,8 @@ <textElement textAlignment="Justified" verticalAlignment="Middle" markup="html"> <font fontName="DejaVu Sans" size="11" isBold="false"/> </textElement> - <textFieldExpression class="java.lang.String"><![CDATA[$P{is_deleted} == "/**/" ? "<b>" + $R{full.details.show.deleted.vms} + ":</b> " + $R{full.details.yes} : "<b>" + $R{full.details.show.deleted.vms} + ":</b> " + $R{full.details.no}]]></textFieldExpression> - <hyperlinkTooltipExpression><![CDATA[$P{is_deleted} == "/**/" ? $R{full.details.yes} : $R{full.details.no}]]></hyperlinkTooltipExpression> + <textFieldExpression class="java.lang.String"><![CDATA[$P{is_deleted} == "" ? "<b>" + $R{full.details.show.deleted.vms} + ":</b> " + $R{full.details.yes} : "<b>" + $R{full.details.show.deleted.vms} + ":</b> " + $R{full.details.no}]]></textFieldExpression> + <hyperlinkTooltipExpression><![CDATA[$P{is_deleted} == "" ? $R{full.details.yes} : $R{full.details.no}]]></hyperlinkTooltipExpression> </textField> </frame> <textField evaluationTime="Report" isBlankWhenNull="false"> diff --git a/reports/repository_files/resources/Reports/Trend/Hosts/Five_most_utilized_hosts_over_time_files/br7 full details.jrxml.data b/reports/repository_files/resources/Reports/Trend/Hosts/Five_most_utilized_hosts_over_time_files/br7 full details.jrxml.data index 5f7a9db..fd5acec 100644 --- a/reports/repository_files/resources/Reports/Trend/Hosts/Five_most_utilized_hosts_over_time_files/br7 full details.jrxml.data +++ b/reports/repository_files/resources/Reports/Trend/Hosts/Five_most_utilized_hosts_over_time_files/br7 full details.jrxml.data @@ -133,8 +133,8 @@ <textElement textAlignment="Justified" verticalAlignment="Middle" markup="html"> <font fontName="DejaVu Sans" size="11" isBold="false"/> </textElement> - <textFieldExpression class="java.lang.String"><![CDATA[$P{is_deleted} == "/**/" ? "<b>" + $R{full.details.show.deleted.hosts} + ":</b> " + $R{full.details.yes} : "<b>" + $R{full.details.show.deleted.hosts} + ":</b> " + $R{full.details.no}]]></textFieldExpression> - <hyperlinkTooltipExpression><![CDATA[$P{is_deleted} == "/**/" ? $R{full.details.yes} :$R{full.details.no}]]></hyperlinkTooltipExpression> + <textFieldExpression class="java.lang.String"><![CDATA[$P{is_deleted} == "" ? "<b>" + $R{full.details.show.deleted.hosts} + ":</b> " + $R{full.details.yes} : "<b>" + $R{full.details.show.deleted.hosts} + ":</b> " + $R{full.details.no}]]></textFieldExpression> + <hyperlinkTooltipExpression><![CDATA[$P{is_deleted} == "" ? $R{full.details.yes} :$R{full.details.no}]]></hyperlinkTooltipExpression> </textField> </frame> <textField evaluationTime="Report" isBlankWhenNull="false"> diff --git a/reports/repository_files/resources/Reports/Trend/Hosts/five_least_utilized_hosts_br5_files/br7 full details.jrxml.data b/reports/repository_files/resources/Reports/Trend/Hosts/five_least_utilized_hosts_br5_files/br7 full details.jrxml.data index 9f8cf2a..8d09c41 100644 --- a/reports/repository_files/resources/Reports/Trend/Hosts/five_least_utilized_hosts_br5_files/br7 full details.jrxml.data +++ b/reports/repository_files/resources/Reports/Trend/Hosts/five_least_utilized_hosts_br5_files/br7 full details.jrxml.data @@ -133,8 +133,8 @@ <textElement textAlignment="Justified" verticalAlignment="Middle" markup="html"> <font fontName="DejaVu Sans" size="11" isBold="false"/> </textElement> - <textFieldExpression class="java.lang.String"><![CDATA[$P{is_deleted} == "/**/" ? "<b>" + $R{full.details.show.deleted.hosts} + ":</b> " + $R{full.details.yes} : "<b>" + $R{full.details.show.deleted.hosts} + ":</b> " + $R{full.details.no}]]></textFieldExpression> - <hyperlinkTooltipExpression><![CDATA[$P{is_deleted} == "/**/" ? $R{full.details.yes} :$R{full.details.no}]]></hyperlinkTooltipExpression> + <textFieldExpression class="java.lang.String"><![CDATA[$P{is_deleted} == "" ? "<b>" + $R{full.details.show.deleted.hosts} + ":</b> " + $R{full.details.yes} : "<b>" + $R{full.details.show.deleted.hosts} + ":</b> " + $R{full.details.no}]]></textFieldExpression> + <hyperlinkTooltipExpression><![CDATA[$P{is_deleted} == "" ? $R{full.details.yes} :$R{full.details.no}]]></hyperlinkTooltipExpression> </textField> </frame> <textField evaluationTime="Report" isBlankWhenNull="false"> diff --git a/reports/repository_files/resources/Reports/Trend/Virtual_machines/five_least_utilized_vms_Over_Time_BR12_files/full details.jrxml.data b/reports/repository_files/resources/Reports/Trend/Virtual_machines/five_least_utilized_vms_Over_Time_BR12_files/full details.jrxml.data index 76b414f..40789af 100644 --- a/reports/repository_files/resources/Reports/Trend/Virtual_machines/five_least_utilized_vms_Over_Time_BR12_files/full details.jrxml.data +++ b/reports/repository_files/resources/Reports/Trend/Virtual_machines/five_least_utilized_vms_Over_Time_BR12_files/full details.jrxml.data @@ -133,8 +133,8 @@ <textElement textAlignment="Justified" verticalAlignment="Middle" markup="html"> <font fontName="DejaVu Sans" size="11" isBold="false"/> </textElement> - <textFieldExpression class="java.lang.String"><![CDATA[$P{is_deleted} == "/**/" ? "<b>" + $R{full.details.show.deleted.vms} + ":</b> " + $R{full.details.yes} : "<b>" + $R{full.details.show.deleted.vms} + ":</b> " + $R{full.details.no}]]></textFieldExpression> - <hyperlinkTooltipExpression><![CDATA[$P{is_deleted} == "/**/" ? $R{full.details.yes} :$R{full.details.no}]]></hyperlinkTooltipExpression> + <textFieldExpression class="java.lang.String"><![CDATA[$P{is_deleted} == "" ? "<b>" + $R{full.details.show.deleted.vms} + ":</b> " + $R{full.details.yes} : "<b>" + $R{full.details.show.deleted.vms} + ":</b> " + $R{full.details.no}]]></textFieldExpression> + <hyperlinkTooltipExpression><![CDATA[$P{is_deleted} == "" ? $R{full.details.yes} :$R{full.details.no}]]></hyperlinkTooltipExpression> </textField> </frame> <textField evaluationTime="Report" isBlankWhenNull="false"> diff --git a/reports/repository_files/resources/Reports/Trend/Virtual_machines/five_most_utilized_vms_over_time_br11_files/full details.jrxml.data b/reports/repository_files/resources/Reports/Trend/Virtual_machines/five_most_utilized_vms_over_time_br11_files/full details.jrxml.data index d075e00..a0b2684 100644 --- a/reports/repository_files/resources/Reports/Trend/Virtual_machines/five_most_utilized_vms_over_time_br11_files/full details.jrxml.data +++ b/reports/repository_files/resources/Reports/Trend/Virtual_machines/five_most_utilized_vms_over_time_br11_files/full details.jrxml.data @@ -133,8 +133,8 @@ <textElement textAlignment="Justified" verticalAlignment="Middle" markup="html"> <font fontName="DejaVu Sans" size="11" isBold="false"/> </textElement> - <textFieldExpression class="java.lang.String"><![CDATA[$P{is_deleted} == "/**/" ? "<b>" + $R{full.details.show.deleted.vms} + ":</b> " + $R{full.details.yes} : "<b>" + $R{full.details.show.deleted.vms} + ":</b> " + $R{full.details.no}]]></textFieldExpression> - <hyperlinkTooltipExpression><![CDATA[$P{is_deleted} == "/**/" ? $R{full.details.yes} :$R{full.details.no}]]></hyperlinkTooltipExpression> + <textFieldExpression class="java.lang.String"><![CDATA[$P{is_deleted} == "" ? "<b>" + $R{full.details.show.deleted.vms} + ":</b> " + $R{full.details.yes} : "<b>" + $R{full.details.show.deleted.vms} + ":</b> " + $R{full.details.no}]]></textFieldExpression> + <hyperlinkTooltipExpression><![CDATA[$P{is_deleted} == "" ? $R{full.details.yes} :$R{full.details.no}]]></hyperlinkTooltipExpression> </textField> </frame> <textField evaluationTime="Report" isBlankWhenNull="false"> -- To view, visit http://gerrit.ovirt.org/7629 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib4ed35597569f22cf10c718a829fce654c714df8 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-reports Gerrit-Branch: master Gerrit-Owner: Yaniv Dary <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
