Author: timopollmeier
Date: 2016-09-22 12:56:49 +0200 (Thu, 22 Sep 2016)
New Revision: 26260
Modified:
trunk/gsa/ChangeLog
trunk/gsa/src/html/classic/graphics.xsl
trunk/gsa/src/html/classic/js/gsa_dashboard.js
trunk/gsa/src/html/classic/omp.xsl
Log:
* src/html/classic/graphics.xsl (js-scan-management-top-visualization)
(js-assets-top-visualization, js-secinfo-top-visualization)
(js-notes-top-visualization, js-overrides-top-visualization): Add
data-hide-filter-select attribute to dashboard definition divs to
hide the filter drop-downs.
* src/html/classic/omp.xsl (get_tasks_chart, get_aggregate)
(get_assets_chart): Add data-hide-filter-select attribute to dashboard
definition divs.
* src/html/classic/js/gsa_dashboard.js
(DashboardDisplay.prototype._updateFilters): Also include filters where
type is an empty string, i.e. filters without type restrictions.
(on_ready): Get hide_filter_select option from dashboard div.
Modified: trunk/gsa/ChangeLog
===================================================================
--- trunk/gsa/ChangeLog 2016-09-22 10:32:40 UTC (rev 26259)
+++ trunk/gsa/ChangeLog 2016-09-22 10:56:49 UTC (rev 26260)
@@ -1,3 +1,20 @@
+2016-09-22 Timo Pollmeier <timo.pollme...@greenbone.net>
+
+ * src/html/classic/graphics.xsl (js-scan-management-top-visualization)
+ (js-assets-top-visualization, js-secinfo-top-visualization)
+ (js-notes-top-visualization, js-overrides-top-visualization): Add
+ data-hide-filter-select attribute to dashboard definition divs to
+ hide the filter drop-downs.
+
+ * src/html/classic/omp.xsl (get_tasks_chart, get_aggregate)
+ (get_assets_chart): Add data-hide-filter-select attribute to dashboard
+ definition divs.
+
+ * src/html/classic/js/gsa_dashboard.js
+ (DashboardDisplay.prototype._updateFilters): Also include filters where
+ type is an empty string, i.e. filters without type restrictions.
+ (on_ready): Get hide_filter_select option from dashboard div.
+
2016-09-22 Matthew Mundell <matthew.mund...@greenbone.net>
* src/gsad.c (main): Call omp_init in the --unix-socket case, so that
Modified: trunk/gsa/src/html/classic/graphics.xsl
===================================================================
--- trunk/gsa/src/html/classic/graphics.xsl 2016-09-22 10:32:40 UTC (rev
26259)
+++ trunk/gsa/src/html/classic/graphics.xsl 2016-09-22 10:56:49 UTC (rev
26260)
@@ -704,7 +704,8 @@
data-default-controller-string="{$type}-by-cvss"
data-dashboard-controls="top-dashboard-controls"
data-no-chart-links="{/envelope/params/no_chart_links}"
- data-max-components="4">
+ data-max-components="4"
+ data-hide-filter-select="1">
<xsl:if test="$type='task'">
<xsl:call-template name="task-charts">
@@ -799,7 +800,8 @@
data-default-controller-string="{$type}-by-cvss"
data-dashboard-controls="top-dashboard-controls"
data-no-chart-links="{/envelope/params/no_chart_links}"
- data-max-components="4">
+ data-max-components="4"
+ data-hide-filter-select="1">
<xsl:if test="$type = 'host'">
<xsl:call-template name="host-charts">
@@ -877,7 +879,8 @@
data-default-heights="{$default_heights}"
data-dashboard-controls="top-dashboard-controls"
data-no-chart-links="{/envelope/params/no_chart_links}"
- data-max-components="4">
+ data-max-components="4"
+ data-hide-filter-select="1">
<xsl:if test="$type = 'nvt'">
<xsl:call-template name="nvt-charts">
@@ -979,7 +982,8 @@
data-default-heights="{$default_heights}"
data-default-controller-string="note-by-active-days"
data-dashboard-controls="top-dashboard-controls"
- data-max-components="4">
+ data-max-components="4"
+ data-hide-filter-select="1">
<xsl:call-template name="note-charts">
<xsl:with-param name="filter" select="$filter"/>
@@ -1025,7 +1029,8 @@
data-default-heights="{$default_heights}"
data-default-controller-string="override-by-active-days"
data-dashboard-controls="top-dashboard-controls"
- data-max-components="4">
+ data-max-components="4"
+ data-hide-filter-select="1">
<xsl:call-template name="override-charts">
<xsl:with-param name="filter" select="$filter"/>
Modified: trunk/gsa/src/html/classic/js/gsa_dashboard.js
===================================================================
--- trunk/gsa/src/html/classic/js/gsa_dashboard.js 2016-09-22 10:32:40 UTC
(rev 26259)
+++ trunk/gsa/src/html/classic/js/gsa_dashboard.js 2016-09-22 10:56:49 UTC
(rev 26260)
@@ -2417,7 +2417,7 @@
return;
}
this.filters = this.all_filters.filter(function(filter) {
- return filter.type === null ||
+ return filter.type === null || filter.type === '' ||
filter.type === self.current_controller.data_src.filter_type;
});
return this;
@@ -3051,6 +3051,7 @@
default_filters_string: elem.data('default-filters'),
default_heights_string: elem.data('default-heights'),
hide_controller_select: elem.data('hide-controller-select'),
+ hide_filter_select: elem.data('hide-filter-select'),
dashboard_controls: '#' + elem.data('dashboard-controls'),
}
);
Modified: trunk/gsa/src/html/classic/omp.xsl
===================================================================
--- trunk/gsa/src/html/classic/omp.xsl 2016-09-22 10:32:40 UTC (rev 26259)
+++ trunk/gsa/src/html/classic/omp.xsl 2016-09-22 10:56:49 UTC (rev 26260)
@@ -8490,6 +8490,7 @@
data-default-controllers="tasks-chart"
data-filter-id="{$filt_id}"
data-hide-controller-select="1"
+ data-hide-filter-select="1"
data-detached="1"
data-max-components="1">
<div class="dashboard-data-source"
@@ -9978,7 +9979,8 @@
data-no-chart-links="{/envelope/params/no_chart_links}"
data-max-components="1"
data-detached="1"
- data-hide-controller-select="1">
+ data-hide-controller-select="1"
+ data-hide-filter-select="1">
<div class="dashboard-data-source"
data-soure-name="aggregate-source"
data-type="aggregate"
@@ -39735,6 +39737,7 @@
data-default-controllers="assets-chart"
data-filter-id="{$filt_id}"
data-hide-controller-select="1"
+ data-hide-filter-select="1"
data-detached="1"
data-max-components="1">
<div class="dashboard-data-source"
_______________________________________________
Openvas-commits mailing list
Openvas-commits@wald.intevation.org
https://lists.wald.intevation.org/cgi-bin/mailman/listinfo/openvas-commits
