Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-02-08 00:52:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop

Browse Source
This commit is contained in:
ldestailleur
2025-03-31 16:33:31 +02:00
parent 6c8ae0b2a6 5a28052daf
commit e435f7652b
2 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
htdocs/ai/ajax/generate_content.php
View File

@@ -79,7 +79,7 @@ $function = empty($jsonData['function']) ? 'textgeneration' : $jsonData['functio
$instructions = dol_string_nohtmltag($jsonData['instructions'], 1, 'UTF-8');
$format = empty($jsonData['format']) ? '' : $jsonData['format']; // Can be '' for text, 'html', ...
if ($function == 'texttranslation') {
if ($function == 'texttranslation' && $format == "html") {
$instructions = $jsonData['instructions'];
} else {
$instructions = dol_string_nohtmltag($jsonData['instructions'], 1, 'UTF-8');
@@ -100,7 +100,7 @@ if (is_null($generatedContent) || (is_array($generatedContent) && $generatedCont
print "Error API returned no answer";
}
} else {
if ($function == 'textgenerationemail' || $function == 'textgenerationwebpage' || $function == "texttranslation") {
if ($function == 'textgenerationemail' || $function == 'textgenerationwebpage') {
print dolPrintHTML($generatedContent); // Note that common HTML tags are NOT escaped (but a sanitization is done)
} elseif ($function == 'imagegeneration') {
// TODO
@@ -110,6 +110,10 @@ if (is_null($generatedContent) || (is_array($generatedContent) && $generatedCont
// TODO
} else {
// Default case 'textgeneration'
print dolPrintText($generatedContent); // Note that common HTML tags are NOT escaped (but a sanitization is done)
if ($format == "html") {
print dolPrintHTML($generatedContent); // Note that common HTML tags are NOT escaped (but a sanitization is done)
} else {
print dolPrintText($generatedContent); // Note that common HTML tags are NOT escaped (but a sanitization is done)
}
}
}

8
htdocs/core/tpl/formlayoutai.tpl.php
View File

@@ -105,6 +105,14 @@ if ($showlinktoai) {
}
}
});
$(document).on("click", function (event) {
aidropdown = $(".ai_dropdown'.$htmlname.'");
aidropdownbutton = $("#linkforaiprompt'.$showlinktoai.'");
if (!aidropdown.is(event.target) && !aidropdownbutton.is(event.target) && $(event.target).closest(aidropdown).length === 0 && $(event.target).closest(aidropdownbutton).length === 0 && aidropdown.is(":visible")) {
console.log("You clicked outside of ai_dropdown - we close it");
$(".ai_dropdown'.$htmlname.'").hide();
}
});
});
</script>
';