wbuezas
/
salix-front-mindshore-fork2
forked from verdnatura/salix-front
0
0
Fork 0
Code Pull Requests Activity

refs #7355 fix conflicts

This commit is contained in:
Carlos Satorres 2024-08-01 09:56:54 +02:00
parent 2d467016b2
commit 68e4831ea5
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/pages/Account/Card/AccountDescriptorMenu.vue
View File

@ -130,10 +130,10 @@ const removeAccount = async () => {
</QItem> </QItem>
<QSeparator /> <QSeparator />
<QItem @click="removeAccount(id)" v-ripple clickable> <!-- <QItem @click="removeAccount(id)" v-ripple clickable>
<QItemSection avatar> <QItemSection avatar>
<QIcon name="delete" /> <QIcon name="delete" />
</QItemSection> </QItemSection>
<QItemSection>{{ t('account.card.actions.delete.name') }}</QItemSection> <QItemSection>{{ t('account.card.actions.delete.name') }}</QItemSection>
</QItem> </QItem> -->
</template> </template>

6
src/pages/Account/Role/Card/RoleDescriptor.vue
View File

@ -1,11 +1,10 @@
<script setup> <script setup>
import { ref, computed } from 'vue'; import { ref, computed } from 'vue';
import { useRoute, useRouter } from 'vue-router'; import { useRoute } from 'vue-router';
import { useI18n } from 'vue-i18n'; import { useI18n } from 'vue-i18n';
import CardDescriptor from 'components/ui/CardDescriptor.vue'; import CardDescriptor from 'components/ui/CardDescriptor.vue';
import VnLv from 'src/components/ui/VnLv.vue'; import VnLv from 'src/components/ui/VnLv.vue';
import useCardDescription from 'src/composables/useCardDescription'; import useCardDescription from 'src/composables/useCardDescription';
import { useQuasar } from 'quasar';
import axios from 'axios'; import axios from 'axios';
import useNotify from 'src/composables/useNotify.js'; import useNotify from 'src/composables/useNotify.js';
const $props = defineProps({ const $props = defineProps({
@ -22,9 +21,6 @@ const $props = defineProps({
const route = useRoute(); const route = useRoute();
const quasar = useQuasar();
const router = useRouter();
const { notify } = useNotify(); const { notify } = useNotify();
const { t } = useI18n(); const { t } = useI18n();
const entityId = computed(() => { const entityId = computed(() => {