mirror of
https://github.com/ether/etherpad-lite.git
synced 2025-05-04 22:27:10 -04:00
Merge 97119b9bdd
into a9540cb8b7
This commit is contained in:
commit
9dadeeec86
5 changed files with 56 additions and 4 deletions
|
@ -34,7 +34,7 @@ var exportHtml = require("../utils/ExportHtml");
|
||||||
exports.createGroup = groupManager.createGroup;
|
exports.createGroup = groupManager.createGroup;
|
||||||
exports.createGroupIfNotExistsFor = groupManager.createGroupIfNotExistsFor;
|
exports.createGroupIfNotExistsFor = groupManager.createGroupIfNotExistsFor;
|
||||||
exports.deleteGroup = groupManager.deleteGroup;
|
exports.deleteGroup = groupManager.deleteGroup;
|
||||||
exports.listPads = groupManager.listPads;
|
exports.listGroupPads = groupManager.listGroupPads;
|
||||||
exports.createGroupPad = groupManager.createGroupPad;
|
exports.createGroupPad = groupManager.createGroupPad;
|
||||||
|
|
||||||
/**********************/
|
/**********************/
|
||||||
|
@ -58,6 +58,15 @@ exports.listSessionsOfAuthor = sessionManager.listSessionsOfAuthor;
|
||||||
/**PAD CONTENT FUNCTIONS*/
|
/**PAD CONTENT FUNCTIONS*/
|
||||||
/************************/
|
/************************/
|
||||||
|
|
||||||
|
|
||||||
|
exports.listAllPads = function(callback)
|
||||||
|
{
|
||||||
|
padManager.listAllPads(callback);
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
getText(padID, [rev]) returns the text of a pad
|
getText(padID, [rev]) returns the text of a pad
|
||||||
|
|
||||||
|
|
|
@ -244,7 +244,7 @@ exports.createGroupPad = function(groupID, padName, text, callback)
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
exports.listPads = function(groupID, callback)
|
exports.listGroupPads = function(groupID, callback)
|
||||||
{
|
{
|
||||||
exports.doesGroupExist(groupID, function(err, exists)
|
exports.doesGroupExist(groupID, function(err, exists)
|
||||||
{
|
{
|
||||||
|
|
|
@ -380,7 +380,19 @@ Class('Pad', {
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
var firstChangeset = Changeset.makeSplice("\n", 0, 0, exports.cleanText(text));
|
var firstChangeset = Changeset.makeSplice("\n", 0, 0, exports.cleanText(text));
|
||||||
|
db.get("allpads",function(err,data)
|
||||||
|
{
|
||||||
|
if(err) callback(err);
|
||||||
|
if(data){
|
||||||
|
data.push(_this.id);
|
||||||
|
db.set("allpads",data);
|
||||||
|
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
db.set("allpads",[_this.id]);
|
||||||
|
}
|
||||||
|
|
||||||
|
});
|
||||||
_this.appendRevision(firstChangeset, '');
|
_this.appendRevision(firstChangeset, '');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -471,6 +483,21 @@ Class('Pad', {
|
||||||
{
|
{
|
||||||
db.remove("pad:"+padID);
|
db.remove("pad:"+padID);
|
||||||
padManager.unloadPad(padID);
|
padManager.unloadPad(padID);
|
||||||
|
|
||||||
|
// delete entry from allpads
|
||||||
|
db.get("allpads",function(err,data)
|
||||||
|
{
|
||||||
|
if(err) callback(err);
|
||||||
|
if(data){
|
||||||
|
delete data[padID];
|
||||||
|
db.set("allpads",data);
|
||||||
|
}
|
||||||
|
else{
|
||||||
|
//nothing to do, although there should be an entry
|
||||||
|
}
|
||||||
|
|
||||||
|
});
|
||||||
|
|
||||||
callback();
|
callback();
|
||||||
}
|
}
|
||||||
], function(err)
|
], function(err)
|
||||||
|
|
|
@ -123,3 +123,18 @@ exports.unloadPad = function(padId)
|
||||||
if(globalPads.get(padId))
|
if(globalPads.get(padId))
|
||||||
globalPads.remove(padId);
|
globalPads.remove(padId);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
exports.listAllPads = function(callback)
|
||||||
|
{
|
||||||
|
db.get("allpads",function(err,data)
|
||||||
|
{
|
||||||
|
if(err) callback(err);
|
||||||
|
if(data){
|
||||||
|
callback(err,data);
|
||||||
|
}
|
||||||
|
else callback(err,[]);
|
||||||
|
|
||||||
|
});
|
||||||
|
|
||||||
|
|
||||||
|
}
|
||||||
|
|
|
@ -38,7 +38,8 @@ var functions = {
|
||||||
"createGroup" : [],
|
"createGroup" : [],
|
||||||
"createGroupIfNotExistsFor" : ["groupMapper"],
|
"createGroupIfNotExistsFor" : ["groupMapper"],
|
||||||
"deleteGroup" : ["groupID"],
|
"deleteGroup" : ["groupID"],
|
||||||
"listPads" : ["groupID"],
|
"listAllPads" : [],
|
||||||
|
"listGroupPads" : ["groupID"],
|
||||||
"createPad" : ["padID", "text"],
|
"createPad" : ["padID", "text"],
|
||||||
"createGroupPad" : ["groupID", "padName", "text"],
|
"createGroupPad" : ["groupID", "padName", "text"],
|
||||||
"createAuthor" : ["name"],
|
"createAuthor" : ["name"],
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue