witten/luminotes
Archived
1
0
Fork 0
Code Releases Activity

If you click on a link for a note that's in the trash, you just get a message telling you so, with a button to undelete the note.

Browse Source
This commit is contained in:
Dan Helfman 2007-10-22 23:17:56 +00:00
parent 8dabd65291
commit 84283f524e
4 changed files with 46 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
controller/Notebooks.py
View File

@ -175,6 +175,7 @@ class Notebooks( object ):
if notebook and note.notebook_id == notebook.trash_id:
return dict(
note = None,
note_id_in_trash = note.object_id,
)
raise Access_error()

1
controller/test/Test_notebooks.py
View File

@ -1081,6 +1081,7 @@ class Test_notebooks( Test_controller ):
), session_id = self.session_id )
assert result[ "note" ] is None
assert result[ "note_id_in_trash" ] == self.note.object_id
def test_delete_note_from_trash( self ):
self.login()

2
static/js/Editor.js
View File

@ -554,7 +554,7 @@ function parse_query( link ) {
// convenience function for getting a link's title (stripped of whitespace), either from a query
// argument in the href, from the actual link title, or from the link's href
function link_title( link, query ) {
if ( link.target )
if ( link && link.target )
return link.href;
if ( !query )

47
static/js/Wiki.js
View File

@ -233,7 +233,8 @@ Wiki.prototype.load_editor = function ( note_title, note_id, revision, link ) {
window.open( link.href );
return
}
link.removeAttribute( "target" );
if ( link.target )
link.removeAttribute( "target" );
}
// if the note corresponding to the link's id is already open, highlight it and bail, but only if
@ -314,7 +315,8 @@ Wiki.prototype.resolve_link = function ( note_title, link, callback ) {
if ( callback ) callback( "web link" );
return;
}
link.removeAttribute( "target" );
if ( link && link.target )
link.removeAttribute( "target" );
if ( note_title == "all notes" || note_title == "search results" ) {
link.href = "/notebooks/" + this.notebook_id + "?" + queryString(
@ -342,7 +344,8 @@ Wiki.prototype.resolve_link = function ( note_title, link, callback ) {
// if the note corresponding to the link's title is already open, resolve the link and bail
var editor = this.open_editors[ note_title ];
if ( editor ) {
link.href = "/notebooks/" + this.notebook_id + "?note_id=" + editor.id;
if ( link )
link.href = "/notebooks/" + this.notebook_id + "?note_id=" + editor.id;
if ( callback )
callback( editor.contents() );
return;
@ -370,6 +373,22 @@ Wiki.prototype.resolve_link = function ( note_title, link, callback ) {
}
Wiki.prototype.parse_loaded_editor = function ( result, note_title, requested_revision, link ) {
if ( result.note_id_in_trash ) {
var undelete_button = createDOM( "input", {
"type": "button",
"class": "message_button",
"value": "undelete",
"title": "undelete note"
} );
var trash_link = createDOM( "a", {
"href": "/notebooks/" + this.notebook.trash_id + "?parent_id=" + this.notebook.object_id
}, "trash" );
this.display_message( "That note is in the", [ trash_link, ". ", undelete_button ] )
var self = this;
connect( undelete_button, "onclick", function ( event ) { self.undelete_editor_via_undelete( event, result.note_id_in_trash ); } );
return;
}
if ( result.note ) {
var id = result.note.object_id;
if ( requested_revision )
@ -676,7 +695,7 @@ Wiki.prototype.delete_editor = function ( event, editor ) {
var trash_link = createDOM( "a", {
"href": "/notebooks/" + this.notebook.trash_id + "?parent_id=" + this.notebook.object_id
}, "trash" );
this.display_message( 'The note has been moved to the', [ trash_link, ". ", undo_button ] )
this.display_message( "The note has been moved to the", [ trash_link, ". ", undo_button ] )
var self = this;
connect( undo_button, "onclick", function ( event ) { self.undelete_editor_via_undo( event, editor ); } );
}
@ -748,6 +767,26 @@ Wiki.prototype.undelete_editor_via_undo = function( event, editor ) {
event.stop();
}
Wiki.prototype.undelete_editor_via_undelete = function( event, note_id ) {
this.clear_messages();
this.clear_pulldowns();
if ( this.notebook.read_write ) {
var self = this;
this.invoker.invoke( "/notebooks/undelete_note", "POST", {
"notebook_id": this.notebook_id,
"note_id": note_id
}, function ( result ) { self.display_storage_usage( result.storage_bytes ); } );
}
this.startup_notes[ note_id ] = true;
this.increment_total_notes_count();
this.load_editor( "Note not found.", note_id, null );
event.stop();
}
Wiki.prototype.compare_versions = function( event, editor, previous_revision ) {
this.clear_pulldowns();