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

Merge branch '875-alert-window-dont-work-dev' into 'develop' 

Fixed jquery request

See merge request !468
This commit is contained in:
vgilc 2017-05-16 10:49:36 +02:00
parent 63cc6f5244 0346b49f1e
commit 88ccb3b364
2 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pandora_console/general/alert_enterprise.php
View File

@ -15,7 +15,7 @@ if(!enterprise_installed()){
$open=true; $open=true;
} }
$tipo = $_GET['message']; $tipo = $_POST['message'];
echo " echo "
<div class='modalheader'> <div class='modalheader'>

26
pandora_console/include/javascript/jquery.pandora.js
View File

@ -33,7 +33,7 @@
$(document).ready (function () { $(document).ready (function () {
$("a#show_messages_dialog").click (function () { $("a#show_messages_dialog").click (function () {
jQuery.get ("ajax.php", jQuery.post ("ajax.php",
{"page": "operation/messages/message_list"}, {"page": "operation/messages/message_list"},
function (data, status) { function (data, status) {
$("#dialog_messages").hide () $("#dialog_messages").hide ()
@ -60,7 +60,7 @@ $(document).ready (function () {
$("a.show_systemalert_dialog").click (function () { $("a.show_systemalert_dialog").click (function () {
$('body').append( "<div id='opacidad' style='position:fixed;background:black;opacity:0.6;z-index:1'></div>" ); $('body').append( "<div id='opacidad' style='position:fixed;background:black;opacity:0.6;z-index:1'></div>" );
jQuery.get ("ajax.php", jQuery.post ("ajax.php",
{"page": "operation/system_alert"}, {"page": "operation/system_alert"},
function (data, status) { function (data, status) {
$("#alert_messages").hide () $("#alert_messages").hide ()
@ -75,9 +75,11 @@ $(document).ready (function () {
$("a.modalpopup").click (function () { $("a.modalpopup").click (function () {
$('body').append( "<div id='opacidad' style='position:fixed;background:black;opacity:0.6;z-index:1'></div>" ); $('body').append( "<div id='opacidad' style='position:fixed;background:black;opacity:0.6;z-index:1'></div>" );
jQuery.get ("ajax.php", jQuery.post ("ajax.php",
{"page": "general/alert_enterprise", {
"message":$(this).attr("id")}, "page": "general/alert_enterprise",
"message": $(this).attr("id")
},
function (data, status) { function (data, status) {
$("#alert_messages").hide () $("#alert_messages").hide ()
.empty () .empty ()
@ -93,10 +95,11 @@ $(document).ready (function () {
$(".publienterprise").click (function () { $(".publienterprise").click (function () {
$('body').append( "<div id='opacidad' style='position:fixed;background:black;opacity:0.6;z-index:1'></div>" ); $('body').append( "<div id='opacidad' style='position:fixed;background:black;opacity:0.6;z-index:1'></div>" );
jQuery.get ("ajax.php", jQuery.post ("ajax.php",
{ {
"page": "general/alert_enterprise", "page": "general/alert_enterprise",
"message":$(this).attr("id")}, "message": $(this).attr("id")
},
function (data, status) { function (data, status) {
$("#alert_messages").hide () $("#alert_messages").hide ()
.empty () .empty ()
@ -112,10 +115,11 @@ $(document).ready (function () {
$(".publienterprisehide").click (function () { $(".publienterprisehide").click (function () {
$('body').append( "<div id='opacidad' style='position:fixed;background:black;opacity:0.6;z-index:1'></div>" ); $('body').append( "<div id='opacidad' style='position:fixed;background:black;opacity:0.6;z-index:1'></div>" );
jQuery.get ("ajax.php", jQuery.post ("ajax.php",
{ {
"page": "general/alert_enterprise", "page": "general/alert_enterprise",
"message":$(this).attr("id")}, "message": $(this).attr("id")
},
function (data, status) { function (data, status) {
$("#alert_messages").hide () $("#alert_messages").hide ()
.empty () .empty ()