last minor fixes

diff --git a/app/views/diary_entry/view.html.erb b/app/views/diary_entry/view.html.erb
index b1159195de8187995949da5cb3b679c420460969..6a2a21abcba3bf26b0b341a5dd1fb4019501af57 100644 (file)
--- a/app/views/diary_entry/view.html.erb
+++ b/app/views/diary_entry/view.html.erb
@@ -21,7 +21,7 @@
     <%= richtext_area :diary_comment, :body, :cols => 80, :rows => 15 %>
     <%= submit_tag t('diary_entry.view.save_button') %>
   <% end %>
     <%= richtext_area :diary_comment, :body, :cols => 80, :rows => 15 %>
     <%= submit_tag t('diary_entry.view.save_button') %>
   <% end %>

-  <% if @user and @entry.subscribers and @entry.subscribers.exists?(@user.id) %>
+  <% if @user and @entry.subscribers.exists?(@user.id) %>

     <div class="diary-subscribe-buttons"><%= link_to t('javascripts.changesets.show.unsubscribe'), diary_entry_unsubscribe_path(:display_name => @entry.user.display_name, :id => @entry.id), :method => :post, :class => :button %></div>
   <% elsif @user %>
     <div class="diary-subscribe-buttons"><%= link_to t('javascripts.changesets.show.subscribe'), diary_entry_subscribe_path(:display_name => @entry.user.display_name, :id => @entry.id), :method => :post, :class => :button %></div>
     <div class="diary-subscribe-buttons"><%= link_to t('javascripts.changesets.show.unsubscribe'), diary_entry_unsubscribe_path(:display_name => @entry.user.display_name, :id => @entry.id), :method => :post, :class => :button %></div>
   <% elsif @user %>
     <div class="diary-subscribe-buttons"><%= link_to t('javascripts.changesets.show.subscribe'), diary_entry_subscribe_path(:display_name => @entry.user.display_name, :id => @entry.id), :method => :post, :class => :button %></div>

diff --git a/db/migrate/20161002153425_add_join_table_between_users_and_diary_entries.rb b/db/migrate/20161002153425_add_join_table_between_users_and_diary_entries.rb
index 276abeef4c042081559daa7a90177180b4326246..cb8e455dd1c3feca9bfea642214609043aec0f63 100644 (file)
--- a/db/migrate/20161002153425_add_join_table_between_users_and_diary_entries.rb
+++ b/db/migrate/20161002153425_add_join_table_between_users_and_diary_entries.rb
@@ -1,11 +1,19 @@
+require "migrate"
+

 class AddJoinTableBetweenUsersAndDiaryEntries < ActiveRecord::Migration
 class AddJoinTableBetweenUsersAndDiaryEntries < ActiveRecord::Migration

-  def change
+  def self.up

     create_table :diary_entry_subscriptions, :id => false do |t|
       t.column :user_id, :bigint, :null => false
       t.column :diary_entry_id, :bigint, :null => false
     end
 
     create_table :diary_entry_subscriptions, :id => false do |t|
       t.column :user_id, :bigint, :null => false
       t.column :diary_entry_id, :bigint, :null => false
     end
 

-    add_index :diary_entry_subscriptions, [:user_id, :diary_entry_id], :unique => true, :name => "index_diary_subscriptions_on_user_id_and_diary_entry_id"
+    add_primary_key :diary_entry_subscriptions, [:user_id, :diary_entry_id]

     add_index :diary_entry_subscriptions, [:diary_entry_id]
     add_index :diary_entry_subscriptions, [:diary_entry_id]

+    add_foreign_key :diary_entry_subscriptions, :diary_entries, :name => "diary_entry_subscriptions_diary_entry_id_fkey"
+    add_foreign_key :diary_entry_subscriptions, :users, :name => "diary_entry_subscriptions_user_id_fkey"
+  end
+
+  def self.down
+    drop_table :diary_entry_subscriptions

   end
 end
   end
 end

diff --git a/test/controllers/diary_entry_controller_test.rb b/test/controllers/diary_entry_controller_test.rb
index f36de9ad51fbdbb0ab204527b07bb2534313b3e6..6ebf4ec0912fef585f6e733915cd0c9bb8c7b994 100644 (file)
--- a/test/controllers/diary_entry_controller_test.rb
+++ b/test/controllers/diary_entry_controller_test.rb
@@ -675,7 +675,7 @@ class DiaryEntryControllerTest < ActionController::TestCase
     diary_entry = create(:diary_entry, :user_id => users(:normal_user).id)
 
     # not signed in
     diary_entry = create(:diary_entry, :user_id => users(:normal_user).id)
 
     # not signed in

-    assert_no_difference "diary_entry.subscribers.count", 1 do
+    assert_no_difference "diary_entry.subscribers.count" do

       post :subscribe, :id => diary_entry.id, :display_name => diary_entry.user.display_name
     end
     assert_response :forbidden
       post :subscribe, :id => diary_entry.id, :display_name => diary_entry.user.display_name
     end
     assert_response :forbidden