harrybomrah
/
client_management
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix error

This commit is contained in:
BOYA,CHIU 2021-07-21 14:49:15 +08:00
parent 8adecbffa7
commit 038603dd32
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/admin/site_panel_controller.rb
View File

@ -284,7 +284,7 @@ class Admin::SitePanelController < OrbitAdminController
def check_server_ability def check_server_ability
store_token = current_site.store_token store_token = current_site.store_token
network = ONetwork.new(OrbitStore::URL,"post") 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", response = network.request("/xhr/check_server_ability",
{"store_token" => store_token, {"store_token" => store_token,
"site_num" => site_num, "site_num" => site_num,

10
app/views/admin/site_panel/_server_manager_index.html.erb
View File

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

2
app/views/admin/site_panel/index.html.erb
View File

@ -5,4 +5,6 @@
<%= form_for @site_construct, :url => {:action=>"create"}, :html => {:class => 'form-horizontal main-forms'} do |f| %> <%= form_for @site_construct, :url => {:action=>"create"}, :html => {:class => 'form-horizontal main-forms'} do |f| %>
<%= render :partial => 'form', :locals => {:f => f} %> <%= render :partial => 'form', :locals => {:f => f} %>
<% end %> <% end %>
<% else %>
<%= t('client_management.over_the_limit') %>
<% end %> <% end %>