diff --git a/.env.development b/.env.development index 995eb972..0abd33cd 100755 --- a/.env.development +++ b/.env.development @@ -1,4 +1,4 @@ -APP_VERSION="0.3.13" +APP_VERSION="0.3.14" SERVICE_WORKER_FILE="service-worker.js" APP_ID="13" DIRECTORY_LOCAL="newfreeplanet" diff --git a/.env.example.production b/.env.example.production index d1527f19..d635b0d5 100755 --- a/.env.example.production +++ b/.env.example.production @@ -1,4 +1,4 @@ -APP_VERSION="0.3.13" +APP_VERSION="0.3.14" SERVICE_WORKER_FILE="service-worker.js" APP_ID="13" DIRECTORY_LOCAL=newfreeplanet diff --git a/_ALL_SITES/insiemesipuo.app/.env.development b/_ALL_SITES/insiemesipuo.app/.env.development index e1b5c47c..1e910e5d 100755 --- a/_ALL_SITES/insiemesipuo.app/.env.development +++ b/_ALL_SITES/insiemesipuo.app/.env.development @@ -1,4 +1,4 @@ -APP_VERSION="0.3.13" +APP_VERSION="0.3.14" SERVICE_WORKER_FILE="service-worker.js" APP_ID="13" DIRECTORY_LOCAL="newfreeplanet" diff --git a/_ALL_SITES/popolodelnuovomondo.app/.env.development b/_ALL_SITES/popolodelnuovomondo.app/.env.development index 59fb19d6..d23ea078 100755 --- a/_ALL_SITES/popolodelnuovomondo.app/.env.development +++ b/_ALL_SITES/popolodelnuovomondo.app/.env.development @@ -1,4 +1,4 @@ -APP_VERSION="0.3.13" +APP_VERSION="0.3.14" SERVICE_WORKER_FILE="service-worker.js" APP_ID="12" DIRECTORY_LOCAL="newfreeplanet" diff --git a/_ALL_SITES/riso.app/.env.development b/_ALL_SITES/riso.app/.env.development index f84971e7..034129fb 100755 --- a/_ALL_SITES/riso.app/.env.development +++ b/_ALL_SITES/riso.app/.env.development @@ -1,4 +1,4 @@ -APP_VERSION="0.3.13" +APP_VERSION="0.3.14" SERVICE_WORKER_FILE="service-worker.js" APP_ID="13" DIRECTORY_LOCAL="newfreeplanet" diff --git a/_ALL_SITES/riso.app/.env.test b/_ALL_SITES/riso.app/.env.test index 1e0b7098..dba09e83 100755 --- a/_ALL_SITES/riso.app/.env.test +++ b/_ALL_SITES/riso.app/.env.test @@ -1,4 +1,4 @@ -APP_VERSION="0.3.13" +APP_VERSION="0.3.14" SERVICE_WORKER_FILE="service-worker.js" APP_ID="13" DIRECTORY_LOCAL=newfreeplanet diff --git a/src/components/CFinder/CFinder.ts b/src/components/CFinder/CFinder.ts index 20ae7e0a..0d0b3265 100755 --- a/src/components/CFinder/CFinder.ts +++ b/src/components/CFinder/CFinder.ts @@ -796,7 +796,13 @@ export default defineComponent({ recCatGrp: 1, } }, - + lookup5: { + lk_tab: 'cities', + lk_LF: 'idCity', + lk_FF: '_id', + lk_as: 'mycities', + af_objId_tab: '', + }, } } else if (props.table === toolsext.TABMYGOODS) { diff --git a/src/components/CMyCardGrpPopup/CMyCardGrpPopup.ts b/src/components/CMyCardGrpPopup/CMyCardGrpPopup.ts index d70696b2..ca9cf6d2 100644 --- a/src/components/CMyCardGrpPopup/CMyCardGrpPopup.ts +++ b/src/components/CMyCardGrpPopup/CMyCardGrpPopup.ts @@ -76,7 +76,8 @@ export default defineComponent({ } function condividipag() { - return tools.copyStringToClipboard($q, self.location.host + tools.getPathByGroup(myrec.value, props.table), true) + const msg = self.location.host + tools.getPathByGroup(myrec.value, props.table) + return tools.copyStringToClipboard($q, msg, true) } onMounted(mounted) diff --git a/src/components/CMySelect/CMySelect.ts b/src/components/CMySelect/CMySelect.ts index 509bdb51..9fcb1dd0 100755 --- a/src/components/CMySelect/CMySelect.ts +++ b/src/components/CMySelect/CMySelect.ts @@ -312,6 +312,7 @@ export default defineComponent({ // Check if exist other array: if (props.col) { + if (props.col.remote_table && props.col.remote_key && props.col.remote_field) { try { diff --git a/src/components/CSignIn/CSignIn.ts b/src/components/CSignIn/CSignIn.ts index 64af1f74..5b0438f1 100755 --- a/src/components/CSignIn/CSignIn.ts +++ b/src/components/CSignIn/CSignIn.ts @@ -118,13 +118,14 @@ export default defineComponent({ }) .then((riscode: number) => { if (riscode === tools.OK) { - // console.log(' -> eseguo emit(loginOk)') + console.log(' -> eseguo emit(loginOk)') emit('loginOk') globalStore.createPushSubscription() } else { + console.log(' -> eseguo emit(checkErrors)') emit('checkErrors', riscode) } diff --git a/src/components/CUserNonVerif/CUserNonVerif.ts b/src/components/CUserNonVerif/CUserNonVerif.ts index 6dd6bbd5..1b9f8f0f 100755 --- a/src/components/CUserNonVerif/CUserNonVerif.ts +++ b/src/components/CUserNonVerif/CUserNonVerif.ts @@ -23,9 +23,11 @@ export default defineComponent({ setup(props) { const userStore = useUserStore() + const globalStore = useGlobalStore() return { userStore, + globalStore, tools, } }, diff --git a/src/components/CUserNonVerif/CUserNonVerif.vue b/src/components/CUserNonVerif/CUserNonVerif.vue index 68bd4ae3..3279d25c 100755 --- a/src/components/CUserNonVerif/CUserNonVerif.vue +++ b/src/components/CUserNonVerif/CUserNonVerif.vue @@ -1,5 +1,5 @@