From 0a5bffc45f81a9735d49e1d69f5666b26335e703 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E9=A1=BA=E5=BC=BA?= <ysq9207@126.com>
Date: Mon, 11 Mar 2019 11:14:49 +0800
Subject: [PATCH] repair move&copy bug (#3091)

---
 frontend/src/components/dialog/copy-dirent-dialog.js      | 4 ++--
 frontend/src/components/dialog/move-dirent-dialog.js      | 4 ++--
 .../src/components/dirent-list-view/dirent-list-item.js   | 8 ++++++--
 .../components/toolbar/mutilple-dir-operation-toolbar.js  | 3 +++
 .../src/pages/lib-content-view/lib-content-toolbar.js     | 1 +
 5 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/frontend/src/components/dialog/copy-dirent-dialog.js b/frontend/src/components/dialog/copy-dirent-dialog.js
index ceda6dd8c5..c1166e80b5 100644
--- a/frontend/src/components/dialog/copy-dirent-dialog.js
+++ b/frontend/src/components/dialog/copy-dirent-dialog.js
@@ -14,7 +14,7 @@ const propTypes = {
   onItemCopy: PropTypes.func,
   onItemsCopy: PropTypes.func,
   onCancelCopy: PropTypes.func.isRequired,
-  currentRepoInfo:PropTypes.object.isRequired,
+  repoEncrypted: PropTypes.object.isRequired,
 };
 
 // need dirent file Path；
@@ -157,7 +157,7 @@ class CopyDirent extends React.Component {
     } else {
       title = gettext('Copy selected item(s) to:');
     }
-    let mode = this.props.currentRepoInfo.encrypted ? 'only_current_library':'current_repo_and_other_repos'
+    let mode = this.props.repoEncrypted ? 'only_current_library':'current_repo_and_other_repos'
     return (
       <Modal isOpen={true} toggle={this.toggle}>
         <ModalHeader toggle={this.toggle}><div dangerouslySetInnerHTML={{__html: title}}></div></ModalHeader>
diff --git a/frontend/src/components/dialog/move-dirent-dialog.js b/frontend/src/components/dialog/move-dirent-dialog.js
index d70d999b86..02657599e3 100644
--- a/frontend/src/components/dialog/move-dirent-dialog.js
+++ b/frontend/src/components/dialog/move-dirent-dialog.js
@@ -14,7 +14,7 @@ const propTypes = {
   onItemMove: PropTypes.func,
   onItemsMove: PropTypes.func,
   onCancelMove: PropTypes.func.isRequired,
-  currentRepoInfo:PropTypes.object.isRequired,
+  repoEncrypted: PropTypes.object.isRequired,
 };
 
 // need dirent file Path；
@@ -157,7 +157,7 @@ class MoveDirent extends React.Component {
     } else {
       title = gettext('Move selected item(s) to:');
     }
-    let mode = this.props.currentRepoInfo.encrypted ? 'only_current_library':'current_repo_and_other_repos'
+    let mode = this.props.repoEncrypted ? 'only_current_library':'current_repo_and_other_repos'
     return (
       <Modal isOpen={true} toggle={this.toggle}>
         <ModalHeader toggle={this.toggle}><div dangerouslySetInnerHTML={{__html: title}}></div></ModalHeader>
diff --git a/frontend/src/components/dirent-list-view/dirent-list-item.js b/frontend/src/components/dirent-list-view/dirent-list-item.js
index a1087b205f..3b25ac4f82 100644
--- a/frontend/src/components/dirent-list-view/dirent-list-item.js
+++ b/frontend/src/components/dirent-list-view/dirent-list-item.js
@@ -33,8 +33,12 @@ const propTypes = {
   onItemDetails: PropTypes.func.isRequired,
   onDirentClick: PropTypes.func.isRequired,
   updateDirent: PropTypes.func.isRequired,
+  showImagePopup: PropTypes.func.isRequired,
   currentRepoInfo: PropTypes.object,
   isRepoOwner: PropTypes.bool,
+  isAdmin: PropTypes.bool.isRequired,
+  repoEncrypted: PropTypes.bool.isRequired,
+  isGroupOwnedRepo: PropTypes.bool.isRequired,
 };
 
 class DirentListItem extends React.Component {
@@ -429,7 +433,7 @@ class DirentListItem extends React.Component {
               isMutipleOperation={this.state.isMutipleOperation}
               onItemMove={this.props.onItemMove}
               onCancelMove={this.onItemMoveToggle}
-              currentRepoInfo={this.props.currentRepoInfo}
+              repoEncrypted={this.props.repoEncrypted}
             />
           </ModalPortal>
         }
@@ -442,7 +446,7 @@ class DirentListItem extends React.Component {
               isMutipleOperation={this.state.isMutipleOperation}
               onItemCopy={this.props.onItemCopy}
               onCancelCopy={this.onItemCopyToggle}
-              currentRepoInfo={this.props.currentRepoInfo}
+              repoEncrypted={this.props.repoEncrypted}
             />
           </ModalPortal>
         }
diff --git a/frontend/src/components/toolbar/mutilple-dir-operation-toolbar.js b/frontend/src/components/toolbar/mutilple-dir-operation-toolbar.js
index 3e49db3878..3cdb52b6b0 100644
--- a/frontend/src/components/toolbar/mutilple-dir-operation-toolbar.js
+++ b/frontend/src/components/toolbar/mutilple-dir-operation-toolbar.js
@@ -12,6 +12,7 @@ import CopyDirentDialog from '../dialog/copy-dirent-dialog';
 const propTypes = {
   path: PropTypes.string.isRequired,
   repoID: PropTypes.string.isRequired,
+  repoEncrypted: PropTypes.bool.isRequired,
   selectedDirentList: PropTypes.array.isRequired,
   onItemsMove: PropTypes.func.isRequired,
   onItemsCopy: PropTypes.func.isRequired,
@@ -106,6 +107,7 @@ class MutipleDirOperationToolbar extends React.Component {
           <MoveDirentDialog 
             path={this.props.path}
             repoID={this.props.repoID}
+            repoEncrypted={this.props.repoEncrypted}
             isMutipleOperation={this.state.isMutipleOperation}
             selectedDirentList={this.props.selectedDirentList}
             onItemsMove={this.props.onItemsMove}
@@ -116,6 +118,7 @@ class MutipleDirOperationToolbar extends React.Component {
           <CopyDirentDialog
             path={this.props.path}
             repoID={this.props.repoID}
+            repoEncrypted={this.props.repoEncrypted}
             selectedDirentList={this.props.selectedDirentList}
             isMutipleOperation={this.state.isMutipleOperation}
             onItemsCopy={this.props.onItemsCopy}
diff --git a/frontend/src/pages/lib-content-view/lib-content-toolbar.js b/frontend/src/pages/lib-content-view/lib-content-toolbar.js
index 9f6cf79764..2fe3a325a9 100644
--- a/frontend/src/pages/lib-content-view/lib-content-toolbar.js
+++ b/frontend/src/pages/lib-content-view/lib-content-toolbar.js
@@ -107,6 +107,7 @@ class LibContentToolbar extends React.Component {
               <MutipleDirOperationToolbar
                 repoID={this.props.repoID} 
                 path={this.props.path}
+                repoEncrypted={this.props.repoEncrypted}
                 selectedDirentList={this.props.selectedDirentList}
                 onItemsMove={this.props.onItemsMove}
                 onItemsCopy={this.props.onItemsCopy}