Skip to content

Commit 4ac3df8

Browse files
ref #1138 fixed
1 parent b980c9b commit 4ac3df8

File tree

7 files changed

+7
-35
lines changed

7 files changed

+7
-35
lines changed

DisplayObjects/mobile/assets/i18n/en.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"version_c8o": "2.1.9-beta6",
2+
"version_c8o": "2.1.9-beta7",
33
"error_filter": "An error occurred while retrieving the filters",
44
"error_missing_config_filter": "Please configure the data source first via the configuration tab",
55
"restart_later": "Update on next launch",

DisplayObjects/mobile/assets/i18n/es.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"version_c8o": "2.1.9-beta6",
2+
"version_c8o": "2.1.9-beta7",
33
"error_filter": "Se produjo un error al recuperar los filtros",
44
"error_missing_config_filter": "Primero configure la fuente de datos en la pestaña de configuración",
55
"restart_later": "Actualizar en el próximo inicio",

DisplayObjects/mobile/assets/i18n/fr.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"version_c8o": "2.1.9-beta6",
2+
"version_c8o": "2.1.9-beta7",
33
"error_filter": "Une erreur s'est produite lors de la récupération des filtres",
44
"error_missing_config_filter": "Veuillez d'abord configurer la source de données via l'onglet configuration",
55
"restart_later": "Mettre à jour au prochain lancement",

DisplayObjects/mobile/assets/i18n/it.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"version_c8o": "2.1.9-beta6",
2+
"version_c8o": "2.1.9-beta7",
33
"error_filter": "Si è verificato un errore durante il recupero dei filtri",
44
"error_missing_config_filter": "Per prima cosa configura l'origine dati tramite la scheda di configurazione",
55
"restart_later": "Aggiornare al prossimo avvio",

_c8oProject/mobileSharedComponents/dataSourceEditor.yaml

Lines changed: 1 addition & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -57,34 +57,7 @@ scriptContent:
5757
return str;
5858
}
5959
60-
public async buildFilters() {
61-
try {
62-
this.local.compl = null;
63-
if (this.pageOwner.getTypeByActions(this.sources, this.isSource) == ''filter'') {
64-
let baseURL = environment.production ? window.location.href.substring(0, (window.location.href.indexOf("/projects/") + 10)) : "http://localhost:18080/convertigo/projects/";
65-
let req = this.pageOwner.getEnabled(this.sources);
66-
this.sources[req].vars
67-
let defaultVars = {};
68-
let regex = /\$\$(?:START)?(\d+)(.*?)(?:END)?(?:\d+)?\$\$/
69-
try {
70-
defaultVars = defaultVars = Object.keys(this.sources[req].vars).map((x => { return { key: x, value: this.sources[req].vars[x].str != undefined ? this.sources[req].vars[x].str.replace(regex, "") : "" } })).reduce((obj, item) => Object.assign(obj, { [item.key]: item.value }), {});
71-
}
72-
catch (e) {
73-
74-
}
75-
let res = await this.c8o.callJsonObject(req, { model: true, ...defaultVars }).async();
76-
if (res.data && res.data[0]) {
77-
this.local.compl = Object.keys(res.data[0]);
78-
}
79-
}
80-
//else{
81-
//}
82-
}
83-
catch (e) {
84-
85-
}
86-
87-
}
60+
8861
private onCompare(_left: KeyValue<any, any>, _right: KeyValue<any, any>): number {
8962
return -1;
9063
}
@@ -4888,7 +4861,6 @@ scriptContent:
48884861
page.local.keyName = null;
48894862
page.local.complByName = null;
48904863
page.local.done = false;
4891-
page.buildFilters();
48924864
}
48934865
window["getConfigurationData"] = () =>{
48944866
return page.item[page.path][page.pageOwner.getEnabled(page.sources)].vars[page.pageOwner.keyIndex(page.sources)].str;

c8oProject.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
contextTimeout: ${C8Oforms.context.timeout=60}
55
corsOrigin: =Origin
66
httpSessionTimeout: ${C8Oforms.http_session.timeout=60}
7-
version: 2.1.9-beta6
7+
version: 2.1.9-beta7
88
↓c8oforms_fs [connectors.FullSyncConnector]: 🗏 connectors/c8oforms_fs.yaml
99
↓c8oforms_response_fs [connectors.FullSyncConnector]: 🗏 connectors/c8oforms_response_fs.yaml
1010
↓c8ofullsyncgrp [connectors.FullSyncConnector]: 🗏 connectors/c8ofullsyncgrp.yaml

ngswForPWA/ngsw-config-sub-pwa.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"appData": {
55
"name": "Convertigo Forms Builder",
66
"description": "A simple and intuitive \"no code\" tool to create your personalized apps in a few clicks!",
7-
"version": "2.1.9-beta6"
7+
"version": "2.1.9-beta7"
88
},
99
"assetGroups": [
1010
{

0 commit comments

Comments
 (0)