libretic/etherpad-lite
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #1375 from jhollinger/develop

Browse source 
listAllPads should return an object, not an arraay. issue #1374
This commit is contained in:
John McLear 2013-01-18 08:42:25 -08:00
commit 74c86da0ae
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/node/db/API.js
View file

@ -46,7 +46,7 @@ exports.createGroupPad = groupManager.createGroupPad;
/**PADLIST FUNCTION****/
/**********************/
exports.listAllPads = padManager.getPads;
exports.listAllPads = padManager.listAllPads;
/**********************/
/**AUTHOR FUNCTIONS****/

6
src/node/db/PadManager.js
View file

@ -158,12 +158,12 @@ exports.getPad = function(id, text, callback)
}
}
exports.getPads = function(callback)
exports.listAllPads = function(callback)
{
if(callback != null){
callback(null,padList.getPads());
callback(null,{padIDs: padList.getPads()});
}else{
return padList.getPads();
return {padIDs: padList.getPads()};
}
}