diff --git a/app/assets/javascripts/discourse/controllers/bookmark.js b/app/assets/javascripts/discourse/controllers/bookmark.js index b4b74ec57ef..891dd2daf43 100644 --- a/app/assets/javascripts/discourse/controllers/bookmark.js +++ b/app/assets/javascripts/discourse/controllers/bookmark.js @@ -5,7 +5,6 @@ import discourseComputed from "discourse-common/utils/decorators"; import { popupAjaxError } from "discourse/lib/ajax-error"; import { htmlSafe } from "@ember/template"; import { ajax } from "discourse/lib/ajax"; -import { reads } from "@ember/object/computed"; const START_OF_DAY_HOUR = 8; const REMINDER_TYPES = { @@ -52,9 +51,16 @@ export default Controller.extend(ModalFunctionality, { } }, - usingMobileDevice: reads("site.mobileView"), showBookmarkReminderControls: true, + @discourseComputed() + showAtDesktop() { + return ( + this.siteSettings.enable_bookmark_at_desktop_reminders && + this.site.mobileView + ); + }, + @discourseComputed("selectedReminderType") customDateTimeSelected(selectedReminderType) { return selectedReminderType === REMINDER_TYPES.CUSTOM; diff --git a/app/assets/javascripts/discourse/templates/modal/bookmark.hbs b/app/assets/javascripts/discourse/templates/modal/bookmark.hbs index 661ab90f279..7adab91b633 100644 --- a/app/assets/javascripts/discourse/templates/modal/bookmark.hbs +++ b/app/assets/javascripts/discourse/templates/modal/bookmark.hbs @@ -24,7 +24,7 @@ {{#if userHasTimezoneSet}} {{#tap-tile-grid activeTile=selectedReminderType as |grid|}} - {{#if usingMobileDevice}} + {{#if showAtDesktop}} {{tap-tile icon="desktop" text=(i18n "bookmarks.reminders.at_desktop") tileId=reminderTypes.AT_DESKTOP activeTile=grid.activeTile onChange=(action "selectReminderType")}} {{/if}} diff --git a/config/site_settings.yml b/config/site_settings.yml index 56d742e5656..044d7f1de1a 100644 --- a/config/site_settings.yml +++ b/config/site_settings.yml @@ -293,6 +293,10 @@ basic: client: true default: false hidden: true + enable_bookmark_at_desktop_reminders: + client: true + default: false + hidden: true push_notifications_prompt: default: true client: true