From 68348c96044a2fbf3635416bb5afaa792d899a7a Mon Sep 17 00:00:00 2001
From: Nicola Carminati <nicola.carminati@cms.it>
Date: Wed, 7 Nov 2018 17:05:44 +0100
Subject: [PATCH] Fix Last commit

---
 Step/wwwroot/src/modules/under-the-hood/auto-menu.vue | 1 +
 Step/wwwroot/src/modules/under-the-hood/jog-menu.vue  | 6 +++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/Step/wwwroot/src/modules/under-the-hood/auto-menu.vue b/Step/wwwroot/src/modules/under-the-hood/auto-menu.vue
index 80c88e50..361a32d3 100644
--- a/Step/wwwroot/src/modules/under-the-hood/auto-menu.vue
+++ b/Step/wwwroot/src/modules/under-the-hood/auto-menu.vue
@@ -25,6 +25,7 @@ export default {
       return false;
     },
     isKeyActive(id) {
+      if(this.checkSecurityDisabled('ncSoftkeys')) return false;
       let r = this.$store.getters.getNcSoftKeyStatus(id);
       if (r) return r.active;
       return false;
diff --git a/Step/wwwroot/src/modules/under-the-hood/jog-menu.vue b/Step/wwwroot/src/modules/under-the-hood/jog-menu.vue
index 1be87272..18915c9c 100644
--- a/Step/wwwroot/src/modules/under-the-hood/jog-menu.vue
+++ b/Step/wwwroot/src/modules/under-the-hood/jog-menu.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="jog-menu" ref="menu">
-    <button v-if="showAxisBtn" @click="toggleAxes()" :class="{active:showAxesMenu}" :disabled="axes.length == 0" class="soft">{{"jog_menu_axis" | localize("Asse")}} {{getAxesName()}}</button>
+    <button v-if="showAxisBtn" @click="toggleAxes()" :class="{active:showAxesMenu}" :disabled="isAxesDisabled" class="soft">{{"jog_menu_axis" | localize("Asse")}} {{getAxesName()}}</button>
     <div class="btn-spacer" :class="{'collapsed': !showAxisBtn }">
       <button @click="ncClick(23)" :disabled="!isKeyActive(23)" :class="{active:isKeySelected(23) , inverted:isReadOnly(23)}" class="soft square"><i class="fa fa-minus"></i></button>
       <button v-if="!machineInfo.isSiemens" @click="ncClick(24)" :disabled="!isKeyActive(24)" :class="{active:isKeySelected(24) , inverted:isReadOnly(24)}" class="soft">{{name(24)}}</button>
@@ -56,6 +56,9 @@ export default {
       if(this.isKeySelected(28)) return this.name(28);
       return "";
     },
+    isAxesDisabled(){
+      return this.checkSecurityDisabled('axesSoftkeys') || (this.axes.length == 0);
+    },
     incMenuPosition: function(){
       // 180px è la metà della larghezza del contenitore .incr-menu-container configurata da css
       // 50px è la metà della larghezza del bottone Inc comprensivo di margini.
@@ -87,6 +90,7 @@ export default {
       return false;
     },
     isKeyActive(id) {
+      if(this.checkSecurityDisabled('ncSoftkeys')) return false;
       let r = this.$store.getters.getNcSoftKeyStatus(id);
       if (r) return r.active;
       return false;