Merge branch '7.0'

frontend/src/components/dirent-grid-view/dirent-grid-view.js

@@ -18,6 +18,7 @@ import ZipDownloadDialog from '../dialog/zip-download-dialog';
 import Rename from '../../components/dialog/rename-grid-item-dialog';
 import CreateFile from '../dialog/create-file-dialog';
 import CreateFolder from '../dialog/create-folder-dialog';
+import LibSubFolderPermissionDialog from '../dialog/lib-sub-folder-permission-dialog';
 
 import '../../css/grid-view.css';
 
@@ -47,7 +48,7 @@ const propTypes = {
 class DirentGridView extends React.Component{
   constructor(props) {
     super(props);
-    this.state={
+    this.state= {
       isImagePopupOpen: false,
       imageItems: [],
       imageIndex: 0,
@@ -59,6 +60,7 @@ class DirentGridView extends React.Component{
       isRenameDialogShow: false,
       isCreateFolderDialogShow: false,
       isCreateFileDialogShow: false,
+      isPermissionDialogOpen: false,
 
       isMutipleOperation: false,
       isGridItemFreezed: false,
@@ -210,7 +212,7 @@ class DirentGridView extends React.Component{
   }
 
   onPermissionItem = () => {
-
+    this.setState({isPermissionDialogOpen: !this.state.isPermissionDialogOpen});
   }
 
   onLockItem = (currentObject) => {
@@ -613,6 +615,17 @@ class DirentGridView extends React.Component{
             />
           </ModalPortal>
         )}
+        {this.state.isPermissionDialogOpen &&
+          <ModalPortal>
+            <LibSubFolderPermissionDialog
+              toggleDialog={this.onPermissionItem}
+              repoID={this.props.repoID}
+              folderPath={direntPath}
+              folderName={dirent.name}
+              isDepartmentRepo={this.props.isGroupOwnedRepo}
+            />
+          </ModalPortal>
+        }
         {this.state.isImagePopupOpen && (
           <ModalPortal>
             <ImageDialog
@@ -631,4 +644,4 @@ class DirentGridView extends React.Component{
 
 DirentGridView.propTypes = propTypes;
 
-export default DirentGridView;
+export default DirentGridView;

frontend/src/components/shared-repo-list-view/shared-repo-list-item.js

@@ -11,6 +11,7 @@ import LibSubFolderPermissionDialog from '../../components/dialog/lib-sub-folder
 import DeleteRepoDialog from '../../components/dialog/delete-repo-dialog';
 import Rename from '../rename';
 import { seafileAPI } from '../../utils/seafile-api';
+import LibHistorySettingDialog from '../dialog/lib-history-setting-dialog';
 
 const propTypes = {
   currentGroup: PropTypes.object,
@@ -37,7 +38,8 @@ class SharedRepoListItem extends React.Component {
       isRenaming: false,
       isStarred: this.props.repo.starred,
       isFolderPermissionDialogOpen: false,
-      isDeleteDialogShow: false
+      isHistorySettingDialogShow: false,
+      isDeleteDialogShow: false,
     };
     this.isDeparementOnwerGroupMember = false;
   }
@@ -124,6 +126,9 @@ class SharedRepoListItem extends React.Component {
       case 'Unshare':
         this.onItemUnshare();
         break;
+      case 'History Setting':
+        this.onHistorySettingToggle();
+        break;
       default:
         break;
     }
@@ -151,6 +156,10 @@ class SharedRepoListItem extends React.Component {
     this.setState({isFolderPermissionDialogOpen: !this.state.isFolderPermissionDialogOpen});
   }
 
+  onHistorySettingToggle = () => {
+    this.setState({isHistorySettingDialogShow: !this.state.isHistorySettingDialogShow});
+  }
+
   onItemDetails = () => {
     this.props.onItemDetails(this.props.repo);
   }
@@ -189,6 +198,9 @@ class SharedRepoListItem extends React.Component {
       case 'Share':
         translateResult = gettext('Share');
         break;
+      case 'History Setting':
+        translateResult = gettext('History Setting');
+        break;
       default:
         break;
     }
@@ -208,7 +220,7 @@ class SharedRepoListItem extends React.Component {
         if (isStaff && repo.owner_email == currentGroup.id + '@seafile_group') { //is a member of this current group,
           this.isDeparementOnwerGroupMember = true;
           if (folderPermEnabled) {
-            operations = ['Rename', 'Folder Permission', 'Details'];
+            operations = ['Rename', 'Folder Permission', 'History Setting', 'Details'];
           } else {
             operations = ['Rename', 'Details'];
           }
@@ -394,14 +406,23 @@ class SharedRepoListItem extends React.Component {
           </ModalPortal>
         )}
         {this.state.isDeleteDialogShow && 
-            <ModalPortal>
-              <DeleteRepoDialog 
-                repo={this.props.repo}
-                onDeleteRepo={this.props.onItemDelete}
-                toggle={this.onItemDeleteToggle}
-              />
+          <ModalPortal>
+            <DeleteRepoDialog
+              repo={this.props.repo}
+              onDeleteRepo={this.props.onItemDelete}
+              toggle={this.onItemDeleteToggle}
+            />
           </ModalPortal>
         }
+        {this.state.isHistorySettingDialogShow && (
+          <ModalPortal>
+            <LibHistorySettingDialog
+              repoID={repo.repo_id}
+              itemName={repo.repo_name}
+              toggleDialog={this.onHistorySettingToggle}
+            />
+          </ModalPortal>
+        )}
       </Fragment>
     );
   }