summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjessib <jessib@riseup.net>2014-01-07 09:51:27 -0800
committerjessib <jessib@riseup.net>2014-01-07 09:51:27 -0800
commitb920c144ef70613414a702e468ab7889659a03da (patch)
tree02f2567f8a4eaf01b8984498f26bd56dbc42af08
parent0f803750a8540ce2e52c508acdd7279b9e85b507 (diff)
parent566eee7fa3433af443ffe99449377ab935b8fcc7 (diff)
Merge branch 'develop' into feature/messages_api
-rw-r--r--users/app/designs/user/by_alias.js8
-rw-r--r--users/app/designs/user/by_login_or_alias.js9
-rw-r--r--users/app/models/identity.rb4
3 files changed, 3 insertions, 18 deletions
diff --git a/users/app/designs/user/by_alias.js b/users/app/designs/user/by_alias.js
deleted file mode 100644
index dc8021a..0000000
--- a/users/app/designs/user/by_alias.js
+++ /dev/null
@@ -1,8 +0,0 @@
-function(doc) {
- if (doc.type != 'User') {
- return;
- }
- doc.email_aliases.forEach(function(alias){
- emit(alias.username, 1);
- });
-}
diff --git a/users/app/designs/user/by_login_or_alias.js b/users/app/designs/user/by_login_or_alias.js
deleted file mode 100644
index 2d2096c..0000000
--- a/users/app/designs/user/by_login_or_alias.js
+++ /dev/null
@@ -1,9 +0,0 @@
-function(doc) {
- if (doc.type != 'User') {
- return;
- }
- emit(doc.login, 1);
- doc.email_aliases.forEach(function(alias){
- emit(alias.username, 1);
- });
-}
diff --git a/users/app/models/identity.rb b/users/app/models/identity.rb
index cbb540e..9b97b51 100644
--- a/users/app/models/identity.rb
+++ b/users/app/models/identity.rb
@@ -24,7 +24,9 @@ class Identity < CouchRest::Model::Base
if (doc.type != 'Identity') {
return;
}
- emit(doc.address, doc.keys["pgp"]);
+ if (typeof doc.keys === "object") {
+ emit(doc.address, doc.keys["pgp"]);
+ }
}
EOJS
view :disabled,