github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-22 16:34:31 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FEATURE: global admin override of most of the user preferences

Browse Source
This commit is contained in:
Régis Hanol
2015-08-21 20:39:21 +02:00
parent 73264648f2
commit bef80633b1
56 changed files with 438 additions and 215 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/serializers/user_serializer.rb
View File

@ -249,11 +249,11 @@ class UserSerializer < BasicUserSerializer
###
def auto_track_topics_after_msecs
object.auto_track_topics_after_msecs || SiteSetting.auto_track_topics_after
object.auto_track_topics_after_msecs || SiteSetting.default_other_auto_track_topics_after_msecs
end
def new_topic_duration_minutes
object.new_topic_duration_minutes || SiteSetting.new_topic_duration_minutes
object.new_topic_duration_minutes || SiteSetting.default_other_new_topic_duration_minutes
end
def muted_category_ids