Fixes #12884 - Allow importing subnets from smart proxy #2992
Conversation
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
| @@ -193,7 +193,7 @@ def self.import(proxy) | |||
|
|
|||
| next if exists?(attrs) | |||
| attrs.merge!(parse_dhcp_options(s['options'])) if s['options'].present? | |||
| new(attrs.update(:dhcp => proxy)) | |||
There was a problem hiding this comment.
Why not just adding dhcp', 'dns' andtftp` to attr_accessible? I think that'd be the only change required.
dLobatog
added
Waiting on contributor
and removed
Needs testing
Not yet reviewed
labels
theforeman-bot
added
Needs re-review
Needs testing
and removed
Waiting on contributor
labels
|
@dLobatog Changed this to add the missing attributes as you suggested. |
|
👍 to merge when Jenkins comes back |
|
[test] |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
No description provided.