Lea/web-apps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

[DE mobile] Fix Bug 56709

Browse source
This commit is contained in:
SergeyEzhin 2022-10-13 02:00:13 +04:00
parent 6041671b5f
commit d5a269975c
1 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
apps/common/mobile/lib/view/collaboration/Comments.jsx
View file

@ -637,6 +637,7 @@ const ViewComments = inject("storeComments", "storeAppOptions", "storeReview")(o
const isAndroid = Device.android; const isAndroid = Device.android;
const displayMode = storeReview.displayMode; const displayMode = storeReview.displayMode;
const isViewer = storeAppOptions.isViewer; const isViewer = storeAppOptions.isViewer;
const canEditComments = storeAppOptions.canEditComments;
const viewMode = !storeAppOptions.canComments; const viewMode = !storeAppOptions.canComments;
const comments = storeComments.groupCollectionFilter || storeComments.collectionComments; const comments = storeComments.groupCollectionFilter || storeComments.collectionComments;
const isEdit = storeAppOptions.isEdit || storeAppOptions.isRestrictedEdit; const isEdit = storeAppOptions.isEdit || storeAppOptions.isRestrictedEdit;
@ -677,8 +678,8 @@ const ViewComments = inject("storeComments", "storeAppOptions", "storeReview")(o
</div> </div>
{isEdit && !viewMode && {isEdit && !viewMode &&
<div className='right'> <div className='right'>
{(comment.editable && displayMode === 'markup' && !wsProps?.Objects && !isViewer) && <div className='comment-resolve' onClick={() => {onResolveComment(comment);}}><Icon icon={comment.resolved ? 'icon-resolve-comment check' : 'icon-resolve-comment'} /></div> } {(comment.editable && displayMode === 'markup' && !wsProps?.Objects && (!isViewer || canEditComments)) && <div className='comment-resolve' onClick={() => {onResolveComment(comment);}}><Icon icon={comment.resolved ? 'icon-resolve-comment check' : 'icon-resolve-comment'} /></div> }
{(displayMode === 'markup' && !wsProps?.Objects && !isViewer) && {(displayMode === 'markup' && !wsProps?.Objects && (!isViewer || canEditComments)) &&
<div className='comment-menu' <div className='comment-menu'
onClick={() => {setComment(comment); openActionComment(true);}}> onClick={() => {setComment(comment); openActionComment(true);}}>
<Icon icon='icon-menu-comment'/> <Icon icon='icon-menu-comment'/>
@ -708,7 +709,7 @@ const ViewComments = inject("storeComments", "storeAppOptions", "storeReview")(o
<div className='reply-date'>{reply.date}</div> <div className='reply-date'>{reply.date}</div>
</div> </div>
</div> </div>
{isEdit && !viewMode && reply.editable && !isViewer && {isEdit && !viewMode && reply.editable && (!isViewer || canEditComments) &&
<div className='right'> <div className='right'>
<div className='reply-menu' <div className='reply-menu'
onClick={() => {setComment(comment); setReply(reply); openActionReply(true);}} onClick={() => {setComment(comment); setReply(reply); openActionReply(true);}}
@ -748,6 +749,7 @@ const CommentList = inject("storeComments", "storeAppOptions", "storeReview")(ob
const isAndroid = Device.android; const isAndroid = Device.android;
const displayMode = storeReview.displayMode; const displayMode = storeReview.displayMode;
const isViewer = storeAppOptions.isViewer; const isViewer = storeAppOptions.isViewer;
const canEditComments = storeAppOptions.canEditComments;
const viewMode = !storeAppOptions.canComments; const viewMode = !storeAppOptions.canComments;
const isEdit = storeAppOptions.isEdit || storeAppOptions.isRestrictedEdit; const isEdit = storeAppOptions.isEdit || storeAppOptions.isRestrictedEdit;
const comments = storeComments.showComments; const comments = storeComments.showComments;
@ -787,7 +789,7 @@ const CommentList = inject("storeComments", "storeAppOptions", "storeReview")(ob
<Fragment> <Fragment>
<Toolbar position='bottom'> <Toolbar position='bottom'>
{isEdit && !viewMode && {isEdit && !viewMode &&
<Link className={`btn-add-reply${wsProps?.Objects || isViewer ? ' disabled' : ''}`} href='#' onClick={() => {onCommentMenuClick('addReply', comment);}}>{_t.textAddReply}</Link> <Link className={`btn-add-reply${(wsProps?.Objects || isViewer) && !canEditComments ? ' disabled' : ''}`} href='#' onClick={() => {onCommentMenuClick('addReply', comment);}}>{_t.textAddReply}</Link>
} }
<div className='comment-navigation row'> <div className='comment-navigation row'>
<Link href='#' onClick={onViewPrevComment}><Icon slot='media' icon='icon-prev'/></Link> <Link href='#' onClick={onViewPrevComment}><Icon slot='media' icon='icon-prev'/></Link>
@ -808,8 +810,8 @@ const CommentList = inject("storeComments", "storeAppOptions", "storeReview")(ob
</div> </div>
{isEdit && !viewMode && {isEdit && !viewMode &&
<div className='right'> <div className='right'>
{(comment.editable && displayMode === 'markup' && !wsProps?.Objects && !isViewer) && <div className='comment-resolve' onClick={() => {onResolveComment(comment);}}><Icon icon={comment.resolved ? 'icon-resolve-comment check' : 'icon-resolve-comment'}/></div>} {(comment.editable && displayMode === 'markup' && !wsProps?.Objects && (!isViewer || canEditComments)) && <div className='comment-resolve' onClick={() => {onResolveComment(comment);}}><Icon icon={comment.resolved ? 'icon-resolve-comment check' : 'icon-resolve-comment'}/></div>}
{(displayMode === 'markup' && !wsProps?.Objects && !isViewer) && {(displayMode === 'markup' && !wsProps?.Objects && (!isViewer || canEditComments)) &&
<div className='comment-menu' <div className='comment-menu'
onClick={() => {openActionComment(true);}}> onClick={() => {openActionComment(true);}}>
<Icon icon='icon-menu-comment'/> <Icon icon='icon-menu-comment'/>
@ -839,7 +841,7 @@ const CommentList = inject("storeComments", "storeAppOptions", "storeReview")(ob
<div className='reply-date'>{reply.date}</div> <div className='reply-date'>{reply.date}</div>
</div> </div>
</div> </div>
{isEdit && !viewMode && reply.editable && !isViewer && {isEdit && !viewMode && reply.editable && (!isViewer || canEditComments) &&
<div className='right'> <div className='right'>
<div className='reply-menu' <div className='reply-menu'
onClick={() => {setReply(reply); openActionReply(true);}} onClick={() => {setReply(reply); openActionReply(true);}}