github/plexpy
1
0
Fork 0
mirror of https://github.com/Tautulli/Tautulli.git synced 2025-07-12 00:06:07 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Change custom conditions negative operators to "and"

Browse source
This commit is contained in:
JonnyWong16 2018-02-03 17:02:13 -08:00
parent 5d2219f2f8
commit 3ca1bd5d78
3 changed files with 20 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
data/interfaces/default/css/plexpy.css
View file

@ -108,6 +108,9 @@ select.form-control {
text-transform: uppercase; text-transform: uppercase;
font-size: 10px; font-size: 10px;
} }
.react-selectize.root-node .react-selectize-control .react-selectize-search-field-and-selected-values.negative-operator .value-wrapper:not(:first-child):before {
content: "and" !important;
}
.react-selectize.root-node .react-selectize-control .react-selectize-search-field-and-selected-values .resizable-input { .react-selectize.root-node .react-selectize-control .react-selectize-search-field-and-selected-values .resizable-input {
padding-top: 3px !important; padding-top: 3px !important;
padding-bottom: 3px !important; padding-bottom: 3px !important;

15
data/interfaces/default/notifier_config.html
View file

@ -343,6 +343,21 @@
} }
}); });
function setNegativeOperator(select) {
if (select.val() === 'does not contain' || select.val() === 'is not') {
select.closest('.form-group').find('.react-selectize-search-field-and-selected-values').addClass('negative-operator');
} else {
select.closest('.form-group').find('.react-selectize-search-field-and-selected-values').removeClass('negative-operator');
}
}
$('#condition-widget select[name=operator]').each(function () {
setNegativeOperator($(this));
});
$('#condition-widget').on('change', 'select[name=operator]', function () {
setNegativeOperator($(this));
});
function reloadModal() { function reloadModal() {
$.ajax({ $.ajax({
url: 'get_notifier_config_modal', url: 'get_notifier_config_modal',

4
plexpy/notification_handler.py
View file

@ -277,13 +277,13 @@ def notify_custom_conditions(notifier_id=None, parameters=None):
evaluated_conditions.append(any(c in parameter_value for c in values)) evaluated_conditions.append(any(c in parameter_value for c in values))
elif operator == 'does not contain': elif operator == 'does not contain':
evaluated_conditions.append(any(c not in parameter_value for c in values)) evaluated_conditions.append(all(c not in parameter_value for c in values))
elif operator == 'is': elif operator == 'is':
evaluated_conditions.append(any(parameter_value == c for c in values)) evaluated_conditions.append(any(parameter_value == c for c in values))
elif operator == 'is not': elif operator == 'is not':
evaluated_conditions.append(any(parameter_value != c for c in values)) evaluated_conditions.append(all(parameter_value != c for c in values))
elif operator == 'begins with': elif operator == 'begins with':
evaluated_conditions.append(parameter_value.startswith(tuple(values))) evaluated_conditions.append(parameter_value.startswith(tuple(values)))