witten
/
luminotes
Archived
1
0
Fork 0
Code Releases Activity

Add username on conflicting revision to change notification message.

This commit is contained in:
Dan Helfman 2008-01-04 21:50:11 +00:00
parent 762de24bca
commit 1b830c06a1
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
static/js/Wiki.js
View File

@ -1146,7 +1146,11 @@ Wiki.prototype.update_editor_revisions = function ( result, editor ) {
"value": "compare versions",
"title": "compare your version with the modified version"
} );
this.display_error( 'Your changes to the note titled "' + editor.title + '" have overwritten changes made in another window.', [ compare_button ], editor.iframe );
this.display_error(
'Your changes to the note titled "' + editor.title +
'" have overwritten changes made in another window by ' + result.previous_revision.username + '.',
[ compare_button ], editor.iframe
);
var self = this;
connect( compare_button, "onclick", function ( event ) {