From a8d4e5ca7601cbf3c1361d6af5889b83013cb3dd Mon Sep 17 00:00:00 2001 From: Nicola Carminati Date: Tue, 29 Jan 2019 12:28:20 +0100 Subject: [PATCH] Fix Siemens requests during test --- Step.Utils/languages/IT.xml | 1 + Step.Utils/languages/en.xml | 1 + .../src/app_modules/tooling/components/tooling-equipment.ts | 1 + .../src/app_modules/tooling/components/tooling-equipment.vue | 3 ++- .../src/app_modules/tooling/components/tooling-families.vue | 4 +++- Step/wwwroot/src/config.ts | 2 +- .../wwwroot/src/modules/base-components/modal-load-program.ts | 1 + 7 files changed, 10 insertions(+), 3 deletions(-) diff --git a/Step.Utils/languages/IT.xml b/Step.Utils/languages/IT.xml index b1a7f553..2e5aaa74 100644 --- a/Step.Utils/languages/IT.xml +++ b/Step.Utils/languages/IT.xml @@ -188,6 +188,7 @@ Modifica gruppo %s Creazione nuovo gruppo Utensile %d + Duplo %d Modifica utensile %d della famiglia %s Modifica utensile %d del gruppo %s Cerca un utensile per id diff --git a/Step.Utils/languages/en.xml b/Step.Utils/languages/en.xml index fa956a49..6b0c5dc4 100644 --- a/Step.Utils/languages/en.xml +++ b/Step.Utils/languages/en.xml @@ -186,6 +186,7 @@ Edit Tool-Group: %s New Tool-Group creation Tool no. %d + Duplo no. %d Edit Tool no. %d of family: %s Edit Tool no. %d of group: %s Find a tool by id diff --git a/Step/wwwroot/src/app_modules/tooling/components/tooling-equipment.ts b/Step/wwwroot/src/app_modules/tooling/components/tooling-equipment.ts index de1e9e6b..1cabf464 100644 --- a/Step/wwwroot/src/app_modules/tooling/components/tooling-equipment.ts +++ b/Step/wwwroot/src/app_modules/tooling/components/tooling-equipment.ts @@ -580,6 +580,7 @@ export default class toolingEquipment extends Vue { this.toolsConfiguration = (this.$store.state as AppModel).tooling.toolsConfiguration; this.edgeConfiguration = (this.$store.state as AppModel).tooling.edgesConfiguration; this.disableList = false; + this.enableModify = false; })); } else{ diff --git a/Step/wwwroot/src/app_modules/tooling/components/tooling-equipment.vue b/Step/wwwroot/src/app_modules/tooling/components/tooling-equipment.vue index a47dc8b9..d909f308 100644 --- a/Step/wwwroot/src/app_modules/tooling/components/tooling-equipment.vue +++ b/Step/wwwroot/src/app_modules/tooling/components/tooling-equipment.vue @@ -22,7 +22,8 @@
- +
diff --git a/Step/wwwroot/src/config.ts b/Step/wwwroot/src/config.ts index c988f936..d9fbf31b 100644 --- a/Step/wwwroot/src/config.ts +++ b/Step/wwwroot/src/config.ts @@ -9,4 +9,4 @@ export const DEBUG_CONFIGURATION = CONFIGURATION_SIEMENS; // stabilisce se leggere la configurazione dal server o // se utilizzare la configurazione locale -export const USE_RUNTIME_CONFIGURATION = true; \ No newline at end of file +export const USE_RUNTIME_CONFIGURATION = false; \ No newline at end of file diff --git a/Step/wwwroot/src/modules/base-components/modal-load-program.ts b/Step/wwwroot/src/modules/base-components/modal-load-program.ts index 7606b09d..05c0b67b 100644 --- a/Step/wwwroot/src/modules/base-components/modal-load-program.ts +++ b/Step/wwwroot/src/modules/base-components/modal-load-program.ts @@ -86,6 +86,7 @@ export default class ModalLoadProgram extends Vue { this.checkChangeNavigationType(local); var files = await this.getFilesForPath(absolutePath, path, local); + // controlla se impostare il currentDrive if (fromdepth == 0) this.currentDrive = absolutePath;