Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
S
scratch-www
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Analytics
Analytics
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
xpstem
scratch-www
Commits
1afbe4ad
Commit
1afbe4ad
authored
Jun 07, 2021
by
picklesrus
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
clean up
parent
993dd36a
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
5 deletions
+8
-5
src/views/preview/presentation.jsx
src/views/preview/presentation.jsx
+6
-3
src/views/preview/project-view.jsx
src/views/preview/project-view.jsx
+2
-2
No files found.
src/views/preview/presentation.jsx
View file @
1afbe4ad
...
...
@@ -602,8 +602,9 @@ const PreviewPresentation = ({
author=
{
comment
.
author
}
canDelete=
{
canDeleteComments
}
canDeleteWithoutConfirm=
{
isAdmin
}
canReply=
{
isLoggedIn
&&
projectInfo
.
comments_allowed
&&
isShared
}
canReply=
{
isLoggedIn
&&
projectInfo
.
comments_allowed
&&
isShared
}
canReport=
{
isLoggedIn
}
canRestore=
{
canRestoreComments
}
content=
{
comment
.
content
}
...
...
@@ -615,7 +616,9 @@ const PreviewPresentation = ({
moreRepliesToLoad=
{
comment
.
moreRepliesToLoad
}
parentId=
{
comment
.
parent_id
}
postURI=
{
`/proxy/comments/project/${projectId}`
}
replies=
{
replies
&&
replies
[
comment
.
id
]
?
replies
[
comment
.
id
]
:
[]
}
replies=
{
replies
&&
replies
[
comment
.
id
]
?
replies
[
comment
.
id
]
:
[]
}
visibility=
{
comment
.
visibility
}
onAddComment=
{
onAddComment
}
onDelete=
{
onDeleteComment
}
...
...
src/views/preview/project-view.jsx
View file @
1afbe4ad
...
...
@@ -903,6 +903,7 @@ Preview.propTypes = {
isAdmin
:
PropTypes
.
bool
,
isEditable
:
PropTypes
.
bool
,
isLoggedIn
:
PropTypes
.
bool
,
isProjectCommentsGloballyEnabled
:
PropTypes
.
bool
,
isNewScratcher
:
PropTypes
.
bool
,
isScratcher
:
PropTypes
.
bool
,
isShared
:
PropTypes
.
bool
,
...
...
@@ -983,8 +984,7 @@ const mapStateToProps = state => {
const
isEditable
=
isLoggedIn
&&
(
authorUsername
===
state
.
session
.
session
.
user
.
username
||
state
.
permissions
.
admin
===
true
);
const
haveSession
=
state
.
session
.
session
.
flags
;
const
areCommentsOn
=
haveSession
&&
selectProjectCommentsGloballyEnabled
(
state
);
const
areCommentsOn
=
state
.
session
.
session
.
flags
&&
selectProjectCommentsGloballyEnabled
(
state
);
// if we don't have projectInfo, assume it's shared until we know otherwise
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment