From 8049dfdfda8c6d8f58a645edbb67b0a90b313736 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9gis=20Hanol?= <regis@hanol.fr>
Date: Tue, 12 Jan 2016 11:29:26 +0100
Subject: [PATCH] CLEANUP: remove 'contains_messages' leftover :poop:

---
 .../discourse/components/category-chooser.js.es6     |  1 -
 .../javascripts/discourse/controllers/topic.js.es6   |  7 +------
 .../javascripts/discourse/models/category.js.es6     |  1 -
 .../javascripts/discourse/models/composer.js.es6     |  8 +++-----
 .../templates/components/edit-category-settings.hbs  |  6 ------
 app/controllers/categories_controller.rb             |  1 -
 app/models/category.rb                               |  1 -
 app/models/topic.rb                                  |  1 -
 app/serializers/basic_category_serializer.rb         |  3 +--
 config/locales/client.en.yml                         |  1 -
 ...0112101818_remove_contains_message_on_category.rb |  5 +++++
 spec/controllers/topics_controller_spec.rb           | 12 ------------
 12 files changed, 10 insertions(+), 37 deletions(-)
 create mode 100644 db/migrate/20160112101818_remove_contains_message_on_category.rb

diff --git a/app/assets/javascripts/discourse/components/category-chooser.js.es6 b/app/assets/javascripts/discourse/components/category-chooser.js.es6
index 1611fcbe5d5..6e49537e887 100644
--- a/app/assets/javascripts/discourse/components/category-chooser.js.es6
+++ b/app/assets/javascripts/discourse/components/category-chooser.js.es6
@@ -22,7 +22,6 @@ export default ComboboxView.extend({
     return categories.filter(c => {
       if (scopedCategoryId && c.get('id') !== scopedCategoryId && c.get('parent_category_id') !== scopedCategoryId) { return false; }
       if (c.get('isUncategorizedCategory')) { return false; }
-      if (c.get('contains_messages')) { return false; }
       return c.get('permission') === PermissionType.FULL;
     });
   },
diff --git a/app/assets/javascripts/discourse/controllers/topic.js.es6 b/app/assets/javascripts/discourse/controllers/topic.js.es6
index 9c84a6d5027..617ad97ee95 100644
--- a/app/assets/javascripts/discourse/controllers/topic.js.es6
+++ b/app/assets/javascripts/discourse/controllers/topic.js.es6
@@ -90,12 +90,7 @@ export default Ember.Controller.extend(SelectedPostsCount, BufferedContent, {
     this.set('selectedReplies', []);
   }.on('init'),
 
-  @computed("model.isPrivateMessage", "model.category_id")
-  showCategoryChooser(isPrivateMessage, categoryId) {
-    const category = Discourse.Category.findById(categoryId);
-    const containsMessages = category && category.get("contains_messages");
-    return !isPrivateMessage && !containsMessages;
-  },
+  showCategoryChooser: Ember.computed.not("model.isPrivateMessage"),
 
   gotoInbox(name) {
     var url = '/users/' + this.get('currentUser.username_lower') + '/messages';
diff --git a/app/assets/javascripts/discourse/models/category.js.es6 b/app/assets/javascripts/discourse/models/category.js.es6
index e507419c0ef..d26f68f1dd2 100644
--- a/app/assets/javascripts/discourse/models/category.js.es6
+++ b/app/assets/javascripts/discourse/models/category.js.es6
@@ -87,7 +87,6 @@ const Category = RestModel.extend({
         custom_fields: this.get('custom_fields'),
         topic_template: this.get('topic_template'),
         suppress_from_homepage: this.get('suppress_from_homepage'),
-        contains_messages: this.get("contains_messages"),
       },
       type: this.get('id') ? 'PUT' : 'POST'
     });
diff --git a/app/assets/javascripts/discourse/models/composer.js.es6 b/app/assets/javascripts/discourse/models/composer.js.es6
index f0bc7eaca1f..98488a6a4c4 100644
--- a/app/assets/javascripts/discourse/models/composer.js.es6
+++ b/app/assets/javascripts/discourse/models/composer.js.es6
@@ -67,12 +67,10 @@ const Composer = RestModel.extend({
   creatingPrivateMessage: Em.computed.equal('action', PRIVATE_MESSAGE),
   notCreatingPrivateMessage: Em.computed.not('creatingPrivateMessage'),
 
-  @computed("privateMessage", "archetype.hasOptions", "categoryId")
-  showCategoryChooser(isPrivateMessage, hasOptions, categoryId) {
+  @computed("privateMessage", "archetype.hasOptions")
+  showCategoryChooser(isPrivateMessage, hasOptions) {
     const manyCategories = Discourse.Category.list().length > 1;
-    const category = Discourse.Category.findById(categoryId);
-    const containsMessages = category && category.get("contains_messages");
-    return !isPrivateMessage && !containsMessages && (hasOptions || manyCategories);
+    return !isPrivateMessage && (hasOptions || manyCategories);
   },
 
   privateMessage: function(){
diff --git a/app/assets/javascripts/discourse/templates/components/edit-category-settings.hbs b/app/assets/javascripts/discourse/templates/components/edit-category-settings.hbs
index 1a7fa9b421a..722a9f5e1f8 100644
--- a/app/assets/javascripts/discourse/templates/components/edit-category-settings.hbs
+++ b/app/assets/javascripts/discourse/templates/components/edit-category-settings.hbs
@@ -20,12 +20,6 @@
 </section>
 
 {{#if emailInEnabled}}
-  <section class='field'>
-    <label>
-      {{input type="checkbox" checked=category.contains_messages}}
-      {{i18n 'category.contains_messages'}}
-    </label>
-  </section>
   <section class='field'>
     <label>
       {{input type="checkbox" checked=category.email_in_allow_strangers}}
diff --git a/app/controllers/categories_controller.rb b/app/controllers/categories_controller.rb
index 5e6a25f1b87..52437468d36 100644
--- a/app/controllers/categories_controller.rb
+++ b/app/controllers/categories_controller.rb
@@ -178,7 +178,6 @@ class CategoriesController < ApplicationController
                         :position,
                         :email_in,
                         :email_in_allow_strangers,
-                        :contains_messages,
                         :suppress_from_homepage,
                         :parent_category_id,
                         :auto_close_hours,
diff --git a/app/models/category.rb b/app/models/category.rb
index 7ada616b828..0ee810e6410 100644
--- a/app/models/category.rb
+++ b/app/models/category.rb
@@ -474,7 +474,6 @@ end
 #  auto_close_based_on_last_post :boolean          default(FALSE)
 #  topic_template                :text
 #  suppress_from_homepage        :boolean          default(FALSE)
-#  contains_messages             :boolean          default(FALSE), not null
 #
 # Indexes
 #
diff --git a/app/models/topic.rb b/app/models/topic.rb
index 022efc4985c..b0f42666627 100644
--- a/app/models/topic.rb
+++ b/app/models/topic.rb
@@ -544,7 +544,6 @@ class Topic < ActiveRecord::Base
 
   def change_category_to_id(category_id)
     return false if private_message?
-    return false if category.try(:contains_messages)
 
     new_category_id = category_id.to_i
     # if the category name is blank, reset the attribute
diff --git a/app/serializers/basic_category_serializer.rb b/app/serializers/basic_category_serializer.rb
index 2bf18d85612..4ab3917e0e4 100644
--- a/app/serializers/basic_category_serializer.rb
+++ b/app/serializers/basic_category_serializer.rb
@@ -19,8 +19,7 @@ class BasicCategorySerializer < ApplicationSerializer
              :background_url,
              :can_edit,
              :topic_template,
-             :has_children,
-             :contains_messages
+             :has_children
 
   def include_parent_category_id?
     parent_category_id
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index f8df19ae191..02365e18784 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -1631,7 +1631,6 @@ en:
       email_in_allow_strangers: "Accept emails from anonymous users with no accounts"
       email_in_disabled: "Posting new topics via email is disabled in the Site Settings. To enable posting new topics via email, "
       email_in_disabled_click: 'enable the "email in" setting.'
-      contains_messages: "Change this category to only contain messages."
       suppress_from_homepage: "Suppress this category from the homepage."
       allow_badges_label: "Allow badges to be awarded in this category"
       edit_permissions: "Edit Permissions"
diff --git a/db/migrate/20160112101818_remove_contains_message_on_category.rb b/db/migrate/20160112101818_remove_contains_message_on_category.rb
new file mode 100644
index 00000000000..df4187b95a1
--- /dev/null
+++ b/db/migrate/20160112101818_remove_contains_message_on_category.rb
@@ -0,0 +1,5 @@
+class RemoveContainsMessageOnCategory < ActiveRecord::Migration
+  def change
+    remove_column :categories, :contains_messages
+  end
+end
diff --git a/spec/controllers/topics_controller_spec.rb b/spec/controllers/topics_controller_spec.rb
index b92a14817b0..69281fca35b 100644
--- a/spec/controllers/topics_controller_spec.rb
+++ b/spec/controllers/topics_controller_spec.rb
@@ -898,18 +898,6 @@ describe TopicsController do
           end
         end
 
-        context 'when topic is in support category' do
-          let(:another_category) { Fabricate(:category) }
-
-          it "cannot change the category of a topic that is in a support category" do
-            @topic.category = Fabricate(:category, contains_messages: true)
-            @topic.save!
-            xhr :put, :update, topic_id: @topic.id, slug: @topic.title, category_id: another_category.id
-            expect(response).not_to be_success
-          end
-
-        end
-
         context "allow_uncategorized_topics is false" do
           before do
             SiteSetting.stubs(:allow_uncategorized_topics).returns(false)