0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo.git synced 2024-12-24 08:06:49 -05:00
forgejo/templates/repo
Richard Mahn 98f7013756
Prevent NPE in CSV diff rendering when column removed (#17018)
Fixes #16837 if a column is deleted.

We were clobbering the columns that were added by looping through the aline (base) and then when bline (head) was looped through, it clobbered what was in the "cells" array that is show in the diff, and then left a nil cell because nothing was shifted.

This fix properly shifts the cells, and properly puts the b cell either at its location or after, according to what the aline placed in the cells.

This includes test, adding a new test function since adding/removing cells works best with three columns, not two, which results in 4 columns of the resulting cells because it has a deleted column and an added column. If you try this locally, you can try those cases and others, such as adding a column.

There was no need to do anything special for the rows when `aline == 0 || bline == 0` so that was removed. This allows the same code to be used for removed or added lines, with the bcell text always being the RightCell, acell text being the LeftCell.

I still added the patch zeripath gave at https://github.com/go-gitea/gitea/issues/16837#issuecomment-913007382 so that just in case for some reason a cell is nil (which shouldn't happen now) it doesn't throw a 500 error, so the user can at least view the raw diff.

Also fixes in the [view.go](https://github.com/go-gitea/gitea/pull/17018/files#diff-43a7f4747c7ba8bff888c9be11affaafd595fd55d27f3333840eb19df9fad393L521) file how if a CSV file is empty (either created empty or if you edit it and remove all contents) it throws a huge 500 error when you then save it (when you view the file). Since we allow creating, saving and pushing empty files, we shouldn't throw an error on an empty CSV file, but just show its empty contents. This doesn't happen if it is a Markdown file or other type of file that is empty.
EDIT: Now handled in the markup/csv renderer code
2021-10-20 20:10:03 +01:00
..
branch Split index.js to separate files (#17315) 2021-10-17 01:28:04 +08:00
diff Prevent NPE in CSV diff rendering when column removed (#17018) 2021-10-20 20:10:03 +01:00
editor Add attachments for PR reviews (#16075) 2021-06-14 21:12:33 -04:00
graph Use pulls in commit graph unless pulls are disabled (#15774) 2021-05-07 20:10:30 +02:00
issue "Copy branch name" button in pull request (#17323) 2021-10-19 13:32:11 -04:00
migrate Disable form autofill (#17291) 2021-10-19 01:08:41 +03:00
projects Kanban colored boards (#16647) 2021-09-29 22:53:12 +02:00
pulls Enforce tab indentation in templates (#15289) 2021-04-10 23:46:37 -04:00
release Prevent 500 on draft releases without tag (#16634) 2021-08-05 21:13:16 -04:00
settings Disable form autofill (#17291) 2021-10-19 01:08:41 +03:00
wiki Add edit button to wiki sidebar and footer (#16719) 2021-08-18 14:14:08 -04:00
activity.tmpl Frontend refactor: move Vue related code from index.js to components dir, and remove unused codes. (#17301) 2021-10-15 10:35:26 +08:00
blame.tmpl Link to previous blames in file blame page (#16259) 2021-06-28 01:13:20 +02:00
branch_dropdown.tmpl Fix extra curly brace breaking release compare (#15988) 2021-05-26 21:07:39 -04:00
clone_buttons.tmpl "Copy branch name" button in pull request (#17323) 2021-10-19 13:32:11 -04:00
commit_page.tmpl Enforce tab indentation in templates (#15289) 2021-04-10 23:46:37 -04:00
commit_status.tmpl
commit_statuses.tmpl
commits.tmpl Add compare tag dropdown to releases page (#15695) 2021-05-03 13:27:48 -04:00
commits_list.tmpl Replace list.List with slices (#16311) 2021-08-09 14:08:51 -04:00
commits_list_small.tmpl Replace list.List with slices (#16311) 2021-08-09 14:08:51 -04:00
commits_table.tmpl Show correct text when comparing commits on empty pull request (#16569) 2021-07-29 03:32:48 +01:00
create.tmpl fixed create repo page layout (#17012) 2021-09-12 20:24:57 +02:00
empty.tmpl Fix default push instructions on empty repos (#16302) 2021-06-30 20:40:51 +02:00
forks.tmpl
graph.tmpl Kanban colored boards (#16647) 2021-09-29 22:53:12 +02:00
header.tmpl Add push to remote mirror repository (#15157) 2021-06-14 19:20:43 +02:00
home.tmpl Add bundle download for repository (#14538) 2021-08-24 11:47:09 -05:00
icon.tmpl
search.tmpl Issue sidebar and misc css fixes (#15524) 2021-05-16 22:18:18 +02:00
shabox_badge.tmpl
sub_menu.tmpl
upload.tmpl Add attachments for PR reviews (#16075) 2021-06-14 21:12:33 -04:00
user_cards.tmpl
view_file.tmpl Frontend refactor: move Vue related code from index.js to components dir, and remove unused codes. (#17301) 2021-10-15 10:35:26 +08:00
view_list.tmpl Defer Last Commit Info (#16467) 2021-10-08 15:08:22 +02:00
watchers.tmpl