forked from berserker/microblog
Add moderation note (#5240)
* Add moderation note * Add frozen_string_literal * Make rspec passlocal
parent
f486ef2666
commit
633426b261
15 changed files with 160 additions and 1 deletions
@ -0,0 +1,31 @@ |
|||||||
|
# frozen_string_literal: true |
||||||
|
|
||||||
|
class Admin::AccountModerationNotesController < Admin::BaseController |
||||||
|
def create |
||||||
|
@account_moderation_note = current_account.account_moderation_notes.new(resource_params) |
||||||
|
if @account_moderation_note.save |
||||||
|
@target_account = @account_moderation_note.target_account |
||||||
|
redirect_to admin_account_path(@target_account.id), notice: I18n.t('admin.account_moderation_notes.created_msg') |
||||||
|
else |
||||||
|
@account = @account_moderation_note.target_account |
||||||
|
@moderation_notes = @account.targeted_moderation_notes.latest |
||||||
|
render template: 'admin/accounts/show' |
||||||
|
end |
||||||
|
end |
||||||
|
|
||||||
|
def destroy |
||||||
|
@account_moderation_note = AccountModerationNote.find(params[:id]) |
||||||
|
@target_account = @account_moderation_note.target_account |
||||||
|
@account_moderation_note.destroy |
||||||
|
redirect_to admin_account_path(@target_account.id), notice: I18n.t('admin.account_moderation_notes.destroyed_msg') |
||||||
|
end |
||||||
|
|
||||||
|
private |
||||||
|
|
||||||
|
def resource_params |
||||||
|
params.require(:account_moderation_note).permit( |
||||||
|
:content, |
||||||
|
:target_account_id |
||||||
|
) |
||||||
|
end |
||||||
|
end |
@ -0,0 +1,4 @@ |
|||||||
|
# frozen_string_literal: true |
||||||
|
|
||||||
|
module Admin::AccountModerationNotesHelper |
||||||
|
end |
@ -0,0 +1,22 @@ |
|||||||
|
# frozen_string_literal: true |
||||||
|
|
||||||
|
# == Schema Information |
||||||
|
# |
||||||
|
# Table name: account_moderation_notes |
||||||
|
# |
||||||
|
# id :integer not null, primary key |
||||||
|
# content :text not null |
||||||
|
# account_id :integer |
||||||
|
# target_account_id :integer |
||||||
|
# created_at :datetime not null |
||||||
|
# updated_at :datetime not null |
||||||
|
# |
||||||
|
|
||||||
|
class AccountModerationNote < ApplicationRecord |
||||||
|
belongs_to :account |
||||||
|
belongs_to :target_account, class_name: 'Account' |
||||||
|
|
||||||
|
scope :latest, -> { reorder('created_at DESC') } |
||||||
|
|
||||||
|
validates :content, presence: true, length: { maximum: 500 } |
||||||
|
end |
@ -0,0 +1,10 @@ |
|||||||
|
%tr |
||||||
|
%td |
||||||
|
= simple_format(h(account_moderation_note.content)) |
||||||
|
%td |
||||||
|
= account_moderation_note.account.acct |
||||||
|
%td |
||||||
|
%time.formatted{ datetime: account_moderation_note.created_at.iso8601, title: l(account_moderation_note.created_at) } |
||||||
|
= l account_moderation_note.created_at |
||||||
|
%td |
||||||
|
= link_to t('admin.account_moderation_notes.delete'), admin_account_moderation_note_path(account_moderation_note), method: :delete |
@ -0,0 +1,12 @@ |
|||||||
|
class CreateAccountModerationNotes < ActiveRecord::Migration[5.1] |
||||||
|
def change |
||||||
|
create_table :account_moderation_notes do |t| |
||||||
|
t.text :content, null: false |
||||||
|
t.references :account |
||||||
|
t.references :target_account |
||||||
|
|
||||||
|
t.timestamps |
||||||
|
end |
||||||
|
add_foreign_key :account_moderation_notes, :accounts, column: :target_account_id |
||||||
|
end |
||||||
|
end |
@ -0,0 +1,4 @@ |
|||||||
|
require 'rails_helper' |
||||||
|
|
||||||
|
RSpec.describe Admin::AccountModerationNotesController, type: :controller do |
||||||
|
end |
@ -0,0 +1,4 @@ |
|||||||
|
Fabricator(:account_moderation_note) do |
||||||
|
content "MyText" |
||||||
|
account nil |
||||||
|
end |
@ -0,0 +1,15 @@ |
|||||||
|
require 'rails_helper' |
||||||
|
|
||||||
|
# Specs in this file have access to a helper object that includes |
||||||
|
# the Admin::AccountModerationNotesHelper. For example: |
||||||
|
# |
||||||
|
# describe Admin::AccountModerationNotesHelper do |
||||||
|
# describe "string concat" do |
||||||
|
# it "concats two strings with spaces" do |
||||||
|
# expect(helper.concat_strings("this","that")).to eq("this that") |
||||||
|
# end |
||||||
|
# end |
||||||
|
# end |
||||||
|
RSpec.describe Admin::AccountModerationNotesHelper, type: :helper do |
||||||
|
pending "add some examples to (or delete) #{__FILE__}" |
||||||
|
end |
@ -0,0 +1,5 @@ |
|||||||
|
require 'rails_helper' |
||||||
|
|
||||||
|
RSpec.describe AccountModerationNote, type: :model do |
||||||
|
pending "add some examples to (or delete) #{__FILE__}" |
||||||
|
end |
Loading…
Reference in new issue