Merge pull request #537 from frappe/develop

This commit is contained in:
Shariq Ansari 2025-01-22 12:45:39 +05:30 committed by GitHub
commit 8d143166f1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 14 additions and 8 deletions

View File

@ -46,6 +46,7 @@ jobs:
- name: Set Image Tag - name: Set Image Tag
run: | run: |
echo "IMAGE_TAG=${{ github.ref_name == 'develop' && 'latest' || 'v15' }}" >> $GITHUB_ENV echo "IMAGE_TAG=${{ github.ref_name == 'develop' && 'latest' || 'v15' }}" >> $GITHUB_ENV
echo "STABLE_TAG=${{ github.ref_name == 'develop' && 'nightly' || 'stable' }}" >> $GITHUB_ENV
- uses: actions/checkout@v4 - uses: actions/checkout@v4
with: with:
@ -60,7 +61,9 @@ jobs:
file: builds/images/layered/Containerfile file: builds/images/layered/Containerfile
tags: > tags: >
ghcr.io/${{ github.repository }}:${{ github.ref_name }}, ghcr.io/${{ github.repository }}:${{ github.ref_name }},
ghcr.io/${{ github.repository }}:${{ env.IMAGE_TAG }} ghcr.io/${{ github.repository }}:${{ env.IMAGE_TAG }},
ghcr.io/${{ github.repository }}:${{ env.STABLE_TAG }}
build-args: | build-args: |
"FRAPPE_BRANCH=${{ env.FRAPPE_BRANCH }}" "FRAPPE_BRANCH=${{ env.FRAPPE_BRANCH }}"
"APPS_JSON_BASE64=${{ env.APPS_JSON_BASE64 }}" "APPS_JSON_BASE64=${{ env.APPS_JSON_BASE64 }}"

View File

@ -253,7 +253,6 @@ import { ref, onBeforeUnmount, watch, nextTick } from 'vue'
import { useRouter } from 'vue-router' import { useRouter } from 'vue-router'
const { $socket } = globalStore() const { $socket } = globalStore()
const { user } = sessionStore()
const callPopupHeader = ref(null) const callPopupHeader = ref(null)
const showCallPopup = ref(false) const showCallPopup = ref(false)
@ -298,11 +297,14 @@ const getContact = createResource({
}, },
}) })
watch(phoneNumber, (value) => { watch(
if (!value) return phoneNumber,
getContact.fetch() (value) => {
}, { immediate: true }) if (!value) return
getContact.fetch()
},
{ immediate: true },
)
const dirty = ref(false) const dirty = ref(false)
@ -427,12 +429,13 @@ function setup() {
console.log(data) console.log(data)
callStatus.value = updateStatus(data) callStatus.value = updateStatus(data)
const { user } = sessionStore()
if ( if (
!showCallPopup.value && !showCallPopup.value &&
!showSmallCallPopup.value && !showSmallCallPopup.value &&
data.AgentEmail && data.AgentEmail &&
data.AgentEmail == user.value data.AgentEmail == (user || user.value)
) { ) {
phoneNumber.value = data.CallTo || data.To phoneNumber.value = data.CallTo || data.To
showCallPopup.value = true showCallPopup.value = true