-
Notifications
You must be signed in to change notification settings - Fork 189
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.
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
Add AttachmentsCopier concern #1271
Merged
Merged
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,20 @@ | ||
module AttachmentsCopier | ||
def copy_attachments(record) | ||
record.content.scan(Attachment::SCREENSHOT_REGEX).each do |screenshot_path| | ||
full_screenshot_path, _, _, _, project_id, node_id, filename, _ = screenshot_path | ||
|
||
attachment = Attachment.find_by(filename: CGI::unescape(filename), node_id: record.node_id_was) | ||
|
||
if attachment | ||
new_attachment = attachment.copy_to(record.node) | ||
new_filename = new_attachment.url_encoded_filename | ||
new_path = full_screenshot_path.gsub( | ||
/nodes\/[0-9]+\/attachments\/.+/, | ||
"nodes/#{new_attachment.node_id}/attachments/#{new_filename}" | ||
) | ||
|
||
record.content = record.content.gsub(full_screenshot_path, new_path) | ||
end | ||
end | ||
end | ||
end |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,7 @@ | ||
# This controller exposes the REST operations required to manage the Note | ||
# resource. | ||
class NotesController < NestedNodeResourceController | ||
include AttachmentsCopier | ||
include ConflictResolver | ||
include LiquidEnabledResource | ||
include Mentioned | ||
|
@@ -44,7 +45,11 @@ def edit | |
# Update the attributes of a Note | ||
def update | ||
updated_at_before_save = @note.updated_at.to_i | ||
if @note.update(note_params) | ||
|
||
@note.assign_attributes(note_params) | ||
copy_attachments(@note) if @note.node_changed? | ||
|
||
if @note.save | ||
Comment on lines
+49
to
+52
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. good consistency move. |
||
track_updated(@note) | ||
check_for_edit_conflicts(@note, updated_at_before_save) | ||
# if the note has just been moved to another node, we must reload | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm concerned about this text manipulation. Then I thought about the "copy link" feature of the attachments sidebar, perhaps we can use the same approach?
https://github.com/dradis/dradis-ce/blob/main/app/views/attachments/_attachment_box.html.erb#L59
I could even consider moving this into a helper to avoid duplication, but we don't currently have an attachment_helper.rb it could fit in.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It's tricky to DRY this considering that the contexts are different. The attachment box is in the view that has access to the route helpers while this code isn't. There's also some possible rabbit hole with the
default_url_options = /pro
once we move the link helpers out of the view. Happy to explore this more if we need this code on many more places but currently, this seems like the simplest approach.