witten
/
luminotes
Archived
1
0
Fork 0
Code Releases Activity

Deleting a notebook forever now updates the user's storage usage accordingly.

This commit is contained in:
Dan Helfman 2007-11-19 22:03:04 +00:00
parent 079f7e6f98
commit 45f94aa188
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
controller/Notebooks.py
View File

@ -872,7 +872,7 @@ class Notebooks( object ):
@type user_id: unicode or NoneType
@param user_id: id of current logged-in user (if any)
@rtype dict
@return {}
@return: { 'storage_bytes': current storage usage by user }
@raise Access_error: the current user doesn't have access to the given notebook
@raise Validation_error: one of the arguments is invalid
"""
@ -894,9 +894,10 @@ class Notebooks( object ):
raise Access_error()
self.__database.execute( user.sql_remove_notebook( notebook_id ), commit = False )
user = self.__users.update_storage( user_id, commit = False )
self.__database.commit()
return dict()
return dict( storage_bytes = user.storage_bytes )
@expose( view = Json )
@grab_user_id

3
static/js/Wiki.js
View File

@ -1544,9 +1544,10 @@ Wiki.prototype.delete_notebook_forever = function ( event, notebook_id ) {
if ( items.length == 0 )
removeElement( "deleted_notebooks" );
var self = this;
this.invoker.invoke( "/notebooks/delete_forever", "POST", {
"notebook_id": notebook_id
} );
}, function ( result ) { self.display_storage_usage( result.storage_bytes ); } );
event.stop();
}