From 4ae05c729c9d68acfe956552fdfd24ed6b29090a Mon Sep 17 00:00:00 2001 From: MinRK Date: Wed, 27 Aug 2014 12:55:50 -0700 Subject: [PATCH] trust is stored in code_cell.metadata not top-level code_cell --- IPython/html/services/contents/tests/test_manager.py | 4 ++-- IPython/html/static/notebook/js/codecell.js | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/IPython/html/services/contents/tests/test_manager.py b/IPython/html/services/contents/tests/test_manager.py index 26bd7e353..d5dfff416 100644 --- a/IPython/html/services/contents/tests/test_manager.py +++ b/IPython/html/services/contents/tests/test_manager.py @@ -311,13 +311,13 @@ class TestContentsManager(TestCase): cm.mark_trusted_cells(nb, name, path) for cell in nb.worksheets[0].cells: if cell.cell_type == 'code': - assert not cell.trusted + assert not cell.metadata.trusted cm.trust_notebook(name, path) nb = cm.get_model(name, path)['content'] for cell in nb.worksheets[0].cells: if cell.cell_type == 'code': - assert cell.trusted + assert cell.metadata.trusted def test_check_and_sign(self): cm = self.contents_manager diff --git a/IPython/html/static/notebook/js/codecell.js b/IPython/html/static/notebook/js/codecell.js index 2703042cf..6835cf940 100644 --- a/IPython/html/static/notebook/js/codecell.js +++ b/IPython/html/static/notebook/js/codecell.js @@ -472,7 +472,7 @@ define([ } else { this.set_input_prompt(); } - this.output_area.trusted = data.trusted || false; + this.output_area.trusted = data.metadata.trusted || false; this.output_area.fromJSON(data.outputs); if (data.collapsed !== undefined) { if (data.collapsed) { @@ -495,8 +495,8 @@ define([ var outputs = this.output_area.toJSON(); data.outputs = outputs; data.language = 'python'; - data.trusted = this.output_area.trusted; - data.collapsed = this.collapsed; + data.metadata.trusted = this.output_area.trusted; + data.collapsed = this.output_area.collapsed; return data; };