-
Notifications
You must be signed in to change notification settings - Fork 297
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
refs #37923 - Bug fixes & improvements for the Default HTTP proxy
Follow up on PR#11183 with: * Unified naming of the parameter ('content_default_http_proxy') * On edit form showing information if the capsule is default * Fixed API + extended show with 'content_default_http_proxy'
- Loading branch information
1 parent
b551d41
commit 55c376d
Showing
6 changed files
with
25 additions
and
17 deletions.
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
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 @@ | ||
node(:content_default_http_proxy) { |sp| sp.content_default_http_proxy? } |
30 changes: 16 additions & 14 deletions
30
app/views/overrides/http_proxies/_update_setting_input.html.erb
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,16 +1,18 @@ | ||
<% if @http_proxy.new_record? %> | ||
<div class="clearfix"> | ||
<div class="form-group "> | ||
<label class="col-md-2 control-label" for="http_proxy_default_content"> | ||
Default content HTTP proxy | ||
</label> | ||
<div class="col-md-4"> | ||
<%= check_box_tag 'http_proxy[default_content]', | ||
'1', | ||
params.dig('http_proxy', 'default_content') == '1', | ||
id: 'http_proxy_default_content' %> | ||
Set this proxy as the default for content, updating the 'Default HTTP Proxy' setting. | ||
</div> | ||
<div class="clearfix"> | ||
<div class="form-group "> | ||
<label class="col-md-2 control-label" for="http_proxy_content_default_http_proxy"> | ||
Default content HTTP proxy | ||
</label> | ||
<div class="col-md-4"> | ||
<% if @http_proxy.new_record? %> | ||
<%= check_box_tag 'http_proxy[content_default_http_proxy]', | ||
'1', | ||
params.dig('http_proxy', 'content_default_http_proxy') == '1', | ||
id: 'content_default_http_proxy' %> | ||
Set this proxy as the default for content, updating the 'Default HTTP Proxy' setting. | ||
<% else %> | ||
<%= @http_proxy.content_default_http_proxy? ? _('Yes') : _('No') %> | ||
<% end %> | ||
</div> | ||
</div> | ||
<% end %> | ||
</div> |
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