Merge branch '7.0'

frontend/src/components/dialog/import-work-weixin-department-dialog.js

@@ -0,0 +1,54 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { Button, Modal, ModalHeader, ModalBody, ModalFooter } from 'reactstrap';
+import Loading from '../loading';
+
+const propTypes = {
+  importDepartmentDialogToggle: PropTypes.func.isRequired,
+  onImportDepartmentSubmit: PropTypes.func.isRequired,
+  departmentsCount: PropTypes.number.isRequired,
+  membersCount: PropTypes.number.isRequired,
+  departmentName: PropTypes.string.isRequired,
+};
+
+class ImportWorkWeixinDepartmentDialog extends React.Component {
+
+  constructor(props) {
+    super(props);
+    this.state = {
+      isLoading : false,
+    };
+  }
+
+  toggle = () => {
+    this.props.importDepartmentDialogToggle(null);
+  };
+
+  handleSubmit = () => {
+    this.props.onImportDepartmentSubmit();
+    this.setState({ isLoading : true });
+  };
+
+  render() {
+    const { departmentsCount, membersCount, departmentName } = this.props;
+    return (
+      <Modal isOpen={true} toggle={this.toggle}>
+        <ModalHeader toggle={this.toggle}>
+          <span>{'导入部门 '}</span><span className="op-target" title={departmentName}>{departmentName}</span>
+        </ModalHeader>
+        <ModalBody>
+          <p>{'将要导入 '}<strong>{departmentsCount}</strong>{' 个部门，其中包括 '}<strong>{membersCount}</strong>{' 个成员'}</p>
+          {this.state.isLoading && <Loading/>}
+        </ModalBody>
+        <ModalFooter>
+          <Button color="secondary" onClick={this.toggle}>{'取消'}</Button>
+          <Button color="primary" onClick={this.handleSubmit}>{'导入'}</Button>
+        </ModalFooter>
+      </Modal>
+    );
+  }
+}
+
+ImportWorkWeixinDepartmentDialog.propTypes = propTypes;
+
+export default ImportWorkWeixinDepartmentDialog;

frontend/src/components/dirent-detail/dirent-details.js

@@ -238,7 +238,7 @@ class DirentDetail extends React.Component {
             <TabPane tabId="comments" className="comments h-100">
               <DetailCommentList
                 repoID={this.props.repoID}
-                filePath={(dirent && dirent.type === 'file') ? path + dirent.name : path}
+                filePath={(dirent && dirent.type === 'file') ? path + '/' + dirent.name : path}
               />
             </TabPane>
           </TabContent>