Merge pull request #682 from MrPetovan/bug/5341-advancedcontentfilter-honors-csp
Advancedcontentfilter honors CSPpull/683/head
Michael Vogel
5 years ago
committed by
GitHub
commit
e79d738437
@ -1,122 +0,0 @@
|
||||
$.ajaxSetup({headers: {'X-CSRF-Token': document.querySelector('#csrf').getAttribute('value')}});
|
||||
|
||||
$.extend({
|
||||
ajaxJSON: function(method, url, data) {
|
||||
return $.ajax({
|
||||
type: method.toUpperCase(),
|
||||
url: url,
|
||||
data: JSON.stringify(data),
|
||||
contentType: 'application/json; charset=utf-8',
|
||||
dataType: 'json'
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
new Vue({
|
||||
el: '#rules',
|
||||
|
||||
data: {
|
||||
showModal: false,
|
||||
errorMessage: '',
|
||||
editedIndex: null,
|
||||
rule: {id: '', name: '', expression: '', created: ''},
|
||||
rules: existingRules || [],
|
||||
itemUrl: '',
|
||||
itemJson: ''
|
||||
},
|
||||
|
||||
watch: {
|
||||
showModal: function () {
|
||||
if (this.showModal) {
|
||||
$(this.$refs.vuemodal).modal('show');
|
||||
} else {
|
||||
$(this.$refs.vuemodal).modal('hide');
|
||||
}
|
||||
}
|
||||
},
|
||||
|
||||
methods: {
|
||||
resetForm: function() {
|
||||
this.rule = {id: '', name: '', expression: '', created: ''};
|
||||
this.showModal = false;
|
||||
this.editedIndex = null;
|
||||
},
|
||||
|
||||
addRule: function () {
|
||||
if (this.rule.name.trim()) {
|
||||
this.errorMessage = '';
|
||||
|
||||
var self = this;
|
||||
$.ajaxJSON('post', '/advancedcontentfilter/api/rules', this.rule)
|
||||
.then(function (responseJSON) {
|
||||
self.rules.push(responseJSON.rule);
|
||||
self.resetForm();
|
||||
}, function (response) {
|
||||
self.errorMessage = response.responseJSON.message;
|
||||
});
|
||||
}
|
||||
},
|
||||
|
||||
editRule: function (rule) {
|
||||
this.editedIndex = this.rules.indexOf(rule);
|
||||
this.rule = Object.assign({}, rule);
|
||||
this.showModal = true;
|
||||
},
|
||||
|
||||
saveRule: function (rule) {
|
||||
this.errorMessage = '';
|
||||
|
||||
var self = this;
|
||||
$.ajaxJSON('put', '/advancedcontentfilter/api/rules/' + rule.id, rule)
|
||||
.then(function () {
|
||||
self.rules[self.editedIndex] = rule;
|
||||
self.resetForm();
|
||||
}, function (response) {
|
||||
self.errorMessage = response.responseJSON.message;
|
||||
});
|
||||
},
|
||||
|
||||
toggleActive: function (rule) {
|
||||
var previousValue = this.rules[this.rules.indexOf(rule)].active;
|
||||
var newValue = Math.abs(parseInt(rule.active) - 1);
|
||||
|
||||
this.rules[this.rules.indexOf(rule)].active = newValue;
|
||||
|
||||
var self = this;
|
||||
$.ajaxJSON('put', '/advancedcontentfilter/api/rules/' + rule.id, {'active': newValue})
|
||||
.fail(function (response) {
|
||||
self.rules[self.rules.indexOf(rule)].active = previousValue;
|
||||
console.log(response.responseJSON.message);
|
||||
});
|
||||
},
|
||||
|
||||
deleteRule: function (rule) {
|
||||
if (confirm('Are you sure you want to delete this rule?')) {
|
||||
var self = this;
|
||||
$.ajaxJSON('delete', '/advancedcontentfilter/api/rules/' + rule.id)
|
||||
.then(function () {
|
||||
self.rules.splice(self.rules.indexOf(rule), 1);
|
||||
}, function (response) {
|
||||
console.log(response.responseJSON.message);
|
||||
});
|
||||
}
|
||||
},
|
||||
|
||||
showVariables: function () {
|
||||
var urlParts = this.itemUrl.split('/');
|
||||
var guid = urlParts[urlParts.length - 1];
|
||||
|
||||
this.itemJson = '';
|
||||
|
||||
var self = this;
|
||||
$.ajaxJSON('get', '/advancedcontentfilter/api/variables/' + guid)
|
||||
.then(function (responseJSON) {
|
||||
self.itemJson = responseJSON.variables;
|
||||
}, function (response) {
|
||||
self.itemJson = response.responseJSON.message;
|
||||
});
|
||||
|
||||
return false;
|
||||
}
|
||||
}
|
||||
});
|
||||
@ -0,0 +1,96 @@
|
||||
<!--
|
||||
This the the source HTML for the render functions defined in settings.tpl
|
||||
This file is only for reference only and editing it won't change the addon display.
|
||||
Here's the workflow to change the actual display:
|
||||
1. Edit this file
|
||||
2. Run it through https://vuejs.org/v2/guide/render-function.html#Template-Compilation
|
||||
3. In the results, replace ##$ by {{$ and ## by }} in order to restore smarty variable interpolation
|
||||
4. Replace the render and staticRenderFns members in settings.tpl by the contents of the output anonymous() functions
|
||||
-->
|
||||
<div id="rules">
|
||||
<p><a href="settings/addon">🔙 ##$backtosettings##</a></p>
|
||||
<h1>
|
||||
##$title##
|
||||
|
||||
<a href="##$baseurl##/advancedcontentfilter/help" class="btn btn-default btn-sm" title="##$help##">
|
||||
<i class="fa fa-question fa-2x" aria-hidden="true"></i>
|
||||
</a>
|
||||
</h1>
|
||||
<div>##$advanced_content_filter_intro##</div>
|
||||
<h2>
|
||||
##$your_rules##
|
||||
<button class="btn btn-primary btn-sm" title="##$add_a_rule##" @click="showModal = true">
|
||||
<i class="fa fa-plus fa-2x" aria-hidden="true"></i>
|
||||
</button>
|
||||
</h2>
|
||||
<div v-if="rules.length === 0" v-cloak>
|
||||
##$no_rules##
|
||||
</div>
|
||||
|
||||
<ul class="list-group" v-cloak>
|
||||
<li class="list-group-item" v-for="rule in rules">
|
||||
<p class="pull-right">
|
||||
<button type="button" class="btn btn-xs btn-primary" v-on:click="toggleActive(rule)" aria-label="##$disable_this_rule##" title="##$disable_this_rule##" v-if="parseInt(rule.active)">
|
||||
<i class="fa fa-toggle-on" aria-hidden="true"></i> ##$enabled##
|
||||
</button>
|
||||
<button type="button" class="btn btn-xs btn-default" v-on:click="toggleActive(rule)" aria-label="##$enable_this_rule##" title="##$enable_this_rule##" v-else>
|
||||
<i class="fa fa-toggle-off" aria-hidden="true"></i> ##$disabled##
|
||||
</button>
|
||||
|
||||
<button type="button" class="btn btn-xs btn-primary" v-on:click="editRule(rule)" aria-label="##$edit_this_rule##" title="##$edit_this_rule##">
|
||||
<i class="fa fa-pencil" aria-hidden="true"></i>
|
||||
</button>
|
||||
<button type="button" class="btn btn-xs btn-default" v-on:click="deleteRule(rule)" aria-label="##$delete_this_rule##" title="##$delete_this_rule##">
|
||||
<i class="fa fa-trash-o" aria-hidden="true"></i>
|
||||
</button>
|
||||
</p>
|
||||
<h3 class="list-group-item-heading">
|
||||
##$rule## #{{ rule.id }}: {{ rule.name }}
|
||||
</h3>
|
||||
<pre class="list-group-item-text" v-if="rule.expression">{{ rule.expression }}</pre>
|
||||
</li>
|
||||
</ul>
|
||||
|
||||
<div class="modal fade" ref="vuemodal" tabindex="-1" role="dialog" v-cloak>
|
||||
<div class="modal-dialog" role="document">
|
||||
<div class="modal-content">
|
||||
<div class="modal-header">
|
||||
<button type="button" class="close" data-dismiss="modal" aria-label="##$close##" @click="showModal = false"><span aria-hidden="true">×</span></button>
|
||||
<h3 v-if="rule.id">##$edit_the_rule## "{{ rule.name }}"</h3>
|
||||
<h3 v-if="!rule.id">##$add_a_rule##</h3>
|
||||
</div>
|
||||
<div class="modal-body">
|
||||
<form>
|
||||
<input type="hidden" name="form_security_token" id="csrf" value="##$form_security_token##" />
|
||||
<div class="alert alert-danger" role="alert" v-if="errorMessage">{{ errorMessage }}</div>
|
||||
<div class="form-group">
|
||||
<input class="form-control" placeholder="##$rule_name##" v-model="rule.name">
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<input class="form-control" placeholder="##$rule_expression##" v-model="rule.expression">
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
<div class="modal-footer">
|
||||
<button type="button" class="btn btn-default" data-dismiss="modal" aria-label="Close" @click="resetForm()">##$cancel##</button>
|
||||
<button slot="button" class="btn btn-primary" type="button" v-if="rule.id" v-on:click="saveRule(rule)">##$save_this_rule##</button>
|
||||
<button slot="button" class="btn btn-primary" type="button" v-if="!rule.id" v-on:click="addRule()">##$add_a_rule##</button>
|
||||
</div>
|
||||
</div><!-- /.modal-content -->
|
||||
</div><!-- /.modal-dialog -->
|
||||
</div><!-- /.modal -->
|
||||
|
||||
<form class="form-inline" v-on:submit.prevent="showVariables()">
|
||||
<fieldset>
|
||||
<legend>Show post variables</legend>
|
||||
<div class="form-group" style="width: 50%">
|
||||
<label for="itemUrl" class="sr-only">Post URL or item guid</label>
|
||||
<input class="form-control" id="itemUrl" placeholder="Post URL or item guid" v-model="itemUrl" style="width: 100%">
|
||||
</div>
|
||||
<button type="submit" class="btn btn-primary">Show Variables</button>
|
||||
</fieldset>
|
||||
</form>
|
||||
<pre v-cloak>
|
||||
{{ itemJson }}
|
||||
</pre>
|
||||
</div>
|
||||
Loading…
Reference in new issue