Rooba
/
perkeep
mirror of https://github.com/perkeep/perkeep.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

don't promote camliContent attr, make member be camliMember

This commit is contained in:
Brad Fitzpatrick 2011-06-11 00:27:17 -07:00
parent 5baf2713d2
commit 179b706248
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/go/camli/search/handler.go
View File

@ -298,10 +298,6 @@ func (sh *searchHandler) populatePermanodeFields(jm map[string]interface{}, pn,
attr[cl.Attr] = append(sl, cl.Value)
}
}
if sl, ok := attr["camliContent"].([]string); ok && len(sl) > 0 {
jm["content"] = sl[len(sl)-1]
attr["camliContent"] = nil, false
}
}
// If the content permanode is now known, look up its type

4
server/go/camlistored/ui/permanode.js
View File

@ -165,7 +165,7 @@ function startFileUpload(file) {
};
var addMember = function() {
setStatus("adding member");
camliNewAddAttributeClaim(getPermanodeParam(), "member", filepn, { success: doneWithAll, fail: onFail });
camliNewAddAttributeClaim(getPermanodeParam(), "camliMember", filepn, { success: doneWithAll, fail: onFail });
};
var makePermanode = function() {
setStatus("making permanode");
@ -270,7 +270,7 @@ window.addEventListener("load", function (e) {
var membersDiv = document.getElementById("members");
membersDiv.innerHTML = "";
var members = permanodeObject.attr.member;
var members = permanodeObject.attr.camliMember;
if (members && members.length > 0) {
var membersUl = document.createElement("ul");
for (idx in members) {