tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ent-8591-envio-de-feedback-no-funciona' into 'develop' 

Fix error/success from send feedback dialog

See merge request artica/pandorafms!4713
This commit is contained in:
Daniel Rodriguez 2022-03-10 13:53:40 +00:00
parent 8218df83d7 3e6a6445b1
commit edd76aa959
2 changed files with 24 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pandora_console/include/javascript/pandora_ui.js
View File

@ -577,14 +577,19 @@ function confirmDialog(settings) {
*/
// eslint-disable-next-line no-unused-vars
function generalShowMsg(data, idMsg) {
var title = "Response";
var text = data;
var failed = false;
var title = data.title[data.error];
var text = data.text[data.error];
var failed = !data.error;
if (typeof data.error != "number") {
title = "Response";
text = data;
failed = false;
if (typeof data == "object") {
title = data.title || "Response";
text = data.text || data.error || data.result;
failed = failed || data.error;
failed = data.failed || data.error;
}
if (failed) {
@ -600,6 +605,7 @@ function generalShowMsg(data, idMsg) {
$("body").append('<div title="' + title + '" id="' + idMsg + '"></div>');
$("#" + idMsg).empty();
}
}
$("#" + idMsg).empty();
$("#" + idMsg).html(text);

1
pandora_console/include/styles/pandora.css
View File

@ -6038,7 +6038,6 @@ form#modal_form_feedback input[type="email"] {
border: none;
border-radius: 0;
border-bottom: 1px solid #ccc;
font-weight: lighter;
padding: 0px 0px 2px 0px;
box-sizing: border-box;
margin-bottom: 4px;