Merge branch 'rc/2.3.0' into 'master'

2.3.0 to MASTER

See merge request pleroma/pleroma-fe!1366

2 files changed, 30 insertions, 4 deletions

diff --git a/src/components/registration/registration.js b/src/components/registration/registration.js
index dab06e1e..1ac8e8be 100644
--- a/src/components/registration/registration.js
+++ b/src/components/registration/registration.js
@@ -10,7 +10,8 @@ const registration = {
       fullname: '',
       username: '',
       password: '',
-      confirm: ''
+      confirm: '',
+      reason: ''
     },
     captcha: {}
   }),
@@ -24,7 +25,8 @@ const registration = {
         confirm: {
           required,
           sameAsPassword: sameAs('password')
-        }
+        },
+        reason: { required: requiredIf(() => this.accountApprovalRequired) }
       }
     }
   },
@@ -38,7 +40,10 @@ const registration = {
   computed: {
     token () { return this.$route.params.token },
     bioPlaceholder () {
-      return this.$t('registration.bio_placeholder').replace(/\s*\n\s*/g, ' \n')
+      return this.replaceNewlines(this.$t('registration.bio_placeholder'))
+    },
+    reasonPlaceholder () {
+      return this.replaceNewlines(this.$t('registration.reason_placeholder'))
     },
     ...mapState({
       registrationOpen: (state) => state.instance.registrationOpen,
@@ -46,7 +51,8 @@ const registration = {
       isPending: (state) => state.users.signUpPending,
       serverValidationErrors: (state) => state.users.signUpErrors,
       termsOfService: (state) => state.instance.tos,
-      accountActivationRequired: (state) => state.instance.accountActivationRequired
+      accountActivationRequired: (state) => state.instance.accountActivationRequired,
+      accountApprovalRequired: (state) => state.instance.accountApprovalRequired
     })
   },
   methods: {
@@ -73,6 +79,9 @@ const registration = {
     },
     setCaptcha () {
       this.getCaptcha().then(cpt => { this.captcha = cpt })
+    },
+    replaceNewlines (str) {
+      return str.replace(/\s*\n\s*/g, ' \n')
     }
   }
 }
diff --git a/src/components/registration/registration.vue b/src/components/registration/registration.vue
index 100df0d6..062d4121 100644
--- a/src/components/registration/registration.vue
+++ b/src/components/registration/registration.vue
@@ -163,6 +163,23 @@
             </div>
 
             <div
+              v-if="accountApprovalRequired"
+              class="form-group"
+            >
+              <label
+                class="form--label"
+                for="reason"
+              >{{ $t('registration.reason') }}</label>
+              <textarea
+                id="reason"
+                v-model="user.reason"
+                :disabled="isPending"
+                class="form-control"
+                :placeholder="reasonPlaceholder"
+              />
+            </div>
+
+            <div
               v-if="captcha.type != 'none'"
               id="captcha-group"
               class="form-group"