Changeset dbd0c9dbeda6f50b3591b96efc2de01c606c0d25

Timestamp:

11/01/10 18:30:04 (3 years ago)

Author:

Theo Schlossnagle <jesus@omniti.com>

git-committer:

Theo Schlossnagle <jesus@omniti.com> 1288636204 +0000

git-parent:

[0c28d603d67bca2fd0190fb5509dc5e0733a8f2e]

git-author:

Theo Schlossnagle <jesus@omniti.com> 1288636204 +0000

Message:

fixes #197 -- thanks Michal Táborský

Files:

• ui/web/htdocs/.htaccess (modified) (1 diff)
• ui/web/htdocs/delete_worksheet.php (added)
• ui/web/htdocs/js/recon.js (modified) (2 diffs)
• ui/web/lib/Reconnoiter_DB.php (modified) (1 diff)

ui/web/htdocs/.htaccess

@@ -8 +8 @@
-RewriteRule ^json/worksheet/search$ worksheet_search_json.php [PT,QSA]
-RewriteRule ^json/worksheet/deletegraph/([^/]+)/([^/]+)$ worksheet_graph_delete.php?wid=$1&gid=$2 [PT,QSA]
+RewriteRule ^json/worksheet/forget/([^/]+)/([^/]+)$ worksheet_delete.php?id=$1&force=$2 [PT,QSA]
-RewriteRule ^json/graph/info/([^/]*)$ graph_info.php?id=$1 [PT,QSA]
-RewriteRule ^json/graph/store$ graph_store.php [PT,QSA]

ui/web/htdocs/js/recon.js

@@ -877 +877 @@
-        }
-    })(ws.sheetid));
+    var del = $('<a href="#"/>');
+    del.html('Forget').addClass('deletews');
+    del.click((function(sheetid, li) {
+        return function() {
+                        $.getJSON('json/worksheet/forget/' + sheetid + '/0', function(r) {
+                    if (r.refed) {
+                        var msg = "This worksheet contains following graphs:<p>";
+                        for (var g in r.refed) {
+                            msg += "<br>" + r.refed[g];
+                        }
+                        msg += "<p>Are you sure you want to forget it?";
+                        confirm(msg, function() {
+                            $.getJSON('json/worksheet/forget/' + sheetid + '/1', function(r) {
+                                if (r.error) {
+                                    modal_warning("Database Error!", r.error);
+                                }
+                                else {
+                                        perform_ws_search_edit(params);
+                                    if (worksheet.get_sheetid() == sheetid) {
+                                        worksheet.load();
+                                    }
+                                }
+                            });
+                        });
+                    }
+                    else {
+                        if (r.error) {
+                            modal_warning("Database Error!", r.error);
+                        }
+                        else {
+                                perform_ws_search_edit(params);
+                            if (worksheet.get_sheetid() == sheetid) {
+                                worksheet.load();
+                            }
+                        }
+                    }
+            });
+            return false;
+        }
+    })(ws.sheetid, li));
-    var ul = $('<ul/>');
-    ul.append($('<li/>').html(ws.last_update));
-    ul.append($('<li/>').append(add));
+    ul.append($('<li/>').append(del));
-    li.append($('<div class="worksheetlist-title"/>').html(ws.title)).append(ul);
-}
@@ -1562 +1603 @@
-        islocked: function() {
-            return locked;
+        },
+        get_sheetid: function() {
+                return wsinfo.id;
-        }
-    };

ui/web/lib/Reconnoiter_DB.php

@@ -499 +499 @@
-    $sth->execute(array($ws_id, $graphid));
-  }
+  function deleteWorksheet($ws_id) {
+    $this->db->beginTransaction();
+    try {
+        // we have to delete the dependencies first, because the foreign
+        // key has no ON DELETE CASCADE
+        $sth = $this->db->prepare("delete from prism.saved_worksheets_dep 
+                                      where sheetid=?");
+        $sth->execute(array($ws_id));
+                // now it is safe to delete the worksheet itself 
+        $sth = $this->db->prepare("delete from prism.saved_worksheets 
+                                          where sheetid=?");
+        $sth->execute(array($ws_id));
+        $this->db->commit();
+    } catch(PDOException $e) {
+      $this->db->rollback();
+      throw(new Exception('DB: ' . $e->getMessage()));
+    }
+  }
+  function getGraphsByWorksheet($ws_id){
+
+    $sth = $this->db->prepare("select saved_graphs.title 
+                                 from prism.saved_graphs
+                         natural join prism.saved_worksheets_dep
+                                where prism.saved_worksheets_dep.sheetid=?");
+
+    $sth->execute(array($ws_id));
+    
+    $rv = array();
+    while($row = $sth->fetch()) {
+      $rv[] = $row['title'];
+    }
+    return $rv;
+  }
-  function getWorksheetsByGraph($graphid){
-