From ef6c3a443a5c551aa7de30e0d19ae9fa1e32c17f Mon Sep 17 00:00:00 2001 From: XuCheng642 <287102909@qq.com> Date: Mon, 9 Oct 2017 15:16:34 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E5=9B=9E=E5=A4=8D=E5=92=8C=E7=82=B9?= =?UTF-8?q?=E8=B5=9E=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/managements_controller.rb | 2 +- .../_shixun_authorization_list.html.erb | 1 - app/views/memos/_common_reply_box.html.erb | 6 +- app/views/messages/_common_reply_box.html.erb | 6 +- .../praise_tread/_activity_praise.html.erb | 10 +- app/views/praise_tread/_edu_praise.html.erb | 12 +- .../student_work/_common_reply_box.html.erb | 6 +- .../_programing_work_show.html.erb | 348 +++++++++--------- .../student_work/_shixun_work_show.html.erb | 5 +- public/javascripts/edu/application.js | 2 +- 10 files changed, 210 insertions(+), 188 deletions(-) diff --git a/app/controllers/managements_controller.rb b/app/controllers/managements_controller.rb index ca8c7f1a3..3470c1e9f 100644 --- a/app/controllers/managements_controller.rb +++ b/app/controllers/managements_controller.rb @@ -1532,7 +1532,7 @@ end @sub_type = 5 @type = trial_authorization_status params[:type] # sql = select * from apply_actions where dealer_id is null - @authorizations = ApplyAction.where(:container_type => "ApplyShixun", :status => @type,:dealer_id =>'').order("created_at desc") + @authorizations = ApplyAction.where(:container_type => "ApplyShixun", :status => @type, :dealer_id =>'').order("created_at desc") search = params[:search] unless search.blank? @authorizations = @authorizations.where(:container_id => Shixun.where(:id => @authorizations.map(&:container_id)).where("name like '%#{search}%'").map(&:id)).order("created_at desc") diff --git a/app/views/managements/_shixun_authorization_list.html.erb b/app/views/managements/_shixun_authorization_list.html.erb index 756e8b4ae..059994224 100644 --- a/app/views/managements/_shixun_authorization_list.html.erb +++ b/app/views/managements/_shixun_authorization_list.html.erb @@ -32,7 +32,6 @@ <% end %> -