diff --git a/app/models/site_construct.rb b/app/models/site_construct.rb index fc37624..4744e56 100644 --- a/app/models/site_construct.rb +++ b/app/models/site_construct.rb @@ -2,7 +2,7 @@ class SiteConstruct include Mongoid::Document include Mongoid::Timestamps def self.server_types - SiteServer.all.map{|s| s.server_name} + SiteServer.where(:active.ne=>false).map{|s| s.server_name} end SITE_TYPES = ["School","Gravity"] field :enable_redirect_default_domain, type: Integer, default: 0 #0 => use default, 1 => disable, 2 => enable diff --git a/app/views/admin/site_panel/_form.html.erb b/app/views/admin/site_panel/_form.html.erb index 7c45bc0..2577922 100644 --- a/app/views/admin/site_panel/_form.html.erb +++ b/app/views/admin/site_panel/_form.html.erb @@ -37,10 +37,11 @@ <%= f.hidden_field :copy_id, :value => params[:copy_id] %> <% end %> + <% server_types = SiteConstruct.server_types %>
<%= f.label :server_type ,"Server", :class => "control-label muted" %>
- <%= f.select :server_type, SiteConstruct.server_types %> + <%= f.select :server_type, server_types %>
@@ -49,7 +50,7 @@
<%= select_tag :root_domain, - options_for_select((SiteServer.first.domain_names.collect{ |u| [u, u] } rescue [])), + options_for_select((SiteServer.where(:server_name=>server_types.first).first.domain_names.collect{ |u| [u, u] } rescue [])), :class => "root_domain" %>
<%= button_tag 'add root domain',:type => 'button', :id => 'add_root_domain',class: 'btn btn-info',:style => 'margin-top: 1em;' %>