Fix support for SOGoSieveFolderEncoding defaults

Fixed the following bugs in the mail filter editor:

1. Sieve folder encoding not respecting the SOGoSieveFolderEncoding
system defaults;
2. Conditions are still displayed when rule affects all messages;
3. Missing custom mail labels to "flag with" action.
This commit is contained in:
Francis Lachapelle committed 2016-11-17 09:41:15 -05:00
1 parent 5f70555975
commit baf1d44548
7 files changed
+36 -9

No files matched your search

@@ -26,7 +26,6 @@
<md-dialog-content class="sg-has-form-sections">
<script type="text/javascript">
var filterId = '<var:string value="filterId"/>';
var sieveFolderEncoding = '<var:string value="sieveFolderEncoding"/>';
var mailTags = <var:string value="labels" const:escapeHTML="NO"/>;
</script>
@@ -51,7 +50,7 @@
</div>
<!-- CONDITIONS -->
<div layout="column">
<div layout="column" ng-hide="filterEditor.filter.match == 'allmessages'">
<div id="filterRules"><!-- empty --></div>
<div layout="row" layout-align="start center"
ng-repeat="rule in filterEditor.filter.rules">
@@ -165,7 +164,7 @@
<md-option value="flagged"><var:string label:value="Flagged"/></md-option>
<md-option value="junk"><var:string label:value="Junk"/></md-option>
<md-option value="not_junk"><var:string label:value="Not Junk"/></md-option>
<md-option ng-value="key" ng-repeat="(key, value) in labels">{{ value[0] }}</md-option>
<md-option ng-value="key" ng-repeat="(key, value) in filterEditor.labels">{{ value[0] }}</md-option>
</md-select>
</md-input-container>
@@ -21,6 +21,7 @@
var defaultEmailAddresses = '<var:string value="defaultEmailAddresses" const:escapeHTML="NO"/>';
var forwardConstraints = <var:string value="forwardConstraints" const:escapeHTML="NO"/>;
var sieveCapabilities = <var:string value="sieveCapabilities" const:escapeHTML="NO"/>;
var sieveFolderEncoding = <var:string value="sieveFolderEncoding.doubleQuotedString"/>;
</script>
<script type="text/ng-template" id="preferences.html">