tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-29 00:34:46 +02:00
Code Issues Packages Projects Releases Wiki Activity

Added a few changes to um and rr

Browse Source
This commit is contained in:
Arturo Gonzalez 2017-03-21 10:39:28 +01:00
parent 5278d2a8a8
commit b64afb7d6f
3 changed files with 35 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pandora_console/include/ajax/rolling_release.ajax.php
View File

@ -18,6 +18,7 @@ if (is_ajax ()) {
check_login(); check_login();
$updare_rr = get_parameter('updare_rr', 0); $updare_rr = get_parameter('updare_rr', 0);
$remove_rr = get_parameter('remove_rr', 0);
if ($updare_rr) { if ($updare_rr) {
$number = get_parameter('number'); $number = get_parameter('number');
@ -139,6 +140,15 @@ if (is_ajax ()) {
echo $message; echo $message;
return; return;
} }
if ($remove_rr) {
$number = get_parameter('number');
$file = $config["homedir"] . "/extras/mr/$number.sql";
if (file_exists($file)) {
unlink($file);
}
}
} }
?> ?>

5
pandora_console/include/functions_db.php
View File

@ -1754,7 +1754,10 @@ function db_check_minor_relase_available_to_um ($package, $ent, $offline) {
$file_dest = $config["homedir"] . "/extras/mr/updated/$num.sql"; $file_dest = $config["homedir"] . "/extras/mr/updated/$num.sql";
if (file_exists($file_dest)) { if (file_exists($file_dest)) {
$exists = true; $exists = true;
unlink("$dir/$num.sql");
if (file_exists($config["homedir"] . "/extras/mr/$num.sql")) {
unlink($config["homedir"] . "/extras/mr/$num.sql");
}
} }
} }

21
pandora_console/include/javascript/update_manager.js
View File

@ -528,6 +528,8 @@ function install_package (package, homeurl) {
// Check the status of the update // Check the status of the update
check_install_package(package, homeurl); check_install_package(package, homeurl);
remove_rr_file(data['mr']);
} }
} }
else { else {
@ -1167,6 +1169,8 @@ function install_free_package_prev_step(package, version, homeurl) {
}, },
"json" "json"
); );
remove_rr_file(data['mr']);
} }
} }
else { else {
@ -1525,4 +1529,21 @@ function apply_minor_release (n_mr, pkg, ent, off) {
$(".ui-dialog-buttonset").empty(); $(".ui-dialog-buttonset").empty();
return error; return error;
}
function remove_rr_file (number) {
var params = {};
params["remove_rr"] = 1;
params["number"] = number;
params["page"] = "include/ajax/rolling_release.ajax";
jQuery.ajax ({
data: params,
async: false,
dataType: "html",
type: "POST",
url: "ajax.php",
success: function (data) {
}
});
} }