Allow deactivation of "auto-pin" and of "pin menu" in the profile (refs #4307)

1 files changed, 18 insertions, 14 deletions

diff --git a/ishtar_common/static/js/ishtar.js b/ishtar_common/static/js/ishtar.js
index 9846b4f1a..b9e9d6844 100644
--- a/ishtar_common/static/js/ishtar.js
+++ b/ishtar_common/static/js/ishtar.js
@@ -41,6 +41,7 @@ function get_previous_table_id(){}
 var datatable_submit_search = function() {};
 
 var shortcut_url = '';
+var show_shortcut_menu = false;
 var alert_url = '';
 var debug = false;
 var datatables_i18n;
@@ -277,22 +278,25 @@ function load_opened_shortcut_menu(){
 }
 
 function load_shortcut_menu(opened){
-    if (!shortcut_url) return;
     $('.modal-progress').modal('show');
-    $.ajax({
-        url: shortcut_url,
-        cache: false,
-        success:function(html){
-            init_shortcut_menu(html);
-            load_alerts();
-            if(opened){
-                $("#dropdown-toggle-shortcut-menu").click();
+    if (show_shortcut_menu && shortcut_url){
+        $.ajax({
+            url: shortcut_url,
+            cache: false,
+            success:function(html){
+                init_shortcut_menu(html);
+                load_alerts();
+                if(opened){
+                    $("#dropdown-toggle-shortcut-menu").click();
+                }
+            },
+            error:function(XMLHttpRequest, textStatus, errorThrows){
+                close_wait();
             }
-        },
-        error:function(XMLHttpRequest, textStatus, errorThrows){
-            close_wait();
-        }
-    });
+        });
+    } else {
+        load_alerts();
+    }
 }
 
 var load_alerts = function(){