Discourse/discourse
Discourse/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-09-07 12:02:53 +08:00
Code Packages Activity Actions 5

Stop unnecessarily suppressing settings for uncategorized

Browse source 
Fix migration for emailing into uncategorized
This commit is contained in:
riking 2014-07-11 15:12:15 -07:00
parent 17db265b41
commit 73ceeda1f9
2 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/assets/javascripts/discourse/templates/modal/edit-category.js.handlebars
View file

@ -3,9 +3,9 @@
{{edit-category-tab selectedTab=selectedTab tab="general"}} {{edit-category-tab selectedTab=selectedTab tab="general"}}
{{#unless isUncategorizedCategory}} {{#unless isUncategorizedCategory}}
{{edit-category-tab selectedTab=selectedTab tab="security"}} {{edit-category-tab selectedTab=selectedTab tab="security"}}
{{edit-category-tab selectedTab=selectedTab tab="settings"}}
{{edit-category-tab selectedTab=selectedTab tab="images"}}
{{/unless}} {{/unless}}
{{edit-category-tab selectedTab=selectedTab tab="settings"}}
{{edit-category-tab selectedTab=selectedTab tab="images"}}
</ul> </ul>
<div class="modal-body"> <div class="modal-body">

6
db/migrate/20140711193923_remove_email_in_address_setting.rb
View file

@ -1,9 +1,11 @@
class RemoveEmailInAddressSetting < ActiveRecord::Migration class RemoveEmailInAddressSetting < ActiveRecord::Migration
def up def up
uncat_id = ActiveRecord::Base.exec_sql("SELECT value FROM site_settings WHERE name = 'uncategorized_category_id'").first
cat_id_r = ActiveRecord::Base.exec_sql("SELECT value FROM site_settings WHERE name = 'email_in_category'").first cat_id_r = ActiveRecord::Base.exec_sql("SELECT value FROM site_settings WHERE name = 'email_in_category'").first
email_r = ActiveRecord::Base.exec_sql("SELECT value FROM site_settings WHERE name = 'email_in_address'").first email_r = ActiveRecord::Base.exec_sql("SELECT value FROM site_settings WHERE name = 'email_in_address'").first
if cat_id_r && email_r if email_r
category_id = cat_id_r["value"].to_i category_id = uncat_id["value"].to_i
category_id = cat_id_r["value"].to_i if cat_id_r
email = email_r["value"] email = email_r["value"]
ActiveRecord::Base.exec_sql("UPDATE categories SET email_in = ? WHERE id = ?", email, category_id) ActiveRecord::Base.exec_sql("UPDATE categories SET email_in = ? WHERE id = ?", email, category_id)
end end