Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_Ysm

app/controllers/exercises_controller.rb

@@ -1291,7 +1291,8 @@ class ExercisesController < ApplicationController
       normal_status(0,"正在下载中")
     else
       set_export_cookies
-      render pdf: 'exercise_export/blank_exercise', filename: filename_, stylesheets: stylesheets
+      content[:disposition] = "inline"
+      render pdf: 'exercise_export/blank_exercise', filename: filename_, stylesheets: stylesheets, disposition: 'inline'
     end
   end
 

app/models/searchable/course.rb

@@ -21,8 +21,8 @@ module Searchable::Course
   def to_searchable_json
     {
       id: id,
-      author_name: teacher.real_name,
-      author_school_name: teacher.school_name,
+      author_name: teacher&.real_name,
+      author_school_name: teacher&.school_name,
       visits_count: visits,
       members_count: members_count,
       is_public: is_public == 1

app/views/users/get_navigation_info.json.jbuilder

@@ -17,7 +17,7 @@ json.top do
   json.crowdsourcing_url "/crowdsourcing"
 
   # 客户管理
-  json.customer_management_url "#{@old_domain}/cooperates/#{current_user.partner.try(:id)}/partner_list" if current_user.partner
+  json.customer_management_url current_user.partner ? "#{@old_domain}/cooperates/#{current_user.partner.try(:id)}/partner_list" : nil
 
   json.career_url do
     json.array! @career.to_a do |c|