From: Mikel Maron <mikel_maron@yahoo.com>
Date: Wed, 12 Oct 2016 00:42:10 +0000 (-0400)
Subject: last minor fixes
X-Git-Tag: live~3755^2~4
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/3726d561ea0f5d363599ef4daf70eafef3abac38?ds=sidebyside

last minor fixes
---

diff --git a/app/views/diary_entry/view.html.erb b/app/views/diary_entry/view.html.erb
index b1159195d..6a2a21abc 100644
--- 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 %>
-  <% 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>
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 276abeef4..cb8e455dd 100644
--- 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
-  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
 
-    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_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
diff --git a/test/controllers/diary_entry_controller_test.rb b/test/controllers/diary_entry_controller_test.rb
index f36de9ad5..6ebf4ec09 100644
--- 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
-    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