github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-22 07:53:49 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: couldn't uncategorize a topic

Browse Source
This commit is contained in:
Régis Hanol
2015-02-16 10:31:36 +01:00
parent f7fa13049c
commit 0b45054e2b
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/topics_controller.rb
View File

@ -133,7 +133,7 @@ class TopicsController < ApplicationController
end end
changes.delete(:title) if topic.title == changes[:title] changes.delete(:title) if topic.title == changes[:title]
changes.delete(:category_id) if (changes[:category_id].blank? or topic.category_id == changes[:category_id].to_i) changes.delete(:category_id) if topic.category_id == changes[:category_id].to_i
success = true success = true
if changes.length > 0 if changes.length > 0

5
spec/controllers/topics_controller_spec.rb
View File

@ -724,6 +724,11 @@ describe TopicsController do
xhr :put, :update, topic_id: @topic.id, slug: @topic.title, category_id: 123 xhr :put, :update, topic_id: @topic.id, slug: @topic.title, category_id: 123
end end
it 'allows to change category to "uncategorized"' do
Topic.any_instance.expects(:change_category_to_id).with(0).returns(true)
xhr :put, :update, topic_id: @topic.id, slug: @topic.title, category_id: ""
end
it "returns errors with invalid titles" do it "returns errors with invalid titles" do
xhr :put, :update, topic_id: @topic.id, slug: @topic.title, title: 'asdf' xhr :put, :update, topic_id: @topic.id, slug: @topic.title, title: 'asdf'
expect(response).not_to be_success expect(response).not_to be_success