Discource-C/discourse
1
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-07 20:08:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

FEATURE: Add enable_bookmark_at_desktop_reminders site setting (#9198)

Browse Source 
Add enable_bookmark_at_desktop_reminders site setting default to false a new hidden site setting to hide the "At Desktop" reminder option so we can restrict this further until it is polished.
This commit is contained in:
Martin Brennan 2020-03-13 16:29:09 +10:00 committed by GitHub
parent dc02586d99
commit ac8d8e3b62
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/assets/javascripts/discourse/controllers/bookmark.js
View File

@ -5,7 +5,6 @@ import discourseComputed from "discourse-common/utils/decorators";
import { popupAjaxError } from "discourse/lib/ajax-error"; import { popupAjaxError } from "discourse/lib/ajax-error";
import { htmlSafe } from "@ember/template"; import { htmlSafe } from "@ember/template";
import { ajax } from "discourse/lib/ajax"; import { ajax } from "discourse/lib/ajax";
import { reads } from "@ember/object/computed";
const START_OF_DAY_HOUR = 8; const START_OF_DAY_HOUR = 8;
const REMINDER_TYPES = { const REMINDER_TYPES = {
@ -52,9 +51,16 @@ export default Controller.extend(ModalFunctionality, {
} }
}, },
usingMobileDevice: reads("site.mobileView"),
showBookmarkReminderControls: true, showBookmarkReminderControls: true,
@discourseComputed()
showAtDesktop() {
return (
this.siteSettings.enable_bookmark_at_desktop_reminders &&
this.site.mobileView
);
},
@discourseComputed("selectedReminderType") @discourseComputed("selectedReminderType")
customDateTimeSelected(selectedReminderType) { customDateTimeSelected(selectedReminderType) {
return selectedReminderType === REMINDER_TYPES.CUSTOM; return selectedReminderType === REMINDER_TYPES.CUSTOM;

2
app/assets/javascripts/discourse/templates/modal/bookmark.hbs
View File

@ -24,7 +24,7 @@
{{#if userHasTimezoneSet}} {{#if userHasTimezoneSet}}
{{#tap-tile-grid activeTile=selectedReminderType as |grid|}} {{#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")}} {{tap-tile icon="desktop" text=(i18n "bookmarks.reminders.at_desktop") tileId=reminderTypes.AT_DESKTOP activeTile=grid.activeTile onChange=(action "selectReminderType")}}
{{/if}} {{/if}}

4
config/site_settings.yml
View File

@ -293,6 +293,10 @@ basic:
client: true client: true
default: false default: false
hidden: true hidden: true
enable_bookmark_at_desktop_reminders:
client: true
default: false
hidden: true
push_notifications_prompt: push_notifications_prompt:
default: true default: true
client: true client: true