Add user notes on accounts (#14148)
* Add UserNote model * Add UI for user notes * Put comment in relationships entity * Add API to create user notes * Copy user notes to new account when receiving a Move activity * Address some of the review remarks * Replace modal by inline edition * Please CodeClimate * Button design changes * Change design again * Cancel note edition when pressing Escape * Fixes * Tweak design again * Move “Add note” item, and allow users to add notes to themselves * Rename UserNote into AccountNote, rename “comment” Relationship attribute to “note”
This commit is contained in:
parent
ce9ae9aa50
commit
65506bac3f
22 changed files with 485 additions and 4 deletions
|
@ -3,7 +3,7 @@
|
|||
class REST::RelationshipSerializer < ActiveModel::Serializer
|
||||
attributes :id, :following, :showing_reblogs, :followed_by, :blocking, :blocked_by,
|
||||
:muting, :muting_notifications, :requested, :domain_blocking,
|
||||
:endorsed
|
||||
:endorsed, :note
|
||||
|
||||
def id
|
||||
object.id.to_s
|
||||
|
@ -50,4 +50,8 @@ class REST::RelationshipSerializer < ActiveModel::Serializer
|
|||
def endorsed
|
||||
instance_options[:relationships].endorsed[object.id] || false
|
||||
end
|
||||
|
||||
def note
|
||||
(instance_options[:relationships].account_note[object.id] || {})[:comment]
|
||||
end
|
||||
end
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue