From 1257639109e322a18f2b96143ca7c03993e82475 Mon Sep 17 00:00:00 2001 From: evazion Date: Mon, 26 Dec 2016 22:24:01 -0600 Subject: [PATCH] Add 'post as moderator' option for comments. * Add 'post as moderator' option to comment form. This creates a so-called sticky comment. * Downvotes have no effect on stickied comments; they're always visible, regardless of comment thresholds. * Only mods may sticky comments. * Mods may sticky comments by other users. --- app/assets/stylesheets/specific/comments.css.scss | 13 +++++++++---- app/controllers/comments_controller.rb | 12 ++++++++++-- app/models/comment.rb | 11 ++++++----- app/views/comments/_form.html.erb | 11 ++++++++++- app/views/comments/edit.html.erb | 8 +------- app/views/comments/partials/index/_list.html.erb | 2 +- app/views/comments/partials/new/_form.html.erb | 10 ---------- app/views/comments/partials/show/_comment.html.erb | 4 ++-- db/migrate/20161227003428_add_sticky_to_comments.rb | 5 +++++ 9 files changed, 44 insertions(+), 32 deletions(-) delete mode 100644 app/views/comments/partials/new/_form.html.erb create mode 100644 db/migrate/20161227003428_add_sticky_to_comments.rb diff --git a/app/assets/stylesheets/specific/comments.css.scss b/app/assets/stylesheets/specific/comments.css.scss index 36a7360a6..6fe78eb3a 100644 --- a/app/assets/stylesheets/specific/comments.css.scss +++ b/app/assets/stylesheets/specific/comments.css.scss @@ -48,10 +48,6 @@ div.comments-for-post { opacity: 1.0; } } - - div.comment-preview { - margin-bottom: 2em; - } } div#c-posts { @@ -146,3 +142,12 @@ div#c-comments { } } } + +form.edit_comment div.input.boolean { + display: inline-block; + + label { + font-weight: normal; + vertical-align: initial; + } +} diff --git a/app/controllers/comments_controller.rb b/app/controllers/comments_controller.rb index ff38ab0f6..75a33ec0c 100644 --- a/app/controllers/comments_controller.rb +++ b/app/controllers/comments_controller.rb @@ -23,12 +23,12 @@ class CommentsController < ApplicationController def update @comment = Comment.find(params[:id]) check_privilege(@comment) - @comment.update_attributes(params[:comment].permit(:body)) + @comment.update(update_params, :as => CurrentUser.role) respond_with(@comment, :location => post_path(@comment.post_id)) end def create - @comment = Comment.create(params[:comment]) + @comment = Comment.create(create_params, :as => CurrentUser.role) respond_with(@comment) do |format| format.html do if @comment.errors.any? @@ -110,4 +110,12 @@ private raise User::PrivilegeError end end + + def create_params + params.require(:comment).permit(:post_id, :body, :do_not_bump_post, :is_sticky) + end + + def update_params + params.require(:comment).permit(:body, :is_deleted, :is_sticky) + end end diff --git a/app/models/comment.rb b/app/models/comment.rb index aa1a24f54..ad1d2606d 100644 --- a/app/models/comment.rb +++ b/app/models/comment.rb @@ -12,7 +12,8 @@ class Comment < ActiveRecord::Base before_validation :initialize_updater after_create :update_last_commented_at_on_create after_destroy :update_last_commented_at_on_destroy - attr_accessible :body, :post_id, :do_not_bump_post, :is_deleted + attr_accessible :body, :post_id, :do_not_bump_post, :is_deleted, :as => [:member, :gold, :platinum, :builder, :janitor, :moderator, :admin] + attr_accessible :is_sticky, :as => [:moderator, :admin] mentionable( :message_field => :body, :user_field => :creator_id, @@ -34,11 +35,11 @@ class Comment < ActiveRecord::Base end def hidden(user) - where("score < ?", user.comment_threshold) + where("score < ? and is_sticky = false", user.comment_threshold) end def visible(user) - where("score >= ?", user.comment_threshold) + where("score >= ? or is_sticky = true", user.comment_threshold) end def deleted @@ -208,11 +209,11 @@ class Comment < ActiveRecord::Base end def delete! - update_attributes(:is_deleted => true) + update({ :is_deleted => true }, :as => CurrentUser.role) end def undelete! - update_attributes(:is_deleted => false) + update({ :is_deleted => false }, :as => CurrentUser.role) end end diff --git a/app/views/comments/_form.html.erb b/app/views/comments/_form.html.erb index 0c5b47949..6117a6051 100644 --- a/app/views/comments/_form.html.erb +++ b/app/views/comments/_form.html.erb @@ -1,5 +1,14 @@ +<%= error_messages_for :comment %> + <%= simple_form_for(comment, :html => {:class => "edit_comment"}) do |f| %> + <%= f.hidden_field :post_id %> <%= dtext_field "comment", "body", :value => comment.body, :input_id => "comment_body_for_#{comment.id}", :preview_id => "dtext-preview-for-#{comment.id}" %> - <%= f.button :submit, "Submit" %> + <%= f.button :submit, "Submit", :data => { :disable_with => "Submitting..." } %> <%= dtext_preview_button "comment", "body", :input_id => "comment_body_for_#{comment.id}", :preview_id => "dtext-preview-for-#{comment.id}" %> + <% if comment.new_record? %> + <%= f.input :do_not_bump_post, :label => "No bump" %> + <% end %> + <% if CurrentUser.is_moderator? %> + <%= f.input :is_sticky, :label => "Post as moderator" %> + <% end %> <% end %> diff --git a/app/views/comments/edit.html.erb b/app/views/comments/edit.html.erb index e68f0087c..26e62c7c5 100644 --- a/app/views/comments/edit.html.erb +++ b/app/views/comments/edit.html.erb @@ -2,13 +2,7 @@

Edit Comment

- <%= error_messages_for "comment" %> - - <%= simple_form_for(@comment) do |f| %> - <%= dtext_field "comment", "body" %> - <%= f.button :submit, "Submit" %> - <%= dtext_preview_button "comment", "body" %> - <% end %> + <%= render "comments/form", :post => @comment.post, :comment => @comment %>
diff --git a/app/views/comments/partials/index/_list.html.erb b/app/views/comments/partials/index/_list.html.erb index dbe729038..6cf957800 100644 --- a/app/views/comments/partials/index/_list.html.erb +++ b/app/views/comments/partials/index/_list.html.erb @@ -28,7 +28,7 @@ <% if CurrentUser.is_member? %>

<%= link_to "Post comment", new_comment_path, :class => "expand-comment-response" %>

- <%= render "comments/partials/new/form", :post => post %> + <%= render "comments/form", :post => post, :comment => post.comments.new %>
<% end %> diff --git a/app/views/comments/partials/new/_form.html.erb b/app/views/comments/partials/new/_form.html.erb deleted file mode 100644 index 59978a6cd..000000000 --- a/app/views/comments/partials/new/_form.html.erb +++ /dev/null @@ -1,10 +0,0 @@ -
-
- -<%= form_tag(comments_path, :class => "simple_form comment-form") do %> - <%= hidden_field "comment", "post_id", :value => post.id %> - <%= dtext_field "comment", "body", :input_id => "comment_response_for_#{post.id}", :preview_id => "dtext-preview-for-#{post.id}" %> - <%= submit_tag "Post", :data => { :disable_with => "Submitting..." } %> - <%= dtext_preview_button "comment", "body", :input_id => "comment_response_for_#{post.id}", :preview_id => "dtext-preview-for-#{post.id}" %> - <%= check_box "comment", "do_not_bump_post", :id => "comment_do_not_bump_post_#{post.id}" %> -<% end %> diff --git a/app/views/comments/partials/show/_comment.html.erb b/app/views/comments/partials/show/_comment.html.erb index 395804bdd..cbfe8323a 100644 --- a/app/views/comments/partials/show/_comment.html.erb +++ b/app/views/comments/partials/show/_comment.html.erb @@ -1,6 +1,6 @@ <% if CurrentUser.is_moderator? || !comment.is_deleted? %> -
+

<%= link_to_user comment.creator %> @@ -39,7 +39,7 @@ <% end %> <% if comment.editable_by?(CurrentUser.user) %> - <%= render "comments/form", :comment => comment %> + <%= render "comments/form", :post => comment.post, :comment => comment %> <% end %> <% end %>

diff --git a/db/migrate/20161227003428_add_sticky_to_comments.rb b/db/migrate/20161227003428_add_sticky_to_comments.rb new file mode 100644 index 000000000..124da10af --- /dev/null +++ b/db/migrate/20161227003428_add_sticky_to_comments.rb @@ -0,0 +1,5 @@ +class AddStickyToComments < ActiveRecord::Migration + def change + add_column :comments, :is_sticky, :boolean, null: false, default: false + end +end