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

N°2771 - Fix "Unknown form type" when changing user language in portal

Browse Source
This commit is contained in:
Molkobain
2020-02-10 14:20:11 +01:00
parent a259443735
commit db19f71758
3 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -207,11 +207,11 @@ $(function()
for(var i in oMessages[sMessageType][sFieldId]) for(var i in oMessages[sMessageType][sFieldId])
{ {
var sMessageContent = oMessages[sMessageType][sFieldId][i]; var sMessageContent = oMessages[sMessageType][sFieldId][i];
// Note: We might want to expose some routes directly in JS to ease their use if(oHelpBlock === null)
if(oHelpBlock === null && me.options.session_message_endpoint !== null)
{ {
$.post( $.post(
me.options.session_message_endpoint, // Note: We might want to expose some routes directly in JS to ease their use
GetAddSessionMessageUrl(),
{ {
sSeverity: sMessageType, sSeverity: sMessageType,
sContent: sMessageContent, sContent: sMessageContent,

1
datamodels/2.x/itop-portal-base/portal/templates/bricks/object/mode_create.html.twig
View File

@@ -80,7 +80,6 @@
{% if form.submit_rule is not null %}submit_rule: {{ form.submit_rule|json_encode|raw }}{% endif %}, {% if form.submit_rule is not null %}submit_rule: {{ form.submit_rule|json_encode|raw }}{% endif %},
{% if form.cancel_rule is not null %}cancel_rule: {{ form.cancel_rule|json_encode|raw }}{% endif %}, {% if form.cancel_rule is not null %}cancel_rule: {{ form.cancel_rule|json_encode|raw }}{% endif %},
endpoint: "{{ form.renderer.GetEndpoint()|raw }}", endpoint: "{{ form.renderer.GetEndpoint()|raw }}",
session_message_endpoint: "{{ app['url_generator'].generate('p_session_message_add')|raw }}",
is_modal: {% if tIsModal == true %}true{% else %}false{% endif %} is_modal: {% if tIsModal == true %}true{% else %}false{% endif %}
}); });

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

@@ -407,6 +407,11 @@
{ {
return '{{ app['combodo.absolute_url'] }}'; return '{{ app['combodo.absolute_url'] }}';
}; };
// Note: We might want to expose URLs instead of this kind of stuff... 🤔
var GetAddSessionMessageUrl = function()
{
return '{{ app['url_generator'].generate('p_session_message_add')|raw }}';
};
// Helper to add a parameter to an url // Helper to add a parameter to an url
var AddParameterToUrl = function(sUrl, sParamName, sParamValue) var AddParameterToUrl = function(sUrl, sParamName, sParamValue)
{ {