Skip to content
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

Jump to bottom

Inline review comment is broken #18320

Closed
wxiaoguang opened this issue Jan 18, 2022 · 2 comments · Fixed by #18321 or #18403
Closed

Inline review comment is broken #18320

wxiaoguang opened this issue Jan 18, 2022 · 2 comments · Fixed by #18321 or #18403
Labels
issue/regression Issue needs no code to be fixed, only a description on how to fix it yourself topic/ui Change the appearance of the Gitea UI type/bug
Milestone
1.16.0

Comments

@wxiaoguang
Copy link
Contributor

Demo: https://try.gitea.io/wxiaoguang/test/pulls/4/files

Click the + to do a comment:

image
@wxiaoguang wxiaoguang added type/bug topic/ui Change the appearance of the Gitea UI issue/regression Issue needs no code to be fixed, only a description on how to fix it yourself labels Jan 18, 2022
@wxiaoguang wxiaoguang added this to the 1.16.0 milestone Jan 18, 2022
@zeripath
Copy link
Contributor

This was fixed in the bidi PR but I guess some of the changes that happened to that or changes that happened as it was merged broke things.

The comment box will be in the wrong column - should be a very simple fix.

@zeripath
Copy link
Contributor

yup I think it's an unrecognised conflict

The problem is here:

gitea/web_src/js/features/repo-issue.js

Line 503 in 089b4e6

<td colspan="2" class="lines-num"></td>

This should be:

            <td colspan="3" class="lines-num"></td>

@eeyrjmr eeyrjmr mentioned this issue Jan 18, 2022
Merged
zeripath added a commit that referenced this issue Jan 18, 2022
@eeyrjmr @zeripath
Place inline diff comment dialogs in the 4th column. (#18321)
4834097 
Comment dialogs for inline comments should appear in 4th column (not 3rd column), this PR changes the column that the inline review comment is associated with.

This problem has occurred due to an unrecognised conflict between #17562 and #17315. 

Fix as zeripath suggested in #18320

Fix #18320 

Co-authored-by: zeripath <art27@cantab.net>
@mappu mappu mentioned this issue Jan 25, 2022
Closed
zeripath added a commit to zeripath/gitea that referenced this issue Jan 25, 2022
@zeripath
Place inline diff comment dialogs on split diff in 4th and 8th columns
0a19b45 
Fix go-gitea#18391
Fix go-gitea#18320

Signed-off-by: Andrew Thornton <art27@cantab.net>
@zeripath zeripath mentioned this issue Jan 25, 2022
Merged
zeripath added a commit to zeripath/gitea that referenced this issue Jan 25, 2022
@zeripath
Place inline diff comment dialogs on split diff in 4th and 8th columns
b7d627e 
(go-gitea#18403)

Backport go-gitea#18403

Fix go-gitea#18391
Fix go-gitea#18320

Signed-off-by: Andrew Thornton <art27@cantab.net>
@zeripath zeripath mentioned this issue Jan 25, 2022
Merged
zeripath added a commit that referenced this issue Jan 25, 2022
@zeripath
Place inline diff comment dialogs on split diff in 4th and 8th columns (
93250bf 
#18403)

Fix #18391
Fix #18320

Signed-off-by: Andrew Thornton <art27@cantab.net>
zeripath added a commit that referenced this issue Jan 25, 2022
@zeripath
Place inline diff comment dialogs on split diff in 4th and 8th columns (
0b331e2 
#18403)  (#18404)

Backport #18403

Fix #18391
Fix #18320

Signed-off-by: Andrew Thornton <art27@cantab.net>
Chianina pushed a commit to Chianina/gitea that referenced this issue Mar 28, 2022
@eeyrjmr @zeripath
Place inline diff comment dialogs in the 4th column. (go-gitea#18321)
ee23f9b 
Comment dialogs for inline comments should appear in 4th column (not 3rd column), this PR changes the column that the inline review comment is associated with.

This problem has occurred due to an unrecognised conflict between go-gitea#17562 and go-gitea#17315. 

Fix as zeripath suggested in go-gitea#18320

Fix go-gitea#18320 

Co-authored-by: zeripath <art27@cantab.net>
Chianina pushed a commit to Chianina/gitea that referenced this issue Mar 28, 2022
@zeripath
Place inline diff comment dialogs on split diff in 4th and 8th columns (
f0d82c4 
go-gitea#18403)

Fix go-gitea#18391
Fix go-gitea#18320

Signed-off-by: Andrew Thornton <art27@cantab.net>
@go-gitea go-gitea locked and limited conversation to collaborators Apr 28, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Assignees
No one assigned
Labels
issue/regression Issue needs no code to be fixed, only a description on how to fix it yourself topic/ui Change the appearance of the Gitea UI type/bug
Projects
None yet
Milestone
1.16.0
2 participants
@zeripath @wxiaoguang