gaja-group
/
element-web
forked from matrix/element-web
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

PushRules settings: BF when changing state of the keywords rule with such a sequence: on -> off -> loud.

This commit is contained in:
manuroe 2016-01-13 17:10:26 +01:00
parent ac87830e4e
commit 0475bcd9de
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/components/views/settings/Notifications.js
View File

@ -117,9 +117,9 @@ module.exports = React.createClass({
} }
if (actions) { if (actions) {
// Note that the workaound in _updatePushRuleActions will automatically // Note that the workaround in _updatePushRuleActions will automatically
// enable the rule // enable the rule
deferreds.push(this._updatePushRuleActions(rule, actions)); deferreds.push(this._updatePushRuleActions(rule, actions, enabled));
} }
else if (enabled != undefined) { else if (enabled != undefined) {
deferreds.push(cli.setPushRuleEnabled('global', rule.kind, rule.rule_id, enabled)); deferreds.push(cli.setPushRuleEnabled('global', rule.kind, rule.rule_id, enabled));
@ -472,7 +472,7 @@ module.exports = React.createClass({
}); });
}, },
_updatePushRuleActions: function(rule, actions) { _updatePushRuleActions: function(rule, actions, enabled) {
// Workaround for SYN-590 : Push rule update fails // Workaround for SYN-590 : Push rule update fails
// Remove the rule and recreate it with the new actions // Remove the rule and recreate it with the new actions
var cli = MatrixClientPeg.get(); var cli = MatrixClientPeg.get();
@ -483,10 +483,21 @@ module.exports = React.createClass({
actions: actions, actions: actions,
pattern: rule.pattern pattern: rule.pattern
}).done(function() { }).done(function() {
// Then, if requested, enabled or disabled the rule
if (undefined != enabled) {
cli.setPushRuleEnabled('global', rule.kind, rule.rule_id, enabled).done(function() {
deferred.resolve(); deferred.resolve();
}, function(err) { }, function(err) {
deferred.reject(err); deferred.reject(err);
}); });
}
else {
deferred.resolve();
}
}, function(err) {
deferred.reject(err);
});
}, function(err) { }, function(err) {
deferred.reject(err); deferred.reject(err);
}); });