diff --git a/src/common/shared_vuejs.ts b/src/common/shared_vuejs.ts index a6f229ab..86736a8c 100755 --- a/src/common/shared_vuejs.ts +++ b/src/common/shared_vuejs.ts @@ -42,6 +42,7 @@ export const shared_consts = { FILTER_MYSKILL_SKILL: 1, OPTIONS_SEARCH_ONLY_FULL_WORDS: 1, + OPTIONS_SEARCH_USER_ONLY_FULL_WORDS: 2, FRIENDSCMD: { SETTRUST: 121, diff --git a/src/components/CFinder/CFinder.vue b/src/components/CFinder/CFinder.vue index 9e69e567..1122a1e8 100755 --- a/src/components/CFinder/CFinder.vue +++ b/src/components/CFinder/CFinder.vue @@ -8,7 +8,7 @@ :prop_mycolumns="colmySkills" prop_colkey="idSkill" col_title="subTitle" - :vertical="true" + :vertical="-1" :nodataLabel="idSector > 0 ? 'Nessuna Competenza trovata': 'Selezionare un Settore'" :prop_search="true" :finder="true" diff --git a/src/components/CGridTableRec/CGridTableRec.ts b/src/components/CGridTableRec/CGridTableRec.ts index 5d8a2c16..2b2248bb 100755 --- a/src/components/CGridTableRec/CGridTableRec.ts +++ b/src/components/CGridTableRec/CGridTableRec.ts @@ -90,9 +90,9 @@ export default defineComponent({ default: false, }, vertical: { - type: Boolean, + type: Number, required: false, - default: false, + default: 0, }, prop_codeId: { type: String, @@ -181,7 +181,17 @@ export default defineComponent({ type: Boolean, required: false, default: false - } + }, + visufind: { + type: Number, + required: false, + default: costanti.FIND_PEOPLE, + }, + extrafield: { + type: String, + required: false, + default: '', + }, }, components: { CMyPopupEdit, CTitleBanner, CMyFieldDb, CMySelect, CMyFriends, CMyGroups }, setup(props, { emit }) { @@ -242,7 +252,7 @@ export default defineComponent({ const mycodeid = toRef(props, 'prop_codeId') - const myvertical = ref(0) + const myvertical = ref(props.vertical) const valoriopt = computed(() => (item: any, addall: boolean) => { // console.log('valoriopt', item.table) @@ -318,9 +328,11 @@ export default defineComponent({ if (tablesel.value === 'mygroups') { // is Admin ? - const trovato = rec.admins.find((myuser: any) => myuser.username === userStore.my.username) - if (trovato) { - return !!trovato + if (rec.admins) { + const trovato = rec.admins.find((myuser: any) => myuser.username === userStore.my.username) + if (trovato) { + return !!trovato + } } } @@ -859,7 +871,7 @@ export default defineComponent({ colkey.value = props.prop_colkey pagination.value = props.prop_pagination - myvertical.value = props.vertical ? -1 : 0 + myvertical.value = props.vertical if (props.finder) { myvertical.value = tools.getCookie('myv', 0) } diff --git a/src/components/CGridTableRec/CGridTableRec.vue b/src/components/CGridTableRec/CGridTableRec.vue index 85e9eb92..c9e39604 100755 --- a/src/components/CGridTableRec/CGridTableRec.vue +++ b/src/components/CGridTableRec/CGridTableRec.vue @@ -297,7 +297,6 @@
-