libre-service.eu/pad.libre-service.eu-etherpad
libre-service.eu/pad.libre-service.eu-etherpad
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-01-20 06:29:53 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1428 from ether/padUsers-authorID

Browse source 
Include author ID in padUsers response
This commit is contained in:
John McLear 2013-01-29 09:41:39 -08:00
commit e7cb7c46c1
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
doc/api/http_api.md
View file

@ -355,7 +355,7 @@ returns the number of user that are currently editing this pad
returns the list of users that are currently editing this pad returns the list of users that are currently editing this pad
*Example returns:* *Example returns:*
* `{code: 0, message:"ok", data: {padUsers: [{colorId:"#c1a9d9","name":"username1","timestamp":1345228793126},{"colorId":"#d9a9cd","name":"Hmmm","timestamp":1345228796042}]}}` * `{code: 0, message:"ok", data: {padUsers: [{colorId:"#c1a9d9","name":"username1","timestamp":1345228793126,"id":"a.n4gEeMLsvg12452n"},{"colorId":"#d9a9cd","name":"Hmmm","timestamp":1345228796042,"id":"a.n4gEeMLsvg12452n"}]}}`
* `{code: 0, message:"ok", data: {padUsers: []}}` * `{code: 0, message:"ok", data: {padUsers: []}}`
#### deletePad(padID) #### deletePad(padID)

1
src/node/handler/PadMessageHandler.js
View file

@ -1536,6 +1536,7 @@ exports.padUsers = function (padID, callback) {
} }
var aid = sessioninfos[ix].author; var aid = sessioninfos[ix].author;
authorManager.getAuthor( aid, function ( err, author ) { authorManager.getAuthor( aid, function ( err, author ) {
author.id = aid;
authors.push( author ); authors.push( author );
if ( authors.length === pad2sessions[padID].length ) { if ( authors.length === pad2sessions[padID].length ) {
callback(null, {padUsers: authors}); callback(null, {padUsers: authors});