summaryrefslogtreecommitdiff
path: root/app/models
diff options
context:
space:
mode:
authorAzul <azul@leap.se>2014-07-12 09:12:48 +0200
committerAzul <azul@leap.se>2014-07-17 12:47:47 +0200
commitb17387a17669bfc9afce7435653cd8c29c686999 (patch)
tree70410bf1df84d88a2c400c7e5c2a78e4550d0126 /app/models
parentade74d8a9091ae607586d7b287a0579a2ee7af8e (diff)
some cleanup of the messages api and cuke feature
Diffstat (limited to 'app/models')
-rw-r--r--app/models/message.rb4
-rw-r--r--app/models/user.rb7
2 files changed, 6 insertions, 5 deletions
diff --git a/app/models/message.rb b/app/models/message.rb
index 424f094..2478f3f 100644
--- a/app/models/message.rb
+++ b/app/models/message.rb
@@ -26,4 +26,8 @@ class Message < CouchRest::Model::Base
def unread_by?(user)
user_ids_to_show.include?(user.id)
end
+
+ def as_json(*args, &block)
+ {"id" => id, "text" => text}.as_json(*args, &block)
+ end
end
diff --git a/app/models/user.rb b/app/models/user.rb
index 6bc5841..9ac7d3d 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -92,12 +92,9 @@ class User < CouchRest::Model::Base
Ticket.for_user(self).limit(count).all #defaults to having most recent updated first
end
- def messages(unseen = true)
+ def messages
#TODO for now this only shows unseen messages. Will we ever want seen ones? Is it necessary to store?
-
- # we don't want to emit all the userids associated with a message, so only emit id and text.
- Message.by_user_ids_to_show.key(self.id).map { |message| [message.id, message.text] }
-
+ Message.by_user_ids_to_show.key(self.id)
end
# DEPRECATED