Skip to content

Commit 817451a

Browse files
committed
fix submiussions url
1 parent 8431ad4 commit 817451a

File tree

4 files changed

+15
-4
lines changed

4 files changed

+15
-4
lines changed

api/app/Http/Resources/FormResource.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ public function toArray($request)
2626
'views_count' => $this->views_count,
2727
'submissions_count' => $this->submissions_count,
2828
'redirect_url' => $this->redirect_url,
29+
'submissions_url' => $this->submissions_url,
2930
'database_fields_update' => $this->database_fields_update,
3031
'cleanings' => $this->getCleanigns(),
3132
'can_be_indexed' => $this->can_be_indexed,

api/app/Models/Forms/Form.php

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,15 @@ public function getShareUrlAttribute()
152152

153153
return front_url('/forms/' . $this->slug);
154154
}
155+
156+
public function getSubmissionsUrlAttribute()
157+
{
158+
if ($this->custom_domain) {
159+
return 'https://' . $this->custom_domain . '/forms/' . $this->slug . '/show/submissions';
160+
}
161+
162+
return front_url('/forms/' . $this->slug . '/show/submissions');
163+
}
155164

156165
public function getEditUrlAttribute()
157166
{

client/components/open/forms/components/FirstSubmissionModal.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ const helpLinks = computed(() => {
105105
})
106106
107107
const trackOpenDbClick = () => {
108-
const submissionsUrl = `/forms/${props.form.slug}/submissions`
108+
const submissionsUrl = props.form.submissions_url
109109
window.open(submissionsUrl, '_blank')
110110
amplitude.logEvent('form_first_submission_modal_open_db_click')
111111
}

client/components/open/forms/components/ShareFormUrl.vue

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,10 @@
4747
const { copy } = useClipboard()
4848
4949
const share_url = computed(() => {
50-
return props.extraQueryParam
51-
? `${props.form.share_url}?${props.extraQueryParam}`
52-
: props.form.share_url + props.extraQueryParam
50+
if (props.extraQueryParam) {
51+
return `${props.form.share_url}?${props.extraQueryParam}`
52+
}
53+
return props.form.share_url
5354
})
5455
5556
function copyToClipboard() {

0 commit comments

Comments
 (0)