[Reconnoiter-devel] [reconnoiter commit] r750 - trunk/ui/web/htdocs

svn-commit at lists.omniti.com svn-commit at lists.omniti.com
Thu Jun 11 11:20:03 EDT 2009


Author: umar
Date: 2009-06-11 11:20:00 -0400 (Thu, 11 Jun 2009)
New Revision: 750

Modified:
   trunk/ui/web/htdocs/template_browse_json.php
   trunk/ui/web/htdocs/template_graph.php
Log:
dont include TEXT placeholders in graph genesis, refs #112

Modified: trunk/ui/web/htdocs/template_browse_json.php
===================================================================
--- trunk/ui/web/htdocs/template_browse_json.php	2009-06-10 22:06:27 UTC (rev 749)
+++ trunk/ui/web/htdocs/template_browse_json.php	2009-06-11 15:20:00 UTC (rev 750)
@@ -196,7 +196,7 @@
 	     for(i=0; i<graphs.length; i++){
 	       gtitles+="\\n"+graphs[i].title
              }
-	     confirm("Found existing graphs made from this template:<p><textarea rows='10' disabled style='border:none;'>"+gtitles+"</textarea><p> continue and update these?",
+	     confirm("Found existing graphs made from this template:<p><textarea rows='10' disabled style='width: 100%; border:none;'>"+gtitles+"</textarea><p> continue and update these?",
 	       function () {
 	      	  $.ajax({
 		         type: "POST",

Modified: trunk/ui/web/htdocs/template_graph.php
===================================================================
--- trunk/ui/web/htdocs/template_graph.php	2009-06-10 22:06:27 UTC (rev 749)
+++ trunk/ui/web/htdocs/template_graph.php	2009-06-11 15:20:00 UTC (rev 750)
@@ -13,9 +13,9 @@
 
 $genesis_base = "templateid=".$templateid;
 
+
 foreach ($text_vars as $tv) {
   $rparams[$tv] = $_POST[$tv];
-  $genesis_base.=$tv."=".$_POST[$tv];
 }
 
 foreach ($sid_vars as $sv) {
@@ -29,8 +29,7 @@
 
 //this function will create each combination of values for each SID placeholder, against the TEXT placeholders set
 //then, it will create graphs for each of these combinations, updating a graph if one already exists with the same genesis
-//a graph's genesis is composed of its templateid, its text vars and their values, and its sid vars and their values, and
-//should be unique among saved_graphs   
+//a graph's genesis is composed of its templateid and its sid vars and their values, and should be unique among saved_graphs   
 function createGraphsFromCombos($combo, $var_vals, $i, $sid_vars, $genesis_base, $rparams, $templateid, $graph_num, $update)
     {
         global $graphs_to_update;



More information about the Reconnoiter-devel mailing list