aboutsummaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
authorKir2012-04-25 11:47:39 +0300
committerKir2012-04-25 11:47:39 +0300
commit66d10dd18f797dcaa2b9b2d8113cad328086602a (patch)
treefaf1b6818976eee9b9b68c0287814411ca726762 /app
parent7ceea085c82d6bc3e373160167a62ee4e943a197 (diff)
downloadinboxes-66d10dd18f797dcaa2b9b2d8113cad328086602a.tar.bz2
Fixing test failture
Diffstat (limited to 'app')
-rw-r--r--app/models/discussion.rb2
-rw-r--r--app/models/message.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/app/models/discussion.rb b/app/models/discussion.rb
index cc18946..8eaeb82 100644
--- a/app/models/discussion.rb
+++ b/app/models/discussion.rb
@@ -1,7 +1,7 @@
class Discussion < ActiveRecord::Base
attr_accessor :recipient_tokens, :recipient_ids
attr_reader :recipient_ids
- attr_accessible :recipient_tokens, :messages_attributes
+ attr_accessible :recipient_tokens, :messages_attributes, :user, :recipient_ids
# creater
has_many :messages, :dependent => :destroy
diff --git a/app/models/message.rb b/app/models/message.rb
index a0bddb7..f162ced 100644
--- a/app/models/message.rb
+++ b/app/models/message.rb
@@ -1,6 +1,6 @@
class Message < ActiveRecord::Base
- attr_accessible :body
+ attr_accessible :body, :user, :discussion
default_scope order(:created_at)