Skip to content

Commit

Permalink
1.8.4: fix settings unicode mess up
Browse files Browse the repository at this point in the history
  • Loading branch information
MaKyOtOx committed Feb 8, 2022
1 parent 2a0b29f commit d5f0a23
Show file tree
Hide file tree
Showing 6 changed files with 29 additions and 80 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
View file
@@ -1,6 +1,6 @@
FROM python:3.7-slim
MAINTAINER Patrowl.io "getsupport@patrowl.io"
LABEL Name="PatrowlManager" Version="1.8.3"
LABEL Name="PatrowlManager" Version="1.8.4"

ENV PYTHONUNBUFFERED 1
ARG arg_http_proxy
Expand Down
2 changes: 1 addition & 1 deletion VERSION
View file
@@ -1 +1 @@
1.8.3 // Community Edition
1.8.4 // Community Edition
1 change: 1 addition & 0 deletions assets/views.py
View file
Expand Up @@ -435,6 +435,7 @@ def edit_asset_group_view(request, assetgroup_id):

# Update assets
asset_group.assets.clear()

for asset_id in form.data.getlist('assets'):
asset_group.assets.add(Asset.objects.for_user(request.user).get(id=asset_id))

Expand Down
1 change: 0 additions & 1 deletion scans/apis.py
View file
Expand Up @@ -352,7 +352,6 @@ def get_scan_report_html_api(request, scan_id):
tmp_scan['assets'].append(asset.value)

tmp_scan['engine_type_name'] = scan.engine_type.name
tmp_scan['engine_name'] = scan.engine.name
tmp_scan['engine_policy_name'] = scan.engine_policy.name

findings = RawFinding.objects.filter(scan=scan.id)
Expand Down
2 changes: 1 addition & 1 deletion scans/templates/report-scan.html
View file
Expand Up @@ -443,7 +443,7 @@ <h2 xmlns="" class="classh1 " style="vertical-align: middle;">Engine Information
<table xmlns="" width="100%">
<tr>
<td width="20%" valign="top" class="classcell"><span class="classtext" style="color: #263645; font-weight: normal;">Engine:</span></td>
<td width="80%" valign="top" class="classcell"><span class="classtext" style="color: #263645; font-weight: normal;">{{ scan.engine_type_name }}@{{ scan.engine_name }}</span></td>
<td width="80%" valign="top" class="classcell"><span class="classtext" style="color: #263645; font-weight: normal;">{{ scan.engine_type_name }}</span></td>
</tr>
<tr>
<td width="20%" valign="top" class="classcell"><span class="classtext" style="color: #263645; font-weight: normal;">Engine Policy:</span></td>
Expand Down
101 changes: 25 additions & 76 deletions settings/templates/menu-settings.html
View file
Expand Up @@ -265,69 +265,14 @@ <h4 class="modal-title" id="myModalLabel">Add new setting</h4>
window.location = url.search+"#events";
});

// EventTable = $('#dt_events').DataTable({
// "ajax": {
// "url": "/events/list",
// "dataType": "json",
// "type": "GET"
// },
// "data": [],
// rowCallback: function (row, data) {},
// "columns": [
// { "data": "id" },
// { "data": "severity" },
// { "data": "message" },
// { "data": "type" },
// { "data": "created_at" }
// ],
// "aoColumnDefs":[{
// "aTargets":[5],
// "mData": "id",
// "mRender": function (data, type, full) {
// return '<button type="button" event-id="'+data+'" class="btn btn-danger btn-xs" data-toggle="modal" data-target="#modal-delete-event"><span class="glyphicon glyphicon-remove"></span></button>';
// }
// }],
// "order": [[ 0, 'desc' ]],
// initComplete: function () {
// this.api().columns().every( function () {
// if (this.index() == 1 || this.index() == 3){
// var column = this;
// var select = $('<select><option value=""></option></select>')
// .appendTo( $(column.footer()).empty() )
// .on( 'change', function () {
// var val = $.fn.dataTable.util.escapeRegex(
// $(this).val()
// );
// column
// .search( val ? '^'+val+'$' : '', true, false )
// .draw();
// } );
// column.data().unique().sort().each( function ( d, j ) {
// select.append( '<option value="'+d+'">'+d+'</option>' )
// } );
// }
// } );
// }
// });
});

// $('li a[href="#events"]').on("click", function (e) {
// $.ajax({
// url: "/events/",
// type: "GET",
// dataType: "json",
// }).done(function (result) {
// EventTable.clear().draw();
// EventTable.rows.add(result).draw();
// });
// });

// Delete setting modal
$("#modal-delete-setting").on('show.bs.modal', function (e) {
id = e.relatedTarget.getAttribute('setting-id');
key = e.relatedTarget.getAttribute('setting-key');
$("div#delete-setting").attr('setting-id', id);
$("div#delete-setting").html("Setting: <b>"+encodeURIComponent(key)+"</b><br/><br/>");
$("div#delete-setting").html("Setting: <b>"+escapeHtml(key)+"</b><br/><br/>");
});
$("button.btn-delete-setting").on('click', function (e) {
id = $("div#delete-setting").attr('setting-id');
Expand All @@ -341,14 +286,16 @@ <h4 class="modal-title" id="myModalLabel">Add new setting</h4>
});

$("button.btn-add-setting").on('click', function (e) {
new_setting = {
"setting_key": $('#add_setting_key').val(),
"setting_value": $('#add_setting_value').val()
}
var request = $.ajax({
url: "/settings/api/v1/add",
method: "POST",
headers: {"X-CSRFToken": "{{ csrf_token }}"},
data: {
"setting_key": $('#add_setting_key').val(),
"setting_value": $('#add_setting_value').val()
},
data: JSON.stringify(new_setting),
contentType: "application/json",
success: function(){
location.reload();
}
Expand All @@ -365,7 +312,7 @@ <h4 class="modal-title" id="myModalLabel">Add new setting</h4>
setting_id=e.delegateTarget.getAttribute("setting-id");
setting_value=$('div#setting_value_'+setting_id+' i').text();
$('div#setting_value_'+setting_id).empty();
$('div#setting_value_'+setting_id).append("<input type='text' value='"+encodeURIComponent(setting_value)+"' name='setting_value' class='form-control form-control-sm'/>");
$('div#setting_value_'+setting_id).append("<input type='text' value='"+escapeHtml(setting_value)+"' name='setting_value' class='form-control form-control-sm'/>");

//On Enter key press, update the field
$('input[name="setting_value"]').keyup(function(e){
Expand All @@ -377,26 +324,28 @@ <h4 class="modal-title" id="myModalLabel">Add new setting</h4>
}
});
$('input').bind("enterKey", function(e){
var request = $.ajax({
url: "/settings/api/v1/update",
method: "POST",
headers: {"X-CSRFToken": "{{ csrf_token }}"},
data: {
"setting_id": e.target.parentElement.getAttribute("setting-id"),
"setting_value": e.target.value
},
success: function(){
location.reload();
$('div#setting_value_'+setting_id).empty();
$('div#setting_value_'+setting_id).append("<i>"+encodeURIComponent(e.target.value)+"</i>");
}
});
edited_setting = {
"setting_id": e.target.parentElement.getAttribute("setting-id"),
"setting_value": e.target.value
}
var request = $.ajax({
url: "/settings/api/v1/update",
method: "POST",
headers: {"X-CSRFToken": "{{ csrf_token }}"},
data: JSON.stringify(edited_setting),
contentType: "application/json",
success: function(){
location.reload();
$('div#setting_value_'+setting_id).empty();
$('div#setting_value_'+setting_id).append("<i>"+e.target.value+"</i>");
}
});
});
$('input').bind("escapeKey", function(e){
setting_id = e.target.parentElement.getAttribute("setting-id");
setting_value = e.target.getAttribute("value");
$('div#setting_value_'+setting_id).empty();
$('div#setting_value_'+setting_id).append("<i>"+encodeURIComponent(setting_value)+"</i>");
$('div#setting_value_'+setting_id).append("<i>"+escapeHtml(setting_value)+"</i>");
});
};

Expand Down

0 comments on commit d5f0a23

Please sign in to comment.