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

Implv/125 Selective batch deletion in search result page
* Fix behavior of deletion-confirm button when checkbox is checked (or unchecked).

Tatsuya Ise 8 лет назад
Родитель
Сommit
eb113383af

+ 1 - 1
resource/js/components/SearchPage/DeletePageListModal.js

@@ -21,7 +21,7 @@ export default class DeletePageListModal extends React.Component {
   }
 
   render() {
-    if (this.props.pages === undefined) {
+    if (this.props.pages === undefined || this.props.pages.length == 0) {
       return <div></div>
     }
 

+ 3 - 2
resource/js/components/SearchPage/SearchResult.js

@@ -46,6 +46,7 @@ export default class SearchResult extends React.Component {
     } else {
       this.state.selectedPages.add(page);
     }
+    this.setState({isDeleteConfirmModalShown: false});
     this.setState({selectedPages: this.state.selectedPages});
   }
 
@@ -86,7 +87,7 @@ export default class SearchResult extends React.Component {
     });
 
     if ( isDeleteComplete ) {
-      this.closeDeleteConfirmModal();
+      window.location.reload();
     }
   }
 
@@ -146,7 +147,7 @@ export default class SearchResult extends React.Component {
     if (this.state.deletionMode) {
       deletionModeButtons =
       <div className="btn-group">
-        <button type="button" className="btn btn-danger" onClick={() => this.showDeleteConfirmModal()}><i className="fa fa-trash-o"/> Delete</button>
+        <button type="button" className="btn btn-danger" onClick={() => this.showDeleteConfirmModal()} disabled={this.state.selectedPages.size == 0}><i className="fa fa-trash-o"/> Delete</button>
         <button type="button" className="btn btn-default" onClick={() => this.handleDeletionModeChange()}><i className="fa fa-undo"/> Cancel</button>
       </div>
     }