Просмотр исходного кода

defaul option for actionForPages

mizozobu 7 лет назад
Родитель
Сommit
77460553f4

+ 1 - 0
resource/locales/en-US/translation.json

@@ -661,6 +661,7 @@
   },
 
   "user_group_management": {
+    "choose_action": "Choose an action for private pages",
     "delete_group": "Delete Group",
     "group_name": "Group Name",
     "group_and_pages_not_retrievable": "Once deleted, the deleted group and its private pages cannot be retrieved",

+ 1 - 0
resource/locales/ja/translation.json

@@ -682,6 +682,7 @@
   },
 
   "user_group_management": {
+    "choose_action": "削除するグループの限定公開ページの処理を選択してください",
     "delete_group": "グループの削除",
     "group_name": "グループ名",
     "group_and_pages_not_retrievable": "グループ及び限定公開のページの削除を行うと元に戻すことはできませんのでご注意ください。",

+ 16 - 12
src/client/js/components/GroupDeleteModal/GroupDeleteModal.jsx

@@ -41,7 +41,7 @@ class GroupDeleteModal extends React.Component {
       deleteGroupId: '',
       deleteGroupName: '',
       groups: [],
-      actionForPages: this.actionForPages.public,
+      actionForPages: '',
       selectedGroupId: '',
     };
 
@@ -104,11 +104,12 @@ class GroupDeleteModal extends React.Component {
           name="actionForPages"
           componentClass="select"
           placeholder="select"
-          defaultValue={this.actionForPages.public}
           bsClass={bsClassName}
           className="btn-group-sm selectpicker"
+          value={this.state.actionForPages}
           onChange={this.changeActionHandler}
         >
+          <option value="" disabled>{t('user_group_management.choose_action')}</option>
           {optoins}
         </FormControl>
       </FormGroup>
@@ -141,11 +142,16 @@ class GroupDeleteModal extends React.Component {
   }
 
   disableSubmit() {
-    if (this.state.actionForPages === this.actionForPages.transfer) {
-      return this.state.selectedGroupId === '';
+    let isDisabled = false;
+
+    if (this.state.actionForPages === '') {
+      isDisabled = true;
+    }
+    else if (this.state.actionForPages === this.actionForPages.transfer) {
+      isDisabled = this.state.selectedGroupId === '';
     }
 
-    return false;
+    return isDisabled;
   }
 
   render() {
@@ -160,15 +166,13 @@ class GroupDeleteModal extends React.Component {
               <i className="icon icon-fire"></i> {t('user_group_management.delete_group')}
             </div>
           </div>
-
           <div className="modal-body">
-            <dl>
-              <dt>{t('user_group_management.group_name')}</dt>
-              <dd>{this.state.deleteGroupName}</dd>
-            </dl>
-            <span className="text-danger">
+            <div>
+              <span className="font-weight-bold">{t('user_group_management.group_name')}</span> : &quot;{this.state.deleteGroupName}&quot;
+            </div>
+            <div className="text-danger mt-5">
               {t('user_group_management.group_and_pages_not_retrievable')}
-            </span>
+            </div>
           </div>
           <div className="modal-footer">
             <form action="/admin/user-group.remove" method="post" id="admin-user-groups-delete" className="d-flex justify-content-between">