diff --git a/app/controllers/status_messages_controller.rb b/app/controllers/status_messages_controller.rb
index 27806867159e602cd9f0a043bf5eb121eed3bc3c..51e389bf88abe5c3ca9a719ec633fd2223f960bc 100644
--- a/app/controllers/status_messages_controller.rb
+++ b/app/controllers/status_messages_controller.rb
@@ -62,7 +62,7 @@ class StatusMessagesController < ApplicationController
else
respond_to do |format|
format.js { render :json =>{:errors => @status_message.errors.full_messages}, :status => 406 }
- format.html {redirect_to :back}
+ format.html {redirect_to :back}
end
end
end
@@ -80,7 +80,7 @@ class StatusMessagesController < ApplicationController
def show
@status_message = current_user.find_visible_post_by_id params[:id]
- if @status_messag
+ if @status_message
@object_aspect_ids = @status_message.aspects.map{|a| a.id}
# mark corresponding notification as read
diff --git a/db/migrate/20110225190919_create_private_messages.rb b/db/migrate/20110225190919_create_private_messages.rb
deleted file mode 100644
index d858aa51aab6ac81e92be771196da88725142f48..0000000000000000000000000000000000000000
--- a/db/migrate/20110225190919_create_private_messages.rb
+++ /dev/null
@@ -1,18 +0,0 @@
-class CreatePrivateMessages < ActiveRecord::Migration
- def self.up
- create_table :private_messages do |t|
- t.integer :author_id, :null => false
- t.boolean :unread, :null => false, :default => true
- t.string :guid, :null => false
- t.text :message, :null => false
-
- t.timestamps
- end
-
- add_index :private_messages, :author_id
- end
-
- def self.down
- drop_table :private_messages
- end
-end
diff --git a/db/migrate/20110225193130_create_private_message_visibilities.rb b/db/migrate/20110225190919_create_private_messages_and_visibilities.rb
similarity index 56%
rename from db/migrate/20110225193130_create_private_message_visibilities.rb
rename to db/migrate/20110225190919_create_private_messages_and_visibilities.rb
index 553e8906c6c275dfa51003e0ad2d6d1633f65daf..f5fce46f3d48592758518ad31a41084b79014f65 100644
--- a/db/migrate/20110225193130_create_private_message_visibilities.rb
+++ b/db/migrate/20110225190919_create_private_messages_and_visibilities.rb
@@ -1,8 +1,18 @@
-class CreatePrivateMessageVisibilities < ActiveRecord::Migration
+class CreatePrivateMessagesAndVisibilities < ActiveRecord::Migration
def self.up
+ create_table :private_messages do |t|
+ t.integer :author_id, :null => false
+ t.string :guid, :null => false
+ t.text :message, :null => false
+
+ t.timestamps
+ end
+
+
create_table :private_message_visibilities do |t|
t.integer :private_message_id
t.integer :person_id
+ t.boolean :unread, :null => false, :default => true
t.timestamps
end
@@ -10,9 +20,11 @@ class CreatePrivateMessageVisibilities < ActiveRecord::Migration
add_index :private_message_visibilities, :person_id
add_index :private_message_visibilities, :private_message_id
add_index :private_message_visibilities, [:private_message_id, :person_id], :name => 'pm_visibilities_on_pm_id_and_person_id', :unique => true
+ add_index :private_messages, :author_id
end
def self.down
+ drop_table :private_messages
drop_table :private_message_visibilities
end
end
diff --git a/db/schema.rb b/db/schema.rb
index 4ffd5826908af5bdd83c666da3c2c3994b942a64..bc959b9455b02b98c8630a391e206508d8de4e49 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,11 +10,7 @@
#
# It's strongly recommended to check this file into your version control system.
-<<<<<<< HEAD
ActiveRecord::Schema.define(:version => 20110228201109) do
-=======
-ActiveRecord::Schema.define(:version => 20110225193130) do
->>>>>>> added PrivateMessage and PrivateMessageVisibility models and migrations
create_table "aspect_memberships", :force => true do |t|
t.integer "aspect_id", :null => false
@@ -390,6 +386,7 @@ ActiveRecord::Schema.define(:version => 20110225193130) do
create_table "private_message_visibilities", :force => true do |t|
t.integer "private_message_id"
t.integer "person_id"
+ t.boolean "unread", :default => true, :null => false
t.datetime "created_at"
t.datetime "updated_at"
end
@@ -399,10 +396,9 @@ ActiveRecord::Schema.define(:version => 20110225193130) do
add_index "private_message_visibilities", ["private_message_id"], :name => "index_private_message_visibilities_on_private_message_id"
create_table "private_messages", :force => true do |t|
- t.integer "author_id", :null => false
- t.boolean "unread", :default => true, :null => false
- t.string "guid", :null => false
- t.text "message", :null => false
+ t.integer "author_id", :null => false
+ t.string "guid", :null => false
+ t.text "message", :null => false
t.datetime "created_at"
t.datetime "updated_at"
end
diff --git a/spec/controllers/aspect_memberships_controller_spec.rb b/spec/controllers/aspect_memberships_controller_spec.rb
index 007d914b96064283abbc6a6f27697144d9fb3a57..f79429dc293453b180a80a5f122676e5f30ab6ad 100644
--- a/spec/controllers/aspect_memberships_controller_spec.rb
+++ b/spec/controllers/aspect_memberships_controller_spec.rb
@@ -23,13 +23,6 @@ describe AspectMembershipsController do
request.env["HTTP_REFERER"] = 'http://' + request.host
end
- describe "#new" do
- it 'succeeds' do
- get :new
- response.should be_success
- end
- end
-
describe '#create' do
it 'creates an aspect membership' do
@user.should_receive(:add_contact_to_aspect)
diff --git a/spec/controllers/status_messages_controller_spec.rb b/spec/controllers/status_messages_controller_spec.rb
index 77521f13425366c07749fe496e2b824f62eff6e1..4f3afa575b110811447effec4d61505d1158d4f2 100644
--- a/spec/controllers/status_messages_controller_spec.rb
+++ b/spec/controllers/status_messages_controller_spec.rb
@@ -65,9 +65,9 @@ describe StatusMessagesController do
end
it "dispatches the post to the specified services" do
- s1 = Services::Facebook.new
+ s1 = Services::Facebook.new
@user1.services << s1
- @user1.services << Services::Twitter.new
+ @user1.services << Services::Twitter.new
status_message_hash[:services] = ['facebook']
@user1.should_receive(:dispatch_post).with(anything(), hash_including(:services => [s1]))
post :create, status_message_hash