redirect url after notebook rename

IPython/html/services/sessions/handlers.py

@@ -1,105 +1,104 b''
 """Tornado handlers for the notebooks web service.
 
 Authors:
 
 * Zach Sailer
 """
 
 #-----------------------------------------------------------------------------
 #  Copyright (C) 2008-2011  The IPython Development Team
 #
 #  Distributed under the terms of the BSD License.  The full license is in
 #  the file COPYING, distributed as part of this software.
 #-----------------------------------------------------------------------------
 
 #-----------------------------------------------------------------------------
 # Imports
 #-----------------------------------------------------------------------------
 
 from tornado import web
 
 from zmq.utils import jsonapi
 
 from IPython.utils.jsonutil import date_default
-
 from ...base.handlers import IPythonHandler, authenticate_unless_readonly
 
 #-----------------------------------------------------------------------------
 # Session web service handlers
 #-----------------------------------------------------------------------------
 
 
 
 class SessionRootHandler(IPythonHandler):
 
     @authenticate_unless_readonly
     def get(self):
         sm = self.session_manager
         nbm = self.notebook_manager
         km = self.kernel_manager
         sessions = sm.list_sessions()
         self.finish(jsonapi.dumps(sessions))
 
     @web.authenticated
     def post(self):
         sm = self.session_manager
         nbm = self.notebook_manager
         km = self.kernel_manager
         notebook_path = self.get_argument('notebook_path', default=None)
         notebook_name, path = nbm.named_notebook_path(notebook_path)
         session_id, model = sm.get_session(notebook_name, path)
         if model == None:
             kernel_id = km.start_kernel()
             kernel = km.kernel_model(kernel_id, self.ws_url)
             model = sm.session_model(session_id, notebook_name, path, kernel)
         self.finish(jsonapi.dumps(model))
 
 class SessionHandler(IPythonHandler):
 
     SUPPORTED_METHODS = ('GET', 'PATCH', 'DELETE')
 
     @authenticate_unless_readonly
     def get(self, session_id):
         sm = self.session_manager
         model = sm.get_session_from_id(session_id)
         self.finish(jsonapi.dumps(model))
 
     @web.authenticated
     def patch(self, session_id):
         sm = self.session_manager
         nbm = self.notebook_manager
         km = self.kernel_manager
         notebook_path = self.request.body
         notebook_name, path = nbm.named_notebook_path(notebook_path)
         kernel_id = sm.get_kernel_from_session(session_id)
         kernel = km.kernel_model(kernel_id, self.ws_url)
         sm.delete_mapping_for_session(session_id)
         model = sm.session_model(session_id, notebook_name, path, kernel)
         self.finish(jsonapi.dumps(model))
 
     @web.authenticated
     def delete(self, session_id):
         sm = self.session_manager
         nbm = self.notebook_manager
         km = self.kernel_manager
         kernel_id = sm.get_kernel_from_session(session_id)
         km.shutdown_kernel(kernel_id)
         sm.delete_mapping_for_session(session_id)
         self.set_status(204)
         self.finish()
 
 
 #-----------------------------------------------------------------------------
 # URL to handler mappings
 #-----------------------------------------------------------------------------
 
 _session_id_regex = r"(?P<session_id>\w+-\w+-\w+-\w+-\w+)"
 
 default_handlers = [
     (r"api/sessions/%s" % _session_id_regex, SessionHandler),
     (r"api/sessions",  SessionRootHandler)
 ]
 
 
 
 

IPython/html/static/notebook/js/savewidget.js

@@ -1,161 +1,166 b''
 //----------------------------------------------------------------------------
 //  Copyright (C) 2008-2011  The IPython Development Team
 //
 //  Distributed under the terms of the BSD License.  The full license is in
 //  the file COPYING, distributed as part of this software.
 //----------------------------------------------------------------------------
 
 //============================================================================
 // SaveWidget
 //============================================================================
 
 var IPython = (function (IPython) {
     "use strict";
 
     var utils = IPython.utils;
 
     var SaveWidget = function (selector) {
         this.selector = selector;
         if (this.selector !== undefined) {
             this.element = $(selector);
             this.style();
             this.bind_events();
         }
     };
 
 
     SaveWidget.prototype.style = function () {
     };
 
 
     SaveWidget.prototype.bind_events = function () {
         var that = this;
         this.element.find('span#notebook_name').click(function () {
             that.rename_notebook();
         });
         this.element.find('span#notebook_name').hover(function () {
             $(this).addClass("ui-state-hover");
         }, function () {
             $(this).removeClass("ui-state-hover");
         });
         $([IPython.events]).on('notebook_loaded.Notebook', function () {
             that.update_notebook_name();
             that.update_document_title();
         });
         $([IPython.events]).on('notebook_saved.Notebook', function () {
             that.update_notebook_name();
             that.update_document_title();
         });
         $([IPython.events]).on('notebook_renamed.Notebook', function () {
-            that.update_notebook_name();
-            that.update_document_title();
+            that.update_address_bar();
         });
         $([IPython.events]).on('notebook_save_failed.Notebook', function () {
             that.set_save_status('Autosave Failed!');
         });
         $([IPython.events]).on('checkpoints_listed.Notebook', function (event, data) {
             that.set_last_checkpoint(data[0]);
         });
 
         $([IPython.events]).on('checkpoint_created.Notebook', function (event, data) {
             that.set_last_checkpoint(data);
         });
         $([IPython.events]).on('set_dirty.Notebook', function (event, data) {
             that.set_autosaved(data.value);
         });
     };
 
 
     SaveWidget.prototype.rename_notebook = function () {
         var that = this;
         var dialog = $('<div/>').append(
             $("<p/>").addClass("rename-message")
                 .html('Enter a new notebook name:')
         ).append(
             $("<br/>")
         ).append(
             $('<input/>').attr('type','text').attr('size','25')
             .val(IPython.notebook.get_notebook_name())
         );
         IPython.dialog.modal({
             title: "Rename Notebook",
             body: dialog,
             buttons : {
                 "Cancel": {},
                 "OK": {
                     class: "btn-primary",
                     click: function () {
                     var new_name = $(this).find('input').val();
                     if (!IPython.notebook.test_notebook_name(new_name)) {
                         $(this).find('.rename-message').html(
                             "Invalid notebook name. Notebook names must "+
                             "have 1 or more characters and can contain any characters " +
                             "except :/\\. Please enter a new notebook name:"
                         );
                         return false;
                     } else {
                         IPython.notebook.notebook_rename(new_name);
                     }
                 }}
                 },
             open : function (event, ui) {
                 var that = $(this);
                 // Upon ENTER, click the OK button.
                 that.find('input[type="text"]').keydown(function (event, ui) {
                     if (event.which === utils.keycodes.ENTER) {
                         that.find('.btn-primary').first().click();
                         return false;
                     }
                 });
                 that.find('input[type="text"]').focus().select();
             }
         });
     }
 
 
     SaveWidget.prototype.update_notebook_name = function () {
         var nbname = IPython.notebook.get_notebook_name();
         this.element.find('span#notebook_name').html(nbname);
     };
 
 
     SaveWidget.prototype.update_document_title = function () {
         var nbname = IPython.notebook.get_notebook_name();
         document.title = nbname;
     };
+    
+    SaveWidget.prototype.update_address_bar = function(){
+        var nbname = IPython.notebook.notebook_name;
+        var path = IPython.notebook.notebookPath();
+        window.location = path + nbname;
+    }
 
 
     SaveWidget.prototype.set_save_status = function (msg) {
         this.element.find('span#autosave_status').html(msg);
     }
 
     SaveWidget.prototype.set_checkpoint_status = function (msg) {
         this.element.find('span#checkpoint_status').html(msg);
     }
 
     SaveWidget.prototype.set_last_checkpoint = function (checkpoint) {
         if (!checkpoint) {
             this.set_checkpoint_status("");
             return;
         }
         var d = new Date(checkpoint.last_modified);
         this.set_checkpoint_status(
             "Last Checkpoint: " + d.format('mmm dd HH:MM')
         );
     }
 
     SaveWidget.prototype.set_autosaved = function (dirty) {
         if (dirty) {
             this.set_save_status("(unsaved changes)");
         } else {
             this.set_save_status("(autosaved)");
         }
     };
 
 
     IPython.SaveWidget = SaveWidget;
 
     return IPython;
 
 }(IPython));
 

IPython/html/tree/handlers.py

@@ -1,105 +1,105 b''
 """Tornado handlers for the tree view.
 
 Authors:
 
 * Brian Granger
 """
 
 #-----------------------------------------------------------------------------
 #  Copyright (C) 2011  The IPython Development Team
 #
 #  Distributed under the terms of the BSD License.  The full license is in
 #  the file COPYING, distributed as part of this software.
 #-----------------------------------------------------------------------------
 
 #-----------------------------------------------------------------------------
 # Imports
 #-----------------------------------------------------------------------------
 
 from tornado import web
 from ..base.handlers import IPythonHandler
 from urllib import quote, unquote
 
 #-----------------------------------------------------------------------------
 # Handlers
 #-----------------------------------------------------------------------------
 
 
 class ProjectDashboardHandler(IPythonHandler):
 
     @web.authenticated
     def get(self):
         self.write(self.render_template('tree.html',
             project=self.project,
             project_component=self.project.split('/'),
             notebook_path= "''"
         ))
 
 
 class ProjectPathDashboardHandler(IPythonHandler):
 
     @authenticate_unless_readonly
     def get(self, notebook_path):
         nbm = self.notebook_manager
         name, path = nbm.named_notebook_path(notebook_path)
         if name != None:
             if path == None:
                 self.redirect(self.base_project_url + 'notebooks/' + quote(name))
             else:
                 self.redirect(self.base_project_url + 'notebooks/' + path + quote(name))
         else:
             project = self.project + '/' + notebook_path
             self.write(self.render_template('tree.html',
                 project=project,
                 project_component=project.split('/'),
                 notebook_path=path,
-                notebook_name=quote(name)))    
+                notebook_name=name))    
 
 
 class TreeRedirectHandler(IPythonHandler):
     
     @authenticate_unless_readonly
     def get(self):
         url = self.base_project_url + 'tree'
         self.redirect(url)
 
 class TreePathRedirectHandler(IPythonHandler):
 
     @authenticate_unless_readonly
     def get(self, notebook_path):
         url = self.base_project_url + 'tree/'+ notebook_path
         self.redirect(url)
 
 class ProjectRedirectHandler(IPythonHandler):
     
     @authenticate_unless_readonly
     def get(self):
         url = self.base_project_url + 'tree'
         self.redirect(url)
 
 class NewFolderHandler(IPythonHandler):
     
     @authenticate_unless_readonly
     def get(self, notebook_path):
         nbm = self.notebook_manager
         name, path = nbm.named_notebook_path(notebook_path)
         nbm.add_new_folder(path)
         url = self.base_project_url + 'tree/' + notebook_path
         self.redirect(url)
 
 
 #-----------------------------------------------------------------------------
 # URL to handler mappings
 #-----------------------------------------------------------------------------
 
 
 _notebook_path_regex = r"(?P<notebook_path>.+)"
 
 default_handlers = [
     (r"/tree/%s/-new" %_notebook_path_regex, NewFolderHandler),
     (r"/tree/%s/" % _notebook_path_regex, TreePathRedirectHandler),
     (r"/tree/%s" % _notebook_path_regex, ProjectPathDashboardHandler),
     (r"/tree", ProjectDashboardHandler),
     (r"/tree/", TreeRedirectHandler),
     (r"/", ProjectRedirectHandler)
     ]