Commit 0552c0b6 authored by Kamil Trzcinski's avatar Kamil Trzcinski Committed by James Edwards-Jones

Fix views

parent e5e2e7b7
...@@ -71,8 +71,6 @@ class PagesDomain < ActiveRecord::Base ...@@ -71,8 +71,6 @@ class PagesDomain < ActiveRecord::Base
@fingeprint ||= OpenSSL::Digest::SHA256.new(x509.to_der).to_s @fingeprint ||= OpenSSL::Digest::SHA256.new(x509.to_der).to_s
end end
private
def x509 def x509
return unless certificate return unless certificate
@x509 ||= OpenSSL::X509::Certificate.new(certificate) @x509 ||= OpenSSL::X509::Certificate.new(certificate)
...@@ -87,6 +85,8 @@ class PagesDomain < ActiveRecord::Base ...@@ -87,6 +85,8 @@ class PagesDomain < ActiveRecord::Base
nil nil
end end
private
def update def update
::Projects::UpdatePagesConfigurationService.new(project).execute ::Projects::UpdatePagesConfigurationService.new(project).execute
end end
......
.panel.panel-default - if @domains.any?
.panel-heading .panel.panel-default
Domains (#{@domains.count}) .panel-heading
%ul.well-list Domains (#{@domains.count})
- @domains.each do |domain| %ul.well-list
%li - @domains.each do |domain|
.pull-right %li
= link_to 'Details', namespace_project_page_path(@project.namespace, @project, domain), class: "btn btn-sm btn-grouped" .pull-right
= link_to 'Remove', namespace_project_page_path(@project.namespace, @project, domain), data: { confirm: 'Are you sure?'}, method: :delete, class: "btn btn-remove btn-sm btn-grouped" = link_to 'Details', namespace_project_page_path(@project.namespace, @project, domain), class: "btn btn-sm btn-grouped"
.clearfix = link_to 'Remove', namespace_project_page_path(@project.namespace, @project, domain), data: { confirm: 'Are you sure?'}, method: :delete, class: "btn btn-remove btn-sm btn-grouped"
%span= link_to domain.domain, domain.url .clearfix
%p %span= link_to domain.domain, domain.url
- if domain.subject %p
%span.label.label-gray Certificate: #{domain.subject} - if domain.subject
- if domain.expired? %span.label.label-gray Certificate: #{domain.subject}
%span.label.label-danger Expired - if domain.expired?
%span.label.label-danger Expired
- page_title "#{@domain.domain}", "Pages Domain" - page_title "#{@domain.domain}", "Pages Domain"
%h3.page-title %h3.page-title
#{@domain.domain} Pages Domain
.table-holder .table-holder
%table.table %table.table
...@@ -14,9 +14,9 @@ ...@@ -14,9 +14,9 @@
%td %td
Certificate Certificate
%td %td
- if @domain.certificate - if @domain.x509
%pre %pre
= @domain.certificate.to_text = @domain.x509.to_text
- else - else
.light .light
missing missing
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment