Merge branch '7.0'

frontend/src/components/dialog/create-repo-dialog.js

@@ -50,6 +50,10 @@ class CreateRepoDialog extends React.Component {
       let password = this.state.encrypt ? this.state.password1 : '';
       let permission= this.state.permission;
       let repo = this.createRepo(repoName, password, permission);
+      if (this.props.libraryType === 'department') {
+        this.props.onCreateRepo(repo, 'department');
+        return;
+      }
       this.props.onCreateRepo(repo);
     }
   } 
@@ -150,6 +154,12 @@ class CreateRepoDialog extends React.Component {
         permission: permission,
       };
     }
+    if (libraryType === 'department') {
+      repo = {
+        repo_name: repoName,
+        passwd: password,
+      };
+    }
     return repo;
   }
 

frontend/src/components/dialog/internal-link-dialog.js

@@ -68,8 +68,8 @@ class InternalLinkDialog extends React.Component {
             </p>
           </ModalBody>
           <ModalFooter>
-            <Button color="primary" onClick={this.copyToClipBoard}>{gettext('Copy')}</Button>{' '}
             <Button color="secondary" onClick={this.toggle}>{gettext('Cancel')}</Button>
+            <Button color="primary" onClick={this.copyToClipBoard}>{gettext('Copy')}</Button>
           </ModalFooter>
         </Modal>
       </span>