aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKir Shatrov2012-04-24 22:37:34 -0700
committerKir Shatrov2012-04-24 22:37:34 -0700
commit18b9989c0e861337d42ebdf497deb36615e9e9a5 (patch)
tree673bfd1048f8d3c9b97341a89e1fdcfbcbe03eff
parentefa681c2f900ca401276af00e542153e6f5fd4d2 (diff)
parentc494098f0d4edb4bdc7f0d918e9ed8700cd9a25e (diff)
downloadinboxes-18b9989c0e861337d42ebdf497deb36615e9e9a5.tar.bz2
Merge pull request #16 from isqad88/master
Fixed issue #12
-rw-r--r--app/models/discussion.rb1
-rw-r--r--app/models/message.rb2
-rw-r--r--lib/generators/inboxes/templates/install.rb2
3 files changed, 4 insertions, 1 deletions
diff --git a/app/models/discussion.rb b/app/models/discussion.rb
index 9f9a07f..cc18946 100644
--- a/app/models/discussion.rb
+++ b/app/models/discussion.rb
@@ -1,6 +1,7 @@
class Discussion < ActiveRecord::Base
attr_accessor :recipient_tokens, :recipient_ids
attr_reader :recipient_ids
+ attr_accessible :recipient_tokens, :messages_attributes
# creater
has_many :messages, :dependent => :destroy
diff --git a/app/models/message.rb b/app/models/message.rb
index b57cca8..a0bddb7 100644
--- a/app/models/message.rb
+++ b/app/models/message.rb
@@ -1,4 +1,6 @@
class Message < ActiveRecord::Base
+
+ attr_accessible :body
default_scope order(:created_at)
diff --git a/lib/generators/inboxes/templates/install.rb b/lib/generators/inboxes/templates/install.rb
index e89c128..472cd95 100644
--- a/lib/generators/inboxes/templates/install.rb
+++ b/lib/generators/inboxes/templates/install.rb
@@ -2,7 +2,7 @@ class InstallInboxes < ActiveRecord::Migration
def self.up
create_table :discussions do |t|
t.integer :messages_count, :default => 0 # counter cache
- t.references :discussable
+ t.references :discussable, :polymorphic => true
t.timestamps
end