Beautiful Open-Source Form Builder
Change Edit submission button text (#105)
Chirag Chhatrala2b00137c76bd
diff --git a/app/Http/Requests/UserFormRequest.php b/app/Http/Requests/UserFormRequest.phpindex 5ec5a4a53..033bc4b8a 100644--- a/app/Http/Requests/UserFormRequest.php+++ b/app/Http/Requests/UserFormRequest.php@@ -71,6 +71,7 @@ abstract class UserFormRequest extends \Illuminate\Foundation\Http\FormRequest'max_submissions_count' => 'integer|nullable|min:1','max_submissions_reached_text' => 'string|nullable','editable_submissions' => 'boolean|nullable',+ 'editable_submissions_button_text' => 'string|min:1|max:50',// Properties'properties' => 'required|array',diff --git a/app/Listeners/Forms/NotifyFormSubmission.php b/app/Listeners/Forms/NotifyFormSubmission.phpindex 865ddcdf2..b8e59d73f 100644--- a/app/Listeners/Forms/NotifyFormSubmission.php+++ b/app/Listeners/Forms/NotifyFormSubmission.php@@ -74,7 +74,7 @@ class NotifyFormSubmission implements ShouldQueue'*<'.$editFormURL.'|✍️ Edit Form>*'];if($event->form->editable_submissions){- $externalLinks[] = '*<'.$event->form->share_url.'?submission_id='.$submissionId.'|✍️ Edit Submission>*';+ $externalLinks[] = '*<'.$event->form->share_url.'?submission_id='.$submissionId.'|✍️ '.$event->form->editable_submissions_button_text.'>*';}$finalSlackPostData = [diff --git a/app/Models/Forms/Form.php b/app/Models/Forms/Form.phpindex 725a2b5d5..fe50e63d3 100644--- a/app/Models/Forms/Form.php+++ b/app/Models/Forms/Form.php@@ -77,6 +77,7 @@ class Form extends Model'max_submissions_count','max_submissions_reached_text','editable_submissions',+ 'editable_submissions_button_text',// Security & Privacy'can_be_indexed',diff --git a/database/factories/FormFactory.php b/database/factories/FormFactory.phpindex 33c1acbab..79086dbcd 100644--- a/database/factories/FormFactory.php+++ b/database/factories/FormFactory.php@@ -84,6 +84,7 @@ class FormFactory extends Factory'password' => false,'tags' => [],'slack_webhook_url' => null,+ 'editable_submissions_button_text' => 'Edit submission'];}diff --git a/database/migrations/2023_03_13_094806_add_editable_submissions_button_text_to_forms.php b/database/migrations/2023_03_13_094806_add_editable_submissions_button_text_to_forms.phpnew file mode 100644index 000000000..e77e68b68--- /dev/null+++ b/database/migrations/2023_03_13_094806_add_editable_submissions_button_text_to_forms.php@@ -0,0 +1,32 @@+<?php++use Illuminate\Database\Migrations\Migration;+use Illuminate\Database\Schema\Blueprint;+use Illuminate\Support\Facades\Schema;++return new class extends Migration+{+ /**+ * Run the migrations.+ *+ * @return void+ */+ public function up()+ {+ Schema::table('forms', function (Blueprint $table) {+ $table->text('editable_submissions_button_text')->default('Edit submission');+ });+ }++ /**+ * Reverse the migrations.+ *+ * @return void+ */+ public function down()+ {+ Schema::table('forms', function (Blueprint $table) {+ $table->dropColumn('editable_submissions_button_text');+ });+ }+};diff --git a/resources/js/components/open/forms/OpenCompleteForm.vue b/resources/js/components/open/forms/OpenCompleteForm.vueindex 06531f245..bd9fc33aa 100644--- a/resources/js/components/open/forms/OpenCompleteForm.vue+++ b/resources/js/components/open/forms/OpenCompleteForm.vue@@ -110,7 +110,9 @@{{ form.re_fill_button_text }}</open-form-button><p v-if="form.editable_submissions && submissionId" class="mt-5">- <a target="_parent" :href="form.share_url+'?submission_id='+submissionId" class="text-nt-blue hover:underline">Edit submission</a>+ <a target="_parent" :href="form.share_url+'?submission_id='+submissionId" class="text-nt-blue hover:underline">+ {{ form.editable_submissions_button_text }}+ </a></p><p v-if="!form.no_branding" class="mt-5"><a target="_parent" href="https://opnform.com/?utm_source=form&utm_content=create_form_free" class="text-nt-blue hover:underline">Create your form for free with OpnForm</a>diff --git a/resources/js/components/open/forms/components/form-components/FormAboutSubmission.vue b/resources/js/components/open/forms/components/form-components/FormAboutSubmission.vueindex 0ad6734e4..76c09ab41 100644--- a/resources/js/components/open/forms/components/form-components/FormAboutSubmission.vue+++ b/resources/js/components/open/forms/components/form-components/FormAboutSubmission.vue@@ -23,6 +23,11 @@<toggle-switch-input name="editable_submissions" :form="form" class="mt-4"label="Allow users to edit their submission"/>+ <text-input v-if="form.editable_submissions" name="editable_submissions_button_text"+ :form="form"+ label="Text of editable submissions button"+ :required="true"+ /><flat-select-input :form="submissionOptions" name="databaseAction" label="Database Submission Action":options="[diff --git a/resources/js/mixins/form_editor/initForm.js b/resources/js/mixins/form_editor/initForm.jsindex 7da2586c7..72fb015df 100644--- a/resources/js/mixins/form_editor/initForm.js+++ b/resources/js/mixins/form_editor/initForm.js@@ -41,6 +41,7 @@ export default {rating_max_value: 5,max_submissions_count: null,max_submissions_reached_text: 'This form has now reached the maximum number of allowed submissions and is now closed.',+ editable_submissions_button_text: 'Edit submission',// Security & Privacycan_be_indexed: truediff --git a/resources/views/mail/form/confirmation-submission-notification.blade.php b/resources/views/mail/form/confirmation-submission-notification.blade.phpindex 0c5bb04e6..e1d36d859 100644--- a/resources/views/mail/form/confirmation-submission-notification.blade.php+++ b/resources/views/mail/form/confirmation-submission-notification.blade.php@@ -4,7 +4,7 @@@if($form->editable_submissions)@component('mail::button', ['url' => $form->share_url.'?submission_id='.$submission_id])-Edit submission+{{$form.editable_submissions_button_text}}@endcomponent@endif