mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-05-05 14:47:12 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 52

Merge f7d8f68c13 into a8469dcdaa

Browse source
This commit is contained in:
GitHub Merge Button 2012-02-15 05:42:39 -08:00
commit 2fb1f7a3fd
5 changed files with 137 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

32
node/db/Pad.js
View file

@ -12,6 +12,7 @@ var async = require("async");
var settings = require('../utils/Settings');
var authorManager = require("./AuthorManager");
var padManager = require("./PadManager");
var groupManager = require("./GroupManager");
var padMessageHandler = require("../handler/PadMessageHandler");
var readOnlyManager = require("./ReadOnlyManager");
var crypto = require("crypto");
@ -351,6 +352,20 @@ Pad.prototype.init = function init(text, callback) {
{
var firstChangeset = Changeset.makeSplice("\n", 0, 0, exports.cleanText(text));
// if this is a non group pad, add this to the defaultGroup
if(_this.id.indexOf("$")==-1)
{
groupID = "g.defaultGroupName";
groupManager.doesGroupExist(groupID, function(err, exists)
{
if(!exists)
{
db.set("group:" + groupID, {pads: {}});
}
});
db.setSub("group:"+groupID, ["pads", _this.id], 1);
}
_this.appendRevision(firstChangeset, '');
}
@ -391,10 +406,23 @@ Pad.prototype.remove = function remove(callback) {
callback();
});
}
//its no group pad, nothing to do here
//its no group pad, so remove this pad from the defaultGroup
else
{
callback();
var groupID = "g.defaultGroupName";
db.get("group:" + groupID, function (err, group)
{
if(ERR(err, callback)) return;
//remove the pad entry
delete group.pads[padID];
//set the new value
db.set("group:" + groupID, group);
callback();
});
}
},
//remove the readonly entries