Merge remote-tracking branch 'remotes/origin/development'

nilsteampassnet · Aug 8, 2018 · 7c0e5b0 · 7c0e5b0
2 parents 454057e + b76b1e9
commit 7c0e5b0
Show file tree

Hide file tree

Showing 41 changed files with 997 additions and 528 deletions.
diff --git a/admin.settings.load.php b/admin.settings.load.php
@@ -102,7 +102,7 @@ function updateCategoryAndField(id) {
         "category" : $('#field_category').val() === '' ? '0' : $("#field_category").val(),
         "type" : $('#field_type').val() === '' ? '' : $("#field_type").val(),
         "masked" : $('#field_masked').val() === '' ? '' : $("#field_masked").val(),
-        "is_mandatory" : $('#is_mandatory').val() === '' ? '' : $("#is_mandatory").val(),
+        "is_mandatory" : $('#field_is_mandatory').val() === '' ? '' : $("#field_is_mandatory").val(),
         "encrypted" : $('#field_encrypted').val() === '' ? '' : $("#field_encrypted").val(),
         "roles" : roles === '' ? 'all' : roles,
         "field_is_category" : $('#field_is_category').val(),
@@ -268,7 +268,7 @@ function(data) {
 //###########
 function LaunchAdminActions(action, option)
 {
-    var option = '';
+    option = option || '';
 
     $("#div_loading").show();
     $("#email_testing_results, #result_admin_script_backup").hide();
@@ -330,7 +330,7 @@ function LaunchAdminActions(action, option)
            option : option
         },
         function(data) {
-            $("#div_loading").hide();console.log(data);
+            $("#div_loading").hide();
             if (data != null) {
                 if (data[0].result == "db_backup") {
                     $("#result_admin_action_db_backup").html("<span class='fa fa-file-code-o'></span>&nbsp;<a href='"+data[0].href+"'><?php echo $LANG['pdf_download']; ?></a>").show();
@@ -497,7 +497,6 @@ function(data) {
             },
             function(data) {
                 if (data[0].nextAction === "done") {
-                    console.log("done");
                     $("#changeMainSaltKey_message").html("<i class=\"fa fa-info fa-lg\"></i>&nbsp;<?php echo addslashes($LANG['alert_message_done'])." ".$LANG['number_of_items_treated']; ?> : " + $("#changeMainSaltKey_itemsCountTotal").val() + '<p><?php echo addslashes($LANG['check_data_after_reencryption']); ?><p><div style=\"margin-top:5px;\"><a href=\"#\" onclick=\"encryption_show_revert()\"><?php echo addslashes($LANG['revert']); ?></a></div>');
                 } else {
                     // error mngt