[Openvas-commits] r12219 - in trunk/gsa: . src

[scm-commit@wald.intevation.org]

Author: mattm
Date: 2011-11-30 08:03:56 +0100 (Wed, 30 Nov 2011)
New Revision: 12219

Modified:
   trunk/gsa/ChangeLog
   trunk/gsa/src/gsad_omp.c
Log:
	* src/gsad_omp.c (create_note_omp, create_override_omp): Set both
	GET_REPORT overrides OMP flags from the URL param, so that overrides only
	show when "apply overrides" is chosen.

Modified: trunk/gsa/ChangeLog
===================================================================
--- trunk/gsa/ChangeLog	2011-11-30 06:36:45 UTC (rev 12218)
+++ trunk/gsa/ChangeLog	2011-11-30 07:03:56 UTC (rev 12219)
@@ -1,5 +1,11 @@
 2011-11-30  Matthew Mundell <matthew.mundell at greenbone.net>
 
+	* src/gsad_omp.c (create_note_omp, create_override_omp): Set both
+	GET_REPORT overrides OMP flags from the URL param, so that overrides only
+	show when "apply overrides" is chosen.
+
+2011-11-30  Matthew Mundell <matthew.mundell at greenbone.net>
+
 	Get the result details delta case of the override edit icons working.
 
 	* src/gsad_omp.c (edit_override_omp): Make param errors a bit nicer.

Modified: trunk/gsa/src/gsad_omp.c
===================================================================
--- trunk/gsa/src/gsad_omp.c	2011-11-30 06:36:45 UTC (rev 12218)
+++ trunk/gsa/src/gsad_omp.c	2011-11-30 07:03:56 UTC (rev 12219)
@@ -9247,7 +9247,7 @@
                             " notes=\"%i\""
                             " notes_details=\"1\""
                             " apply_overrides=\"%i\""
-                            " overrides=\"1\""
+                            " overrides=\"%i\""
                             " overrides_details=\"1\""
                             " result_hosts_only=\"%i\""
                             " report_id=\"%s\""
@@ -9261,6 +9261,7 @@
                             " min_cvss_base=\"%s\"/>",
                             strcmp (notes, "0") ? 1 : 0,
                             strcmp (overrides, "0") ? 1 : 0,
+                            strcmp (overrides, "0") ? 1 : 0,
                             strcmp (result_hosts_only, "0") ? 1 : 0,
                             report_id,
                             first_result,
@@ -10619,7 +10620,7 @@
                             " notes=\"%i\""
                             " notes_details=\"1\""
                             " apply_overrides=\"%i\""
-                            " overrides=\"1\""
+                            " overrides=\"%i\""
                             " overrides_details=\"1\""
                             " result_hosts_only=\"%i\""
                             " report_id=\"%s\""
@@ -10633,6 +10634,7 @@
                             " min_cvss_base=\"%s\"/>",
                             strcmp (notes, "0") ? 1 : 0,
                             strcmp (overrides, "0") ? 1 : 0,
+                            strcmp (overrides, "0") ? 1 : 0,
                             strcmp (result_hosts_only, "0") ? 1 : 0,
                             report_id,
                             first_result,