From 713685fc2e2c2093dfb9a68cca892fc147d7c473 2014-03-04 00:10:21
From: MinRK <benjaminrk@gmail.com>
Date: 2014-03-04 00:10:21
Subject: [PATCH] trust via mark cells and save, rather than trust API request

---

diff --git a/IPython/html/services/notebooks/handlers.py b/IPython/html/services/notebooks/handlers.py
index 9c263c6..dab6849 100644
--- a/IPython/html/services/notebooks/handlers.py
+++ b/IPython/html/services/notebooks/handlers.py
@@ -222,17 +222,6 @@ class NotebookHandler(IPythonHandler):
         self.finish()
 
 
-class NotebookTrustHandler(IPythonHandler):
-    
-    SUPPORTED_METHODS = ('POST')
-    
-    @web.authenticated
-    def post(self, path='', name=None):
-        """trust the specified notebook"""
-        self.notebook_manager.trust_notebook(name, path)
-        self.set_status(200)
-
-
 class NotebookCheckpointsHandler(IPythonHandler):
     
     SUPPORTED_METHODS = ('GET', 'POST')
@@ -290,7 +279,6 @@ class ModifyNotebookCheckpointsHandler(IPythonHandler):
 _checkpoint_id_regex = r"(?P<checkpoint_id>[\w-]+)"
 
 default_handlers = [
-    (r"/api/notebooks%s/trust" % notebook_path_regex, NotebookTrustHandler),
     (r"/api/notebooks%s/checkpoints" % notebook_path_regex, NotebookCheckpointsHandler),
     (r"/api/notebooks%s/checkpoints/%s" % (notebook_path_regex, _checkpoint_id_regex),
         ModifyNotebookCheckpointsHandler),
diff --git a/IPython/html/static/notebook/js/notebook.js b/IPython/html/static/notebook/js/notebook.js
index 74a23d8..90d6217 100644
--- a/IPython/html/static/notebook/js/notebook.js
+++ b/IPython/html/static/notebook/js/notebook.js
@@ -1637,7 +1637,6 @@ var IPython = (function (IPython) {
                 }
             }
         }
-        console.log('t', trusted, this.trusted);
         if (trusted != this.trusted) {
             this.trusted = trusted;
             $([IPython.events]).trigger("trust_changed.Notebook", trusted);
@@ -1814,21 +1813,6 @@ var IPython = (function (IPython) {
      * @method trust_notebook
      */
     Notebook.prototype.trust_notebook = function (extra_settings) {
-        // We do the call with settings so we can set cache to false.
-
-        var settings = {
-            processData : false,
-            cache : false,
-            type : "POST",
-            success : $.proxy(this._trust_notebook_success, this),
-            error : $.proxy(this._trust_notebook_error, this)
-        };
-        if (extra_settings) {
-            for (var key in extra_settings) {
-                settings[key] = extra_settings[key];
-            }
-        }
-
         var body = $("<div>").append($("<p>")
                 .text("A trusted IPython notebook may execute hidden malicious code ")
                 .append($("<strong>")
@@ -1853,30 +1837,23 @@ var IPython = (function (IPython) {
                 Trust : {
                     class : "btn-danger",
                     click : function () {
-                        $([IPython.events]).trigger('notebook_trusting.Notebook');
-                        var url = utils.url_join_encode(
-                            nb.base_url,
-                            'api/notebooks',
-                            nb.notebook_path,
-                            nb.notebook_name,
-                            'trust'
-                        );
-                        $.ajax(url, settings);
+                        var cells = nb.get_cells();
+                        for (var i = 0; i < cells.length; i++) {
+                            var cell = cells[i];
+                            if (cell.cell_type == 'code') {
+                                cell.output_area.trusted = true;
+                            }
+                        }
+                        $([IPython.events]).on('notebook_saved.Notebook', function () {
+                            window.location.reload();
+                        });
+                        nb.save_notebook();
                     }
                 }
             }
         });
     };
 
-    Notebook.prototype._trust_notebook_success = function (data, status, xhr) {
-        $([IPython.events]).trigger('notebook_trusted.Notebook');
-        window.location.reload();
-    };
-
-    Notebook.prototype._trust_notebook_error = function (xhr, status, error) {
-        $([IPython.events]).trigger('notebook_trust_failed.Notebook', [xhr, status, error]);
-    };
-
     Notebook.prototype.new_notebook = function(){
         var path = this.notebook_path;
         var base_url = this.base_url;