fix: backport unbackport code

(cherry picked from commit 2a4a83ea6db84934a97c47d5ebcb3532ff3c7cc7)
This commit is contained in:
Shariq Ansari 2025-06-09 14:03:30 +05:30 committed by Mergify
parent a4892f1918
commit 57a4d2067a
2 changed files with 35 additions and 10 deletions

View File

@ -10,7 +10,12 @@
<Badge v-if="callLog.isDirty" :label="'Not Saved'" theme="orange" /> <Badge v-if="callLog.isDirty" :label="'Not Saved'" theme="orange" />
</div> </div>
<div class="flex items-center gap-1"> <div class="flex items-center gap-1">
<Button v-if="isManager() && !isMobileView" variant="ghost" class="w-7" @click="openQuickEntryModal"> <Button
v-if="isManager() && !isMobileView"
variant="ghost"
class="w-7"
@click="openQuickEntryModal"
>
<EditIcon class="w-4 h-4" /> <EditIcon class="w-4 h-4" />
</Button> </Button>
<Button variant="ghost" class="w-7" @click="show = false"> <Button variant="ghost" class="w-7" @click="show = false">
@ -19,19 +24,28 @@
</div> </div>
</div> </div>
<div v-if="tabs.data"> <div v-if="tabs.data">
<FieldLayout :tabs="tabs.data" :data="_callLog" doctype="CRM Call Log" /> <FieldLayout
:tabs="tabs.data"
:data="callLog.doc"
doctype="CRM Call Log"
/>
<ErrorMessage class="mt-8" :message="error" /> <ErrorMessage class="mt-8" :message="error" />
</div> </div>
</div> </div>
<div class="px-4 pt-4 pb-7 sm:px-6"> <div class="px-4 pt-4 pb-7 sm:px-6">
<div class="space-y-2"> <div class="space-y-2">
<Button class="w-full" v-for="action in dialogOptions.actions" :key="action.label" v-bind="action" <Button
:label="__(action.label)" :loading="loading" /> class="w-full"
v-for="action in dialogOptions.actions"
:key="action.label"
v-bind="action"
:label="__(action.label)"
:loading="loading"
/>
</div> </div>
</div> </div>
</template> </template>
</Dialog> </Dialog>
<QuickEntryModal v-if="showQuickEntryModal" v-model="showQuickEntryModal" doctype="CRM Call Log" />
</template> </template>
<script setup> <script setup>
@ -54,7 +68,7 @@ const props = defineProps({
options: { options: {
type: Object, type: Object,
default: { default: {
afterInsert: () => { }, afterInsert: () => {},
}, },
}, },
}) })

View File

@ -9,7 +9,12 @@
</h3> </h3>
</div> </div>
<div class="flex items-center gap-1"> <div class="flex items-center gap-1">
<Button v-if="isManager() && !isMobileView" variant="ghost" class="w-7" @click="openQuickEntryModal"> <Button
v-if="isManager() && !isMobileView"
variant="ghost"
class="w-7"
@click="openQuickEntryModal"
>
<EditIcon class="w-4 h-4" /> <EditIcon class="w-4 h-4" />
</Button> </Button>
<Button variant="ghost" class="w-7" @click="show = false"> <Button variant="ghost" class="w-7" @click="show = false">
@ -27,7 +32,13 @@
</div> </div>
<div class="px-4 pt-4 pb-7 sm:px-6"> <div class="px-4 pt-4 pb-7 sm:px-6">
<div class="space-y-2"> <div class="space-y-2">
<Button class="w-full" variant="solid" :label="__('Create')" :loading="loading" @click="createOrganization" /> <Button
class="w-full"
variant="solid"
:label="__('Create')"
:loading="loading"
@click="createOrganization"
/>
</div> </div>
</div> </div>
</template> </template>
@ -60,7 +71,7 @@ const props = defineProps({
type: Object, type: Object,
default: { default: {
redirect: true, redirect: true,
afterInsert: () => { }, afterInsert: () => {},
}, },
}, },
}) })
@ -156,4 +167,4 @@ function openAddressModal(_address) {
} }
nextTick(() => (show.value = false)) nextTick(() => (show.value = false))
} }
</script> </script>