A platform for community discussion. Free, open, simple.
FIX: Allow workflow post buttons on deleted posts
Régis Hanol0a9e918a24bd
diff --git a/plugins/discourse-workflows/app/controllers/discourse_workflows/post_button_controller.rb b/plugins/discourse-workflows/app/controllers/discourse_workflows/post_button_controller.rbindex d9aa06cd1fc..fd2f0eff60c 100644--- a/plugins/discourse-workflows/app/controllers/discourse_workflows/post_button_controller.rb+++ b/plugins/discourse-workflows/app/controllers/discourse_workflows/post_button_controller.rb@@ -18,6 +18,7 @@ module DiscourseWorkflowsendon_model_not_found(:published_trigger) { raise Discourse::NotFound }on_model_not_found(:post) { raise Discourse::NotFound }+ on_model_not_found(:topic) { raise Discourse::NotFound }on_failed_policy(:can_use_post_button) { raise Discourse::InvalidAccess }on_failed_policy(:can_see_post) { raise Discourse::NotFound }on_failed_policy(:can_trigger_for_post) { raise Discourse::InvalidAccess }diff --git a/plugins/discourse-workflows/app/services/discourse_workflows/workflow/trigger_post_button.rb b/plugins/discourse-workflows/app/services/discourse_workflows/workflow/trigger_post_button.rbindex 532efbc8d00..734eb8951a8 100644--- a/plugins/discourse-workflows/app/services/discourse_workflows/workflow/trigger_post_button.rb+++ b/plugins/discourse-workflows/app/services/discourse_workflows/workflow/trigger_post_button.rb@@ -16,6 +16,7 @@ module DiscourseWorkflowsmodel :published_triggerpolicy :can_use_post_buttonmodel :post+ model :topicpolicy :can_see_postpolicy :can_trigger_for_poststep :enqueue_workflow@@ -48,7 +49,11 @@ module DiscourseWorkflowsenddef fetch_post(params:)- Post.find_by(id: params.post_id)+ Post.with_deleted.find_by(id: params.post_id)+ end++ def fetch_topic(post:)+ post.topic = Topic.with_deleted.find_by(id: post.topic_id)enddef can_see_post(post:, guardian:)diff --git a/plugins/discourse-workflows/spec/services/discourse_workflows/workflow/trigger_post_button_spec.rb b/plugins/discourse-workflows/spec/services/discourse_workflows/workflow/trigger_post_button_spec.rbindex 4c2df35680b..fe2650fd173 100644--- a/plugins/discourse-workflows/spec/services/discourse_workflows/workflow/trigger_post_button_spec.rb+++ b/plugins/discourse-workflows/spec/services/discourse_workflows/workflow/trigger_post_button_spec.rb@@ -139,6 +139,22 @@ RSpec.describe DiscourseWorkflows::Workflow::TriggerPostButton doit { is_expected.to fail_a_policy(:can_see_post) }end+ context "when a moderator triggers the first post of a deleted topic" do+ fab!(:member) { Fabricate(:moderator).tap { |user| group.add(user) } }++ before { PostDestroyer.new(admin, post_record).destroy }++ it { is_expected.to run_successfully }+ end++ context "when a group member triggers a deleted reply" do+ fab!(:post_record) { Fabricate(:post, topic: Fabricate(:topic_with_op)) }++ before { post_record.trash!(admin) }++ it { is_expected.to fail_a_policy(:can_see_post) }+ end+context "when the configured post number does not match" dobefore doupdate_workflow_node(workflow, "trigger-1") do |node|