composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-05-19 15:22:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/support/3.2' into develop

Browse Source
This commit is contained in:
Eric Espie
2024-06-20 11:08:59 +02:00
parent 055968bea9 6b2476d220
commit 03f4e9f621
37 changed files with 1045 additions and 411 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
datamodels/2.x/itop-portal-base/portal/public/js/portal_form_field.js
View File

@@ -35,7 +35,8 @@ $(function()
me.element.addClass('has-error');
for(var i in oResult.error_messages)
{
me.element.find('.help-block').append($('<p>' + oResult.error_messages[i] + '</p>'));
// transform error message in pure text to avoid XSS
me.element.find('.help-block').append($('<p>').text(oResult.error_messages[i]));
}
}
}

3
datamodels/2.x/itop-portal-base/portal/public/js/portal_form_handler.js
View File

@@ -252,7 +252,8 @@ $(function()
}
else
{
oHelpBlock.append($('<p>' + sMessageContent + '</p>'));
// transform error message in pure text (to avoid XSS)
oHelpBlock.append($('<p>').text(sMessageContent));
}
}
}

4
datamodels/2.x/itop-portal-base/portal/templates/layout.html.twig
View File

@@ -473,8 +473,8 @@
sBody = '{{ 'Error:XHR:Fail'|dict_format(constant('ITOP_APPLICATION_SHORT'))|escape('js') }}';
}
var oModalElem = $('#modal-for-alert');
oModalElem.find('.modal-content .modal-header .modal-title').html(sTitle);
oModalElem.find('.modal-content .modal-body .alert').addClass('alert-danger').html(sBody);
oModalElem.find('.modal-content .modal-header .modal-title').text(sTitle);
oModalElem.find('.modal-content .modal-body .alert').addClass('alert-danger').text(sBody);
oModalElem.modal('show');
};
{% endblock %}