[prev in list] [next in list] [prev in thread] [next in thread] 

List:       openvas-cvs
Subject:    [Openvas-commits] r24250 - in trunk/gsa: . src/html/classic/js
From:       scm-commit () wald ! intevation ! org
Date:       2016-01-29 11:33:42
Message-ID: 20160129113342.7B5A49A18EA5 () wald ! intevation ! org
[Download RAW message or body]

Author: bricks
Date: 2016-01-29 12:33:42 +0100 (Fri, 29 Jan 2016)
New Revision: 24250

Modified:
   trunk/gsa/ChangeLog
   trunk/gsa/src/html/classic/js/greenbone.js
Log:
* src/html/classic/js/greenbone.js (init_omp_dialog): Allow to overwrite
parent reload option via the data-parent-reload attribute on the button
element. With this change a button for a new dialog can decide weather a
parent dialog should be reloaded after the new dialog is closed.

Modified: trunk/gsa/ChangeLog
===================================================================
--- trunk/gsa/ChangeLog	2016-01-28 15:32:32 UTC (rev 24249)
+++ trunk/gsa/ChangeLog	2016-01-29 11:33:42 UTC (rev 24250)
@@ -1,3 +1,10 @@
+2016-01-29  Björn Ricks <bjoern.ricks@greenbone.net>
+
+	* src/html/classic/js/greenbone.js (init_omp_dialog): Allow to overwrite
+	parent reload option via the data-parent-reload attribute on the button
+	element. With this change a button for a new dialog can decide weather a
+	parent dialog should be reloaded after the new dialog is closed.
+
 2016-01-28  Matthew Mundell <matthew.mundell@greenbone.net>
 
 	* src/html/classic/help.xsl (html-edit-alert-form): Correct name of

Modified: trunk/gsa/src/html/classic/js/greenbone.js
===================================================================
--- trunk/gsa/src/html/classic/js/greenbone.js	2016-01-28 15:32:32 UTC (rev 24249)
+++ trunk/gsa/src/html/classic/js/greenbone.js	2016-01-29 11:33:42 UTC (rev 24250)
@@ -650,7 +650,13 @@
     var parent_dialog = options.element.parents('.dialog-form')[0];
     var parent_reload = options.parent_reload === undefined ?
       undefined : !!options.parent_reload;
+    var elem_parent_reload = options.element.data('parent-reload');
 
+    if (elem_parent_reload !== undefined) {
+      // overwrite default parent_reload from options
+      parent_reload = !!elem_parent_reload;
+    }
+
     if (cmd === undefined) {
       cmd = options.type + '_' + type_name;
 



_______________________________________________
Openvas-commits mailing list
Openvas-commits@wald.intevation.org
https://lists.wald.intevation.org/cgi-bin/mailman/listinfo/openvas-commits

[prev in list] [next in list] [prev in thread] [next in thread]