+ {{{i18n topic.change_owner.instructions_warn}}} +
+ + + +{{i18n topic.multi_select.cancel}}
diff --git a/app/assets/javascripts/discourse/views/modal/change_owner_view.js b/app/assets/javascripts/discourse/views/modal/change_owner_view.js new file mode 100644 index 00000000000..adfe3c17c0b --- /dev/null +++ b/app/assets/javascripts/discourse/views/modal/change_owner_view.js @@ -0,0 +1,12 @@ +/** + A modal view for handling changing the owner of various posts + + @class ChangeOwnerView + @extends Discourse.ModalBodyView + @namespace Discourse + @module Discourse + **/ +Discourse.ChangeOwnerView = Discourse.ModalBodyView.extend({ + templateName: 'modal/change_owner', + title: I18n.t('topic.change_owner.title') +}); diff --git a/app/assets/javascripts/discourse/views/modal/merge_topic_view.js b/app/assets/javascripts/discourse/views/modal/merge_topic_view.js index ed4658f48f3..24c3b1cb2ed 100644 --- a/app/assets/javascripts/discourse/views/modal/merge_topic_view.js +++ b/app/assets/javascripts/discourse/views/modal/merge_topic_view.js @@ -10,5 +10,3 @@ Discourse.MergeTopicView = Discourse.ModalBodyView.extend({ templateName: 'modal/merge_topic', title: I18n.t('topic.merge_topic.title') }); - - diff --git a/app/assets/stylesheets/desktop/history.scss b/app/assets/stylesheets/desktop/history.scss index 91f3b0947c6..b6a332a5722 100644 --- a/app/assets/stylesheets/desktop/history.scss +++ b/app/assets/stylesheets/desktop/history.scss @@ -35,6 +35,8 @@ word-wrap: break-word; .row, table { margin-top: 10px; + padding-bottom: 10px; + border-bottom: 1px dotted; } } img { diff --git a/app/assets/stylesheets/desktop/topic-post.scss b/app/assets/stylesheets/desktop/topic-post.scss index 6b08d471ae0..df932ff4ef9 100644 --- a/app/assets/stylesheets/desktop/topic-post.scss +++ b/app/assets/stylesheets/desktop/topic-post.scss @@ -622,13 +622,6 @@ iframe { } } -#selected-posts { - padding-left: 20px; - .btn { - margin-bottom: 10px; - } -} - .post-select { float: right; margin-right: 20px; @@ -914,8 +907,9 @@ blockquote { /* solo quotes */ #selected-posts { + padding-left: 20px; margin-left: 330px; - width: 12%; + width: 200px; position: fixed; z-index: 1000; left: 50%; @@ -927,7 +921,7 @@ blockquote { /* solo quotes */ button { - width: 160px; + width: 180px; margin: 4px auto; display: inline-block; text-align: left; @@ -958,9 +952,8 @@ blockquote { /* solo quotes */ border: none; color: $tertiary_text_color; font-weight: normal; - - color: $tertiary_text_color; - background: $btn-primary-background-color; + margin-bottom: 10px; + background: $btn-primary-background-color; &[href] { color: $tertiary_text_color; diff --git a/app/controllers/topics_controller.rb b/app/controllers/topics_controller.rb index f31fe6f96e6..0f1c5885911 100644 --- a/app/controllers/topics_controller.rb +++ b/app/controllers/topics_controller.rb @@ -22,7 +22,8 @@ class TopicsController < ApplicationController :clear_pin, :autoclose, :bulk, - :reset_new] + :reset_new, + :change_post_owners] before_filter :consider_user_for_promotion, only: :show @@ -242,6 +243,37 @@ class TopicsController < ApplicationController render_topic_changes(dest_topic) end + def change_post_owners + params.require(:post_ids) + params.require(:topic_id) + params.require(:username) + + guardian.ensure_can_change_post_owner! + + topic = Topic.find(params[:topic_id].to_i) + new_user = User.find_by_username(params[:username]) + ids = params[:post_ids].to_a + + unless new_user && topic && ids + render json: failed_json, status: 422 + return + end + + ActiveRecord::Base.transaction do + ids.each do |id| + post = Post.find(id) + if post.is_first_post? + topic.user = new_user # Update topic owner (first avatar) + end + post.set_owner(new_user, current_user) + end + end + + topic.update_statistics + + render json: success_json + end + def clear_pin topic = Topic.where(id: params[:topic_id].to_i).first guardian.ensure_can_see!(topic) diff --git a/app/models/post.rb b/app/models/post.rb index 297c910a9b5..d015f5327e5 100644 --- a/app/models/post.rb +++ b/app/models/post.rb @@ -314,6 +314,16 @@ class Post < ActiveRecord::Base PostRevisor.new(self).revise!(updated_by, new_raw, opts) end + def set_owner(new_user, actor) + revise(actor, self.raw, { + new_user: new_user, + changed_owner: true, + edit_reason: I18n.t('change_owner.post_revision_text', + old_user: self.user.username_lower, + new_user: new_user.username_lower) + }) + end + before_create do PostCreator.before_create_tasks(self) end @@ -472,7 +482,7 @@ class Post < ActiveRecord::Base end def save_revision - modifications = changes.extract!(:raw, :cooked, :edit_reason) + modifications = changes.extract!(:raw, :cooked, :edit_reason, :user_id) # make sure cooked is always present (oneboxes might not change the cooked post) modifications["cooked"] = [self.cooked, self.cooked] unless modifications["cooked"].present? PostRevision.create!( diff --git a/app/models/post_revision.rb b/app/models/post_revision.rb index 58bca9e96b5..990705289ee 100644 --- a/app/models/post_revision.rb +++ b/app/models/post_revision.rb @@ -41,6 +41,17 @@ class PostRevision < ActiveRecord::Base } end + def user_changes + prev = previous("user_id") + cur = current("user_id") + return if prev == cur + + { + previous_user: User.where(id: prev).first, + current_user: User.where(id: cur).first + } + end + def previous(field) lookup_with_fallback(field, 0) end diff --git a/app/serializers/post_revision_serializer.rb b/app/serializers/post_revision_serializer.rb index e2280f12be6..149865502d0 100644 --- a/app/serializers/post_revision_serializer.rb +++ b/app/serializers/post_revision_serializer.rb @@ -9,7 +9,8 @@ class PostRevisionSerializer < ApplicationSerializer :edit_reason, :body_changes, :title_changes, - :category_changes + :category_changes, + :user_changes def include_title_changes? object.has_topic_data? @@ -43,6 +44,26 @@ class PostRevisionSerializer < ApplicationSerializer object.lookup("edit_reason", 1) end + def user_changes + obj = object.user_changes + return unless obj + # same as below - if stuff is messed up, default to system + prev = obj[:previous_user] || Discourse.system_user + new = obj[:current_user] || Discourse.system_user + { + previous: { + username: prev.username_lower, + display_username: prev.username, + avatar_template: prev.avatar_template + }, + current: { + username: new.username_lower, + display_username: new.username, + avatar_template: new.avatar_template + } + } + end + def user # if stuff goes pear shape attribute to system object.user || Discourse.system_user diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml index b17a204fd80..89ef0ee58ca 100644 --- a/config/locales/client.en.yml +++ b/config/locales/client.en.yml @@ -802,7 +802,7 @@ en: invisible: "Make Invisible" visible: "Make Visible" reset_read: "Reset Read Data" - multi_select: "Select Posts to Move" + multi_select: "Select Posts" convert_to_topic: "Convert to Regular Topic" reply: @@ -868,6 +868,17 @@ en: one: "Please choose the topic you'd like to move that post to." other: "Please choose the topic you'd like to move those {{count}} posts to." + change_owner: + title: "Change Owner of Posts" + action: "change ownership" + error: "There was an error changing the ownership of the posts." + label: "New Owner of Posts" + placeholder: "username of new owner" + instructions: + one: "Please choose the new owner of the post by {{old_user}}." + other: "Please choose the new owner of the {{count}} posts by {{old_user}}." + instructions_warn: "Note that any notifications about this post will not be transferred to the new user retroactively.