diff --git a/app/controllers/admin/site_panel_controller.rb b/app/controllers/admin/site_panel_controller.rb index dea3695..4fef6b8 100644 --- a/app/controllers/admin/site_panel_controller.rb +++ b/app/controllers/admin/site_panel_controller.rb @@ -284,7 +284,7 @@ class Admin::SitePanelController < OrbitAdminController def check_server_ability store_token = current_site.store_token network = ONetwork.new(OrbitStore::URL,"post") - site_num = SiteConstruct.where(hidden: false,:status.ne => 'closed').count + site_num = SiteConstruct.where(:hidden.ne=> true,:status => 'finish').count response = network.request("/xhr/check_server_ability", {"store_token" => store_token, "site_num" => site_num, diff --git a/app/views/admin/site_panel/_server_manager_index.html.erb b/app/views/admin/site_panel/_server_manager_index.html.erb index b012601..da0720d 100644 --- a/app/views/admin/site_panel/_server_manager_index.html.erb +++ b/app/views/admin/site_panel/_server_manager_index.html.erb @@ -12,11 +12,11 @@

- Active: <%=SiteConstruct.where(:server_type => site_server.server_name,:status=>"finish").count %>
- Closed: <%=SiteConstruct.where(:server_type => site_server.server_name,:status=>"closed").count %>
- Not yet installed: <%=SiteConstruct.where(:server_type => site_server.server_name,:status=>"").count %>
- Production: <%=SiteConstruct.where(:server_type => site_server.server_name,:rails_env=>"production",:status=>"finish").count %>
- Development: <%=SiteConstruct.where(:server_type => site_server.server_name,:rails_env.in=>["development",nil],:status=>"finish").count %>
+ Active: <%=SiteConstruct.where(:hidden.ne=> true,:server_type => site_server.server_name,:status=>"finish").count %>
+ Closed: <%=SiteConstruct.where(::hidden.ne=> true,server_type => site_server.server_name,:status=>"closed").count %>
+ Not yet installed: <%=SiteConstruct.where(:hidden.ne=> true,:server_type => site_server.server_name,:status=>"").count %>
+ Production: <%=SiteConstruct.where(:hidden.ne=> true,:server_type => site_server.server_name,:rails_env=>"production",:status=>"finish").count %>
+ Development: <%=SiteConstruct.where(:hidden.ne=> true,:server_type => site_server.server_name,:rails_env.in=>["development",nil],:status=>"finish").count %>

<%=site_server.server_name%> diff --git a/app/views/admin/site_panel/index.html.erb b/app/views/admin/site_panel/index.html.erb index 662ff76..42ba2b2 100644 --- a/app/views/admin/site_panel/index.html.erb +++ b/app/views/admin/site_panel/index.html.erb @@ -5,4 +5,6 @@ <%= form_for @site_construct, :url => {:action=>"create"}, :html => {:class => 'form-horizontal main-forms'} do |f| %> <%= render :partial => 'form', :locals => {:f => f} %> <% end %> +<% else %> +<%= t('client_management.over_the_limit') %> <% end %> \ No newline at end of file