mirror of
https://github.com/discourse/discourse.git
synced 2024-11-24 12:28:59 +08:00
DEV: Do not include method definitions in serializer attributes
These accidental inclusions are mostly no-ops (because the method name is also included as an explicit symbol). The mistakes were made more obvious because syntax_tree adjusted the indentation of these methods
This commit is contained in:
parent
5a003715d3
commit
f05da14fb6
|
@ -17,10 +17,11 @@ class CurrentUserOptionSerializer < ApplicationSerializer
|
|||
:seen_popups,
|
||||
:should_be_redirected_to_top,
|
||||
:redirected_to_top,
|
||||
:treat_as_new_topic_start_date,
|
||||
def likes_notifications_disabled
|
||||
object.likes_notifications_disabled?
|
||||
end
|
||||
:treat_as_new_topic_start_date
|
||||
|
||||
def likes_notifications_disabled
|
||||
object.likes_notifications_disabled?
|
||||
end
|
||||
|
||||
def include_redirected_to_top?
|
||||
object.redirected_to_top.present?
|
||||
|
|
|
@ -10,10 +10,11 @@ class TopicLinkSerializer < ApplicationSerializer
|
|||
:clicks,
|
||||
:user_id,
|
||||
:domain,
|
||||
:root_domain,
|
||||
def attachment
|
||||
Discourse.store.has_been_uploaded?(object.url)
|
||||
end
|
||||
:root_domain
|
||||
|
||||
def attachment
|
||||
Discourse.store.has_been_uploaded?(object.url)
|
||||
end
|
||||
|
||||
def include_user_id?
|
||||
object.user_id.present?
|
||||
|
|
|
@ -9,10 +9,11 @@ class TopicPostCountSerializer < BasicUserSerializer
|
|||
:flair_bg_color,
|
||||
:admin,
|
||||
:moderator,
|
||||
:trust_level,
|
||||
def id
|
||||
object[:user].id
|
||||
end
|
||||
:trust_level
|
||||
|
||||
def id
|
||||
object[:user].id
|
||||
end
|
||||
|
||||
def username
|
||||
object[:user].username
|
||||
|
|
|
@ -36,11 +36,11 @@ class UserOptionSerializer < ApplicationSerializer
|
|||
:skip_new_user_tips,
|
||||
:default_calendar,
|
||||
:oldest_search_log_date,
|
||||
:seen_popups,
|
||||
def auto_track_topics_after_msecs
|
||||
object.auto_track_topics_after_msecs ||
|
||||
SiteSetting.default_other_auto_track_topics_after_msecs
|
||||
end
|
||||
:seen_popups
|
||||
|
||||
def auto_track_topics_after_msecs
|
||||
object.auto_track_topics_after_msecs || SiteSetting.default_other_auto_track_topics_after_msecs
|
||||
end
|
||||
|
||||
def notification_level_when_replying
|
||||
object.notification_level_when_replying ||
|
||||
|
|
|
@ -67,16 +67,15 @@ class UserSerializer < UserCardSerializer
|
|||
:sidebar_list_destination,
|
||||
:display_sidebar_tags
|
||||
|
||||
untrusted_attributes :bio_raw,
|
||||
:bio_cooked,
|
||||
:profile_background_upload_url,
|
||||
###
|
||||
### ATTRIBUTES
|
||||
###
|
||||
#
|
||||
def user_notification_schedule
|
||||
object.user_notification_schedule || UserNotificationSchedule::DEFAULT
|
||||
end
|
||||
untrusted_attributes :bio_raw, :bio_cooked, :profile_background_upload_url
|
||||
|
||||
###
|
||||
### ATTRIBUTES
|
||||
###
|
||||
#
|
||||
def user_notification_schedule
|
||||
object.user_notification_schedule || UserNotificationSchedule::DEFAULT
|
||||
end
|
||||
|
||||
def mailing_list_posts_per_day
|
||||
val = Post.estimate_posts_per_day
|
||||
|
|
Loading…
Reference in New Issue
Block a user