瀏覽代碼

Merge pull request #3572 from weseek/feat/173-5510-prevent-chackbot-without-mail-service

Feat/173 5510 dispaly caution for inviting user
itizawa 5 年之前
父節點
當前提交
301f2283ba

+ 1 - 0
resource/locales/en_US/admin/admin.json

@@ -261,6 +261,7 @@
       "description1":"Temporarily issue new users by email addresses.",
       "description2":"A temporary password will be generated for the first login.",
       "invite_thru_email": "Send invitation email",
+      "mail_setting_link":"<i class='icon-settings mr-2'></i><a href='/admin/app'>Email settings</a>",
       "valid_email": "Valid email address is required",
       "temporary_password": "The created user has a temporary password",
       "send_new_password": "Please send the new password to the user.",

+ 1 - 0
resource/locales/ja_JP/admin/admin.json

@@ -259,6 +259,7 @@
       "description1":"メールアドレスを使用して新規ユーザーを仮発行します。",
       "description2":"初回のログイン時に使用する仮パスワードが生成されます。",
       "invite_thru_email": "招待メールを送信する",
+      "mail_setting_link":"<i class='icon-settings mr-2'></i><a href='/admin/app'>メールの設定</a>",
       "valid_email": "メールアドレスを入力してください。",
       "temporary_password": "作成したユーザーは仮パスワードが設定されています。",
       "send_new_password": "新規発行したパスワードを、対象ユーザーへ連絡してください。",

+ 1 - 0
resource/locales/zh_CN/admin/admin.json

@@ -268,6 +268,7 @@
 			"emails": "电子邮件",
       "description1":"通过电子邮件地址临时发布新用户。",
       "description2":"将为首次登录生成一个临时密码。",
+      "mail_setting_link":"<i class='icon-settings mr-2'></i><a href='/admin/app'>Email settings</a>",
 			"valid_email": "需要有效的电子邮件地址",
 			"invite_thru_email": "发送邀请电子邮件",
 			"temporary_password": "创建的用户具有临时密码",

+ 6 - 2
src/client/js/components/Admin/Users/UserInviteModal.jsx

@@ -96,8 +96,12 @@ class UserInviteModal extends React.Component {
           <label className="custom-control-label" htmlFor="sendEmail">
             {t('admin:user_management.invite_modal.invite_thru_email')}
           </label>
-          {/* eslint-disable-next-line react/no-danger */}
-          {!isMailerSetup && <p className="form-text text-muted" dangerouslySetInnerHTML={{ __html: t('admin:mailer_setup_required') }} />}
+          {isMailerSetup
+            // eslint-disable-next-line react/no-danger
+            ? <p className="form-text text-muted" dangerouslySetInnerHTML={{ __html: t('admin:user_management.invite_modal.mail_setting_link') }} />
+            // eslint-disable-next-line react/no-danger
+            : <p className="form-text text-muted" dangerouslySetInnerHTML={{ __html: t('admin:mailer_setup_required') }} />
+          }
         </div>
         <div>
           <button