Changeset 99a13aa99cd589e1d28abdb0ac905497400e6d81

Timestamp:

12/15/11 23:57:45 (1 year ago)

Author:

Brad Marshall <brad.marshall@canonical.com>

git-committer:

Brad Marshall <brad.marshall@canonical.com> 1323993465 +1000

git-parent:

[65eb858bb9ff720aea647a6943df2e91d149ff19]

git-author:

Brad Marshall <brad.marshall@canonical.com> 1323993465 +1000

Message:

Updated graph templates to only append a number if there are title clashes, not all the time.

Files:

• ui/web/htdocs/template_graph.php (modified) (1 diff)
• ui/web/lib/Reconnoiter_DB.php (modified) (1 diff)

ui/web/htdocs/template_graph.php

@@ -48 +48 @@
-            $graph_json = stripslashes($graph_json);
-            $graph_json = json_decode($graph_json, true);
-            $graph_json['title'] = $graph_json['title'].$graph_num;
-            $graph_json['genesis'] = $genesis;
+
+        // Check to see if this title exists
+        $titlerow = $db->getGraphByTitle($title);
+        // if it does, append $graph_num to it
+        if ($titlerow['graphid']) {
+           $graph_json['title'] = $graph_json['title'].$graph_num;
+        }
-
-            $grow = $db->getGraphByGenesis($genesis);

ui/web/lib/Reconnoiter_DB.php

@@ -500 +500 @@
-    return $row;
-  }
+  function getGraphByTitle($title) {
+    $sth = $this->db->prepare("select *
+                                 from prism.saved_graphs
+                                where title=?");
+    $sth->execute(array($title));
+    $row = $sth->fetch();
+    return $row;
+  }
-  function deleteWorksheetGraph($ws_id, $graphid) {
-    $sth = $this->db->prepare("delete from prism.saved_worksheets_dep