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

feat(api): restore deleted copyrights #2486

Merged
merged 1 commit into from
Jul 10, 2023
Merged

feat(api): restore deleted copyrights #2486

merged 1 commit into from
Jul 10, 2023

Conversation

soham4abc
Copy link
Contributor

@soham4abc soham4abc commented Jun 21, 2023 •
edited

Description

Restores deleted copyright statements for a file

How to test

send a patch request to the endpoint file/upload/{uploadId}/item/{itemid}/copyright{copyrightHash}

Screenshots

Screenshot from 2023-06-21 11-58-18

closes #2468

@soham4abc soham4abc mentioned this pull request Jun 22, 2023
Closed
@GMishx GMishx added needs code review needs test GSOC-23 Label to tag pull request which are part of the GSOC 2023 labels Jun 22, 2023
@soham4abc soham4abc force-pushed the api/undoDeleteCopyright branch 3 times, most recently from f92e8ef to 9166e6b Compare June 23, 2023 05:36
@soham4abc soham4abc mentioned this pull request Jun 24, 2023
Open
@github-actions github-actions bot added has merge conflicts PR to be rebased labels Jul 5, 2023
@github-actions
Copy link

github-actions bot commented Jul 5, 2023

This pull request has conflicts, please rebase with master to resolve those before we can evaluate the pull request.

1 similar comment
@github-actions
Copy link

github-actions bot commented Jul 5, 2023

This pull request has conflicts, please rebase with master to resolve those before we can evaluate the pull request.

GMishx
GMishx requested changes Jul 5, 2023
View reviewed changes
src/www/ui/api/Controllers/CopyrightController.php Outdated Show resolved Hide resolved
src/www/ui/api/Controllers/CopyrightController.php Outdated Show resolved Hide resolved
src/www/ui/api/Controllers/CopyrightController.php Outdated Show resolved Hide resolved
src/www/ui/api/Controllers/CopyrightController.php Outdated Show resolved Hide resolved
src/www/ui/api/Controllers/CopyrightController.php Outdated Show resolved Hide resolved
src/www/ui/api/documentation/openapi.yaml Outdated Show resolved Hide resolved
src/www/ui/api/documentation/openapi.yaml Outdated Show resolved Hide resolved
src/www/ui/api/documentation/openapi.yaml Outdated Show resolved Hide resolved
@soham4abc soham4abc force-pushed the api/undoDeleteCopyright branch 2 times, most recently from 8f40663 to 86b5d8c Compare July 5, 2023 11:57
@github-actions github-actions bot removed the has merge conflicts PR to be rebased label Jul 5, 2023
@soham4abc soham4abc force-pushed the api/undoDeleteCopyright branch 4 times, most recently from c405e23 to 621168d Compare July 5, 2023 12:31
@soham4abc soham4abc requested a review from GMishx July 5, 2023 12:31
GMishx
GMishx requested changes Jul 5, 2023
View reviewed changes
src/www/ui/api/documentation/openapi.yaml Outdated
@@ -1960,7 +1983,7 @@ paths:
content:
application/json:
schema:
$ref: '#/components/schemas/SetCopyrightInfo'
$ref: '#/components/schemas/SetCopyrightInfo'
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
$ref: '#/components/schemas/SetCopyrightInfo'
$ref: '#/components/schemas/SetCopyrightInfo'

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

resolved

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Uh, seems like you removed one space instead of adding (as suggested).

@soham4abc soham4abc force-pushed the api/undoDeleteCopyright branch 2 times, most recently from b62c0f8 to 272a215 Compare July 5, 2023 15:39
@soham4abc soham4abc requested a review from GMishx July 5, 2023 15:39
@soham4abc
Copy link
Contributor Author

Re-based and updated lint change.

Please do have a look @GMishx

@github-actions github-actions bot added the has merge conflicts PR to be rebased label Jul 7, 2023
@github-actions
Copy link

github-actions bot commented Jul 7, 2023

This pull request has conflicts, please rebase with master to resolve those before we can evaluate the pull request.

GMishx
GMishx requested changes Jul 10, 2023
View reviewed changes
src/www/ui/api/documentation/openapi.yaml Outdated Show resolved Hide resolved
src/www/ui/api/documentation/openapi.yaml Outdated
@@ -1960,7 +1983,7 @@ paths:
content:
application/json:
schema:
$ref: '#/components/schemas/SetCopyrightInfo'
$ref: '#/components/schemas/SetCopyrightInfo'
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Uh, seems like you removed one space instead of adding (as suggested).

@GMishx
Copy link
Member

GMishx commented Jul 10, 2023

@soham4abc please rebase the branch for merging.

@github-actions github-actions bot removed the has merge conflicts PR to be rebased label Jul 10, 2023
@soham4abc
Copy link
Contributor Author

I have re-based the changes!!

Please do have a look @GMishx

GMishx
GMishx approved these changes Jul 10, 2023
View reviewed changes
Copy link
Member

@GMishx GMishx left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Changes looks good.

GMishx
GMishx approved these changes Jul 10, 2023
View reviewed changes
Copy link
Member

@GMishx GMishx left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tested, working as expected.

@GMishx GMishx added ready and removed needs test labels Jul 10, 2023
@GMishx GMishx merged commit 2c8522e into fossology:master Jul 10, 2023
14 checks passed
@GMishx GMishx mentioned this pull request Jul 28, 2023
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@GMishx GMishx GMishx approved these changes

Assignees
No one assigned
Labels
GSOC-23 Label to tag pull request which are part of the GSOC 2023 ready
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Copyright File-view
2 participants
@soham4abc @GMishx