fix security functions

This commit is contained in:
Paolo Possanzini
2018-02-15 12:35:32 +01:00
parent 5f46f03b81
commit bbe1b3751d
9 changed files with 156 additions and 171 deletions
+1
View File
@@ -41,4 +41,5 @@
<machineinfo_server_cms_version>Step Server Version:</machineinfo_server_cms_version>
<machineinfo_core_cms_version>Step Core Version:</machineinfo_core_cms_version>
<machineinfo_client_version>Step Client Version:</machineinfo_client_version>
<language_it>Italian</language_it>
</root>
+13 -13
View File
File diff suppressed because one or more lines are too long
+12 -12
View File
File diff suppressed because one or more lines are too long
+11 -11
View File
File diff suppressed because one or more lines are too long
+11 -11
View File
File diff suppressed because one or more lines are too long
+11 -11
View File
File diff suppressed because one or more lines are too long
+88 -106
View File
File diff suppressed because one or more lines are too long
+6 -4
View File
@@ -4,20 +4,22 @@ import { store, LocalizationModel, AppModel } from "src/store";
Vue.filter("checkSecurityDisabled", function (key: string): boolean {
let securityFunction = store.getters.securityFunction[key] as signalr_security.securityFunction;
if(!store) return true;
let securityFunction = (store.state as any).machineStatus._functions.get(key) as signalr_security.securityFunction;
if (!securityFunction) {
console.debug("Security function not found", key);
return false;
return true;
}
return !securityFunction.Enabled;
});
Vue.filter("checkSecurityDisabled", function (key: string): boolean {
Vue.filter("checkSecurityEnabled", function (key: string): boolean {
let securityFunction = store.getters.securityFunction[key] as signalr_security.securityFunction;
if(!store) return false;
let securityFunction = (store.state as any).machineStatus._functions.get(key) as signalr_security.securityFunction;
if (!securityFunction) {
console.debug("Security function not found", key);
@@ -12,10 +12,10 @@
<label>{{'machine_installation_date' | localize('Data di installazione:')}} <strong>{{machineInfo.installationDate | date('DD-MM-YYYY')}}</strong></label>
<hr/>
<label>{{'machineinfo_model_nc' | localize('Modello Cn:')}} <strong>{{machineInfo.ncModel}}</strong></label>
<label>{{'machineinfo_serial_nc' | localize('Num. Seriale Cn:')}} <strong>{{machineInfo.ncSerialNumber}}</strong></label>
<label>{{'machineinfo_serial_nc' | localize('Num. Seriale Cn:')}} <strong>{{machineInfo.ncSerialNumber}}</strong></label>
<label>{{'machineinfo_firmware_version' | localize('Versione firmware Cn:')}} <strong>{{machineInfo.firmwareVersion}}</strong></label>
<label>{{'machineinfo_plc_version' | localize('Versione Plc:')}} <strong>{{machineInfo.plcVersion}}</strong></label>
<label>{{'machineinfo_current_language' | localize('Lingua selezionata Cn:')}} <strong>{{machineInfo.defaultLanguage}}</strong></label>
<label>{{'machineinfo_current_language' | localize('Lingua selezionata Cn:')}} <strong>{{ "language_" + machineInfo.defaultLanguage | localize(machineInfo.defaultLanguage)}}</strong></label>
<label>{{'machineinfo_processes' | localize('Numero di processi Cn:')}} <strong>{{machineInfo.processes}}</strong></label>
<label>{{'machineinfo_umeas' | localize('Unità di misura Cn:')}} <strong>{{machineInfo.unitOfMeasurement}}</strong></label>
<label>{{'machineinfo_datetime' | localize('Time-Stamp Cn:')}} <strong>{{machineInfo.actualDateTime | date('DD-MM-YYYY hh:mm')}}</strong></label>
@@ -39,7 +39,7 @@ export default {
beforeMount() {
new machineService().getMachineCNInfo();
Factory.Get(MessageService).subscribeToChannel("esc_pressed", args => {
this.close();
});
},