diff --git a/src/components/CContactUser/CContactUser.vue b/src/components/CContactUser/CContactUser.vue index 55f50a6b..5a4cd087 100755 --- a/src/components/CContactUser/CContactUser.vue +++ b/src/components/CContactUser/CContactUser.vue @@ -3,7 +3,7 @@ v-if=" ((tools.getLinkUserTelegramByUser(myuser) || (myuser.email && tools.isEmailVerifiedByUser(myuser))) && - tools.isUserOk()) || + tools.isUserOk(true)) || showBtnActivities " class="" @@ -40,18 +40,18 @@
diff --git a/src/components/CMyPopupEdit/CMyPopupEdit.ts b/src/components/CMyPopupEdit/CMyPopupEdit.ts index 38dc9659..fecef970 100755 --- a/src/components/CMyPopupEdit/CMyPopupEdit.ts +++ b/src/components/CMyPopupEdit/CMyPopupEdit.ts @@ -449,6 +449,10 @@ export default defineComponent({ if (col.value && col.value.allowchar === costanti.ALLOWCHAR_CODE) { newval = tools.removespaces_slash(newval) } + + if (col.value.fieldtype === costanti.FieldType.username_telegram) { + newval = tools.removeatIniziale(newval) + } // console.log('popuppedit: changevalRec', newval, 'COLName', col.value.name) // console.log('row', props.row, 'col', props.mycol, 'newval', newval) @@ -953,10 +957,17 @@ export default defineComponent({ } function nameKeydown(e: any, col: any) { - if (col.allowchar === costanti.ALLOWCHAR_CODE) { + if (col.fieldtype === costanti.FieldType.username_telegram) { + if (!/^[a-z0-9_]*$/i.test(e.key)) { + e.preventDefault(); + } - if (/^\W$/.test(e.key)) { - e.preventDefault(); + } else { + if (col.allowchar === costanti.ALLOWCHAR_CODE) { + + if (/^\W$/.test(e.key)) { + e.preventDefault(); + } } } } diff --git a/src/components/CMyPopupEdit/CMyPopupEdit.vue b/src/components/CMyPopupEdit/CMyPopupEdit.vue index 7260b415..f09c4eb4 100755 --- a/src/components/CMyPopupEdit/CMyPopupEdit.vue +++ b/src/components/CMyPopupEdit/CMyPopupEdit.vue @@ -316,8 +316,6 @@ > {{ myvalue }}
- - @@ -333,7 +331,8 @@
+ + + Diventerà: {{ tools.generateURL(col.showLinkResult, myvalue) }} @@ -560,7 +572,7 @@ {{ t(col.label_trans ? col.label_trans : '') }} { + const datastat = ref({ num_reg: 0, num_reg_today: 0, online_today: 0, @@ -160,6 +160,7 @@ export default defineComponent({ // console.log('load') myloadingload.value = true datastat.value = await globalStore.getStatSite() + datastat.value = {} eseguipolling.value = true diff --git a/src/components/CUserNonVerif/CUserNonVerif.vue b/src/components/CUserNonVerif/CUserNonVerif.vue index c0eae3a7..359e52f2 100755 --- a/src/components/CUserNonVerif/CUserNonVerif.vue +++ b/src/components/CUserNonVerif/CUserNonVerif.vue @@ -1,62 +1,86 @@ - +