Skip to content

fixes issue 2856 #2940

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
maxceem merged 1 commit into from
Apr 15, 2019
Merged

fixes issue 2856 #2940

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions src/components/LinksMenu/FileLinksMenu.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ import _ from 'lodash'
import Modal from '../Modal/Modal'

const FileLinksMenu = ({
canAdd,
canDelete,
noDots,
isAddingNewLink,
Expand Down Expand Up @@ -102,7 +101,7 @@ const FileLinksMenu = ({
return (
<MobileExpandable title={`${title} (${links.length})`}>
<Panel className={cn({'modal-active': (isAddingNewLink || linkToDelete >= 0)}, 'panel-links-container')}>
{canAdd && !isAddingNewLink && onAddingNewLink &&
{!isAddingNewLink && onAddingNewLink &&
<Panel.AddBtn onClick={() => onAddingNewLink(true)}>Upload File</Panel.AddBtn>}

{!isAddingNewLink && <Panel.Title>
Expand Down Expand Up @@ -223,9 +222,9 @@ const FileLinksMenu = ({
<a href="javascript:" onClick={() => onChangeLimit(10000)}>{moreText}</a>
</div>}
</div>
{canAdd && !isAddingNewLink && (
{!isAddingNewLink && (
<div className="add-link-mobile">
<button className="tc-btn tc-btn-secondary tc-btn-md" onClick={() => onAddingNewLink(true)}>Add New Link
<button className="tc-btn tc-btn-secondary tc-btn-md" onClick={() => onAddingNewLink(true)}>Upload File
</button>
</div>
)}
Expand All @@ -235,7 +234,6 @@ const FileLinksMenu = ({
}

FileLinksMenu.propTypes = {
canAdd: PropTypes.bool,
canDelete: PropTypes.bool,
canEdit: PropTypes.bool,
noDots: PropTypes.bool,
Expand Down
39 changes: 20 additions & 19 deletions src/projects/detail/containers/ProjectInfoContainer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,25 +264,26 @@ class ProjectInfoContainer extends React.Component {
noDots
withHash
/>
<FileLinksMenu
links={attachments}
title="Files"
canAdd={enableFileUpload}
onEdit={this.onEditAttachment}
onAddNewLink={this.onAddFile}
onAddAttachment={addProjectAttachment}
onUploadAttachment={this.onUploadAttachment}
isSharingAttachment={isSharingAttachment}
discardAttachments={discardAttachments}
onChangePermissions={changeAttachmentPermission}
selectedUsers={attachmentPermissions}
projectMembers={projectMembers}
pendingAttachments={attachmentsAwaitingPermission}
loggedInUser={loggedInUser}
moreText="view all files"
noDots
attachmentsStorePath={attachmentsStorePath}
/>
{enableFileUpload &&
<FileLinksMenu
links={attachments}
title="Files"
onEdit={this.onEditAttachment}
onAddNewLink={this.onAddFile}
onAddAttachment={addProjectAttachment}
onUploadAttachment={this.onUploadAttachment}
isSharingAttachment={isSharingAttachment}
discardAttachments={discardAttachments}
onChangePermissions={changeAttachmentPermission}
selectedUsers={attachmentPermissions}
projectMembers={projectMembers}
pendingAttachments={attachmentsAwaitingPermission}
loggedInUser={loggedInUser}
moreText="view all files"
noDots
attachmentsStorePath={attachmentsStorePath}
/>
}
{!hideLinks &&
<LinksMenu
links={project.bookmarks || []}
Expand Down