Commit 805390c0 authored by Curtis Adam's avatar Curtis Adam

Merge branch 'staging' into 'master'

Move the admin settings webPushSubscription registration to the iron router

See merge request arsnova/flashcards!1730
parents 1957f9c4 5e2c2e66
......@@ -8,6 +8,7 @@ import {Route} from "../../api/route.js";
import {CardEditor} from "../../api/cardEditor";
import {Filter} from "../../api/filter";
import {MarkdeepEditor} from "../../api/markdeepEditor";
import {CardsetNavigation} from "../../api/cardsetNavigation";
let loadingScreenTemplate = 'loadingScreen';
......@@ -833,6 +834,7 @@ Router.route('/admin/settings', {
layoutTemplate: 'admin_main',
data: function () {
Session.set('helpFilter', undefined);
CardsetNavigation.subscribeForPushNotification();
},
action: function () {
if (this.ready()) {
......
import {Meteor} from "meteor/meteor";
import {AdminSettings} from "../../../api/adminSettings.js";
import {CardsetNavigation} from "../../../api/cardsetNavigation";
import "./settings.html";
Template.cardset.onCreated(function () {
CardsetNavigation.subscribeForPushNotification();
});
Template.admin_settings.events({
'click #enableWordcloudPomodoro': function () {
Meteor.call("updateWordcloudPomodoroSettings", true);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment