From 3f4821d0db11b227c43a107163611a2a6f521fb2 Mon Sep 17 00:00:00 2001 From: bohung Date: Tue, 26 Jul 2022 15:23:12 +0800 Subject: [PATCH] Fix bug. --- .../admin/site_panel_controller.rb | 2 +- .../client_managements_controller.rb | 16 +++++----- .../see_detail_for_created_site.html.erb | 30 +++++++++---------- .../client_managements/new_ticket.html.erb | 6 ++-- .../client_managements/reopen_ticket.html.erb | 8 ++--- app/views/client_managements/show.html.erb | 16 +++++----- .../client_managements/show_ticket.html.erb | 8 ++--- 7 files changed, 43 insertions(+), 43 deletions(-) diff --git a/app/controllers/admin/site_panel_controller.rb b/app/controllers/admin/site_panel_controller.rb index 330a6d9..92430c2 100644 --- a/app/controllers/admin/site_panel_controller.rb +++ b/app/controllers/admin/site_panel_controller.rb @@ -273,7 +273,7 @@ class Admin::SitePanelController < OrbitAdminController system("bundle exec rake exec_commands:exec_commands[#{params[:id]},,open_site,,#{params[:env]}]") end elsif params[:type] == 'detail' - @site = SiteConstruct.find(params[:id]) + @site_construct = SiteConstruct.find(params[:id]) render 'see_detail_for_created_site' and return elsif params[:type] == 'change_server_name' site_construct = SiteConstruct.find(params[:id]) diff --git a/app/controllers/client_managements_controller.rb b/app/controllers/client_managements_controller.rb index 6153daa..3a1bf21 100644 --- a/app/controllers/client_managements_controller.rb +++ b/app/controllers/client_managements_controller.rb @@ -83,14 +83,14 @@ class ClientManagementsController < CPanelController def site_tickets if params[:category].present? && params[:keyword].present? regex = ::Regexp.new(".*" + params[:keyword] + ".*", "i") - @tickets = @site.tickets.where(:category_id => params[:category], :subject => regex).order_by([:status, :desc],[:created_at, :desc]).page(params[:page]).per(10) + @tickets = @site_construct.tickets.where(:category_id => params[:category], :subject => regex).order_by([:status, :desc],[:created_at, :desc]).page(params[:page]).per(10) elsif params[:category].present? - @tickets = @site.tickets.where(:category_id => params[:category]).order_by([:status, :desc],[:created_at, :desc]).page(params[:page]).per(10) + @tickets = @site_construct.tickets.where(:category_id => params[:category]).order_by([:status, :desc],[:created_at, :desc]).page(params[:page]).per(10) elsif params[:keyword].present? regex = ::Regexp.new(".*" + params[:keyword] + ".*", "i") - @tickets = @site.tickets.where(:subject => regex).order_by([:status, :desc],[:created_at, :desc]).page(params[:page]).per(10) + @tickets = @site_construct.tickets.where(:subject => regex).order_by([:status, :desc],[:created_at, :desc]).page(params[:page]).per(10) else - @tickets = @site.tickets.order_by([:status, :desc],[:created_at, :desc]).page(params[:page]).per(10) + @tickets = @site_construct.tickets.order_by([:status, :desc],[:created_at, :desc]).page(params[:page]).per(10) end render :layout => false end @@ -103,7 +103,7 @@ class ClientManagementsController < CPanelController def create_ticket ticket = Ticket.new(ticket_params) ticket.save - redirect_to cpanel_site_show_path(@site.uid) + redirect_to cpanel_site_show_path(@site_construct.uid) end def close_ticket @@ -275,8 +275,8 @@ class ClientManagementsController < CPanelController private def is_site_authorized_to_user? - @site = RegisteredSite.where(:uid => params[:site_uid]).first - if !current_cpanel_user.registered_site_ids.include?(@site.id) + @site_construct = RegisteredSite.where(:uid => params[:site_uid]).first + if !current_cpanel_user.registered_site_ids.include?(@site_construct.id) redirect_to sites_path end end @@ -290,7 +290,7 @@ class ClientManagementsController < CPanelController redirect_to sites_path end else - @site = @ticket.registered_site + @site_construct = @ticket.registered_site end end diff --git a/app/views/admin/site_panel/see_detail_for_created_site.html.erb b/app/views/admin/site_panel/see_detail_for_created_site.html.erb index 6b0edbe..65b81ab 100644 --- a/app/views/admin/site_panel/see_detail_for_created_site.html.erb +++ b/app/views/admin/site_panel/see_detail_for_created_site.html.erb @@ -4,22 +4,22 @@
">
-
<%=@site.server_type%>
+
<%=@site_construct.server_type%>
<% %> - <%= select_tag "site_construct[enable_redirect_default_domain]", options_for_select((0..2).to_a.collect{ |i| [I18n.t("client_management.option.#{i}") + (i == 0 ? ": #{@site.default_enable_redirect_default_domain ? I18n.t("client_management.option.2") : I18n.t("client_management.option.1")}" : ""), i.to_s] }, @site.enable_redirect_default_domain) ,:id=>"enable_redirect_default_domain" %> + <%= select_tag "site_construct[enable_redirect_default_domain]", options_for_select((0..2).to_a.collect{ |i| [I18n.t("client_management.option.#{i}") + (i == 0 ? ": #{@site_construct.default_enable_redirect_default_domain ? I18n.t("client_management.option.2") : I18n.t("client_management.option.1")}" : ""), i.to_s] }, @site_construct.enable_redirect_default_domain) ,:id=>"enable_redirect_default_domain" %>
<%= hidden_field_tag "site_construct[default_domain_idx]", "-1" %>
- <% @site.domain_name.split(' ').each_with_index do |domain_name,i| %> + <% @site_construct.domain_name.split(' ').each_with_index do |domain_name,i| %>
- <%= check_box_tag "site_construct[default_domain_idx]", i, (@site.default_domain_idx == i), :class=>"default_domain_idx", :title=>t("client_management.set_to_default_domain_name") %> + <%= check_box_tag "site_construct[default_domain_idx]", i, (@site_construct.default_domain_idx == i), :class=>"default_domain_idx", :title=>t("client_management.set_to_default_domain_name") %> <%= text_field_tag nil,domain_name,:class=>'domain_name',onchange: 'domain_name_change()',:oninput=>'replace_domain_input(this)' %> <% if i != 0 %>
<% end %> <%= button_tag 'add domain',:type => 'button', :id => 'add_root_domain',class: 'btn btn-info',:style => 'margin-top: 1em;' %> - <%= hidden_field_tag 'site_construct[domain_name]',@site.domain_name,id: 'site_construct_domain_name' %> + <%= hidden_field_tag 'site_construct[domain_name]',@site_construct.domain_name,id: 'site_construct_domain_name' %>
- <%= number_field_tag("site_construct[port][]",@site.get_port, :min => 1, :id => nil) %> + <%= number_field_tag("site_construct[port][]",@site_construct.get_port, :min => 1, :id => nil) %>
- <% @site.port[1..-1].to_a.each do |port| %> + <% @site_construct.port[1..-1].to_a.each do |port| %>
X <%= number_field_tag("site_construct[port][]",port, :min => 1, :id => nil) %> @@ -53,33 +53,33 @@
-
<%=@site.site_type%>
+
<%=@site_construct.site_type%>
- <% if @site.site_type == "School"%> + <% if @site_construct.site_type == "School"%>
-
<%=@site.school_name%>
+
<%=@site_construct.school_name%>
<% end %>
-
<%=@site.site_name%>
+
<%=@site_construct.site_name%>
-
<%=@site.db_name%>
+
<%=@site_construct.db_name%>
-
<%=@site.nginx_file%>
+
<%=@site_construct.nginx_file%>
-
<%=@site.full_site_path%>
+
<%=@site_construct.full_site_path%>
- <%= hidden_field_tag 'id',@site.id %> + <%= hidden_field_tag 'id',@site_construct.id %> <%= hidden_field_tag 'type','change_server_name' %> <%=t(:back)%> " class="btn btn-primary btn-danger"> diff --git a/app/views/client_managements/new_ticket.html.erb b/app/views/client_managements/new_ticket.html.erb index 1d205a4..30bc922 100644 --- a/app/views/client_managements/new_ticket.html.erb +++ b/app/views/client_managements/new_ticket.html.erb @@ -1,8 +1,8 @@ <% content_for :page_menu do %> <% end %> @@ -33,7 +33,7 @@ <%= f.hidden_field :ticket_creater_cpanel_id, :value => current_cpanel_user.email %> <%= f.hidden_field :site_type, :value => "orbit" %> <%= f.hidden_field :status, :value => "open" %> - <%= f.hidden_field :registered_site, :value => @site.id %> + <%= f.hidden_field :registered_site, :value => @site_construct.id %> <%= f.submit "Submit", :class => "btn btn-primary" %>
<% end %> diff --git a/app/views/client_managements/reopen_ticket.html.erb b/app/views/client_managements/reopen_ticket.html.erb index be6720c..c871be4 100644 --- a/app/views/client_managements/reopen_ticket.html.erb +++ b/app/views/client_managements/reopen_ticket.html.erb @@ -10,8 +10,8 @@ <% content_for :page_menu do %> <% end %> @@ -19,8 +19,8 @@
  1. Sites
    2. -
  2. <%= @site.title %>
    3. -
  3. Tickets
    4. +
  4. <%= @site_construct.title %>
    5. +
  5. Tickets
  6. <%= @ticket.uid %>
diff --git a/app/views/client_managements/show.html.erb b/app/views/client_managements/show.html.erb index 9bc826e..a9c66d5 100644 --- a/app/views/client_managements/show.html.erb +++ b/app/views/client_managements/show.html.erb @@ -1,8 +1,8 @@ <% content_for :page_menu do %> <% end %> @@ -11,13 +11,13 @@
  1. Sites
    2. -
  2. <%= @site.title %>
    3. +
  3. <%= @site_construct.title %>
  4. Tickets

- <%= @site.title %> - Total Ticket(s): <%= @site.tickets.count %> + <%= @site_construct.title %> + Total Ticket(s): <%= @site_construct.tickets.count %>

@@ -25,10 +25,10 @@ <%= select_tag "category", options_for_select(@categories), {:prompt => "Select Category", :class => "form-control cp-select"} %> - Clear + Clear
- <%= t("client_management.create_ticket") %> + <%= t("client_management.create_ticket") %>
@@ -49,7 +49,7 @@
- <%= t("client_management.create_ticket") %> + <%= t("client_management.create_ticket") %>