diff --git a/server/go/camlistored/ui.go b/server/go/camlistored/ui.go index f76ab28d2..2e9f4e778 100644 --- a/server/go/camlistored/ui.go +++ b/server/go/camlistored/ui.go @@ -213,8 +213,9 @@ func (ui *UIHandler) serveDiscovery(rw http.ResponseWriter, req *http.Request) { pubRoots := map[string]interface{}{} for key, pubh := range ui.PublishRoots { - pubRoots[key] = map[string]interface{}{ + pubRoots[pubh.RootName] = map[string]interface{}{ "name": pubh.RootName, + "prefix": []string{key}, // TODO: include gpg key id } } diff --git a/server/go/camlistored/ui/camli.js b/server/go/camlistored/ui/camli.js index cbecb603d..28083b61d 100644 --- a/server/go/camlistored/ui/camli.js +++ b/server/go/camlistored/ui/camli.js @@ -81,6 +81,26 @@ function camliDescribeBlob(blobref, opts) { xhr.send(); } +function makeURL(base, map) { + for (var key in map) { + if (base.indexOf("?") == -1) { + base += "?"; + } else { + base += "&"; + } + base += key + "=" + encodeURIComponent(map[key]); + } + return base; +} + +function camliPermanodeOfSignerAttrValue(signer, attr, value, opts) { + var xhr = camliJsonXhr("camliPermanodeOfSignerAttrValue", opts); + var path = makeURL(Camli.config.searchRoot + "camli/search/signerattrvalue", + { signer: signer, attr: attr, value: value }); + xhr.open("GET", path, true); + xhr.send(); +} + function camliGetPermanodeClaims(permanode, opts) { var xhr = camliJsonXhr("camliGetPermanodeClaims", opts); var path = Camli.config.searchRoot + "camli/search/claims?permanode=" + diff --git a/server/go/camlistored/ui/permanode.html b/server/go/camlistored/ui/permanode.html index 513020f57..935baf235 100644 --- a/server/go/camlistored/ui/permanode.html +++ b/server/go/camlistored/ui/permanode.html @@ -35,14 +35,6 @@ -
-