diff --git a/app/controllers/shixuns_controller.rb b/app/controllers/shixuns_controller.rb
index 26effd12e..fca143623 100644
--- a/app/controllers/shixuns_controller.rb
+++ b/app/controllers/shixuns_controller.rb
@@ -408,18 +408,16 @@ class ShixunsController < ApplicationController
@shixun.update_attributes(shixun_params)
@shixun.shixun_info.update_attributes(shixun_info_params)
@shixun.shixun_schools.delete_all
- if params[:scope_partment].present? && params[:user_scope].to_i == 1
+ logger.info("##########scope_partment:###{params[:scope_partment]}")
+ # scope_partment: 高校的名称
+ if params[:scope_partment].present?
arr = []
ids = School.where(:name => params[:scope_partment]).pluck(:id).uniq
ids.each do |id|
arr << { :school_id => id, :shixun_id => @shixun.id }
end
ShixunSchool.create!(arr)
- use_scope = 1
- else
- use_scope = 0
end
- @shixun.update_attributes!(:use_scope => use_scope)
# 超级管理员和运营人员才能保存 中间层服务器pod信息的配置
if current_user.admin? || current_user.business?
@shixun.shixun_service_configs.destroy_all
diff --git a/app/controllers/users/private_message_details_controller.rb b/app/controllers/users/private_message_details_controller.rb
index 486d23d7f..8e7b31212 100644
--- a/app/controllers/users/private_message_details_controller.rb
+++ b/app/controllers/users/private_message_details_controller.rb
@@ -3,11 +3,13 @@ class Users::PrivateMessageDetailsController < Users::BaseController
after_action :update_message_status, only: [:show]
+ helper_method :target_user
+
def show
messages = observed_user.private_messages.without_deleted.where(target: target_user)
@count = messages.count
- @messages = messages.order(send_time: :asc).includes(sender: :user_extension)
+ @messages = paginate messages.order(send_time: :desc).includes(sender: :user_extension)
end
private
diff --git a/app/services/search_shixun_service.rb b/app/services/search_shixun_service.rb
deleted file mode 100644
index 2e77e82d8..000000000
--- a/app/services/search_shixun_service.rb
+++ /dev/null
@@ -1,96 +0,0 @@
-class SearchShixunService < ApplicationService
- include ElasticsearchAble
-
- attr_reader :user, :params
-
- def initialize(user, params)
- @user = user
- @params = params
- end
-
- def call
- Shixun.search(keyword,
- fields: search_fields,
- where: where_clauses,
- order: order_clauses,
- includes: includes_clauses,
- page: page,
- per_page: per_page)
- end
-
- private
-
- def tag_filter_shixun_ids
- return [] if params[:tag_level].to_i == 0 || params[:tag_id].blank?
-
- case params[:tag_level].to_i
- when 1 then
- Repertoire.find(params[:tag_id]).tag_repertoires.joins(:shixun_tag_repertoires)
- .pluck('shixun_tag_repertoires.shixun_id')
- when 2 then
- SubRepertoire.find(params[:tag_id]).tag_repertoires.joins(:shixun_tag_repertoires)
- .pluck('shixun_tag_repertoires.shixun_id')
- when 3 then
- TagRepertoire.find(params[:tag_id]).shixun_tag_repertoires.pluck(:shixun_id)
- else
- []
- end
- end
-
- def user_filter_shixun_ids
- return [] if params[:order_by] != 'mine'
-
- user.shixun_members.pluck(:shixun_id) + user.myshixuns.pluck(:shixun_id)
- end
-
- def keyword
- params[:keyword].to_s.strip.presence || '*'
- end
-
- def search_fields
- %w(name^10 author_name challenge_names description challenge_tag_names)
- end
-
- def where_clauses
- hash = {}
-
- ids = user_filter_shixun_ids + tag_filter_shixun_ids
- hash[:id] = ids if ids.present?
-
- if params[:order_by] == 'mine'
- hash[:status] = { not: -1 }
- else
- hash.merge!(hidden: false, status: 2)
- end
-
- unless params[:status].to_i.zero?
- params[:status] = [0, 1] if params[:status].to_i == 1
- hash[:status] = params[:status]
- end
-
- hash[:trainee] = params[:diff].to_i unless params[:diff].to_i.zero?
-
- hash
- end
-
- def includes_clauses
- []
- end
-
- def order_clauses
- hash = { _score: :desc }
- publish_order = { type: 'number', order: :desc, script: 'doc["status"].value=="2" ? 1 : 0' }
-
- sort = params[:sort].to_s.strip == 'asc' ? 'asc' : 'desc'
- clauses =
- case params[:order_by].presence
- when 'new' then { _script: publish_order, created_at: sort }
- when 'hot' then { _script: publish_order, myshixuns_count: sort }
- when 'mine' then { created_at: sort }
- else { _script: publish_order, publish_time: sort }
- end
- hash.merge!(clauses)
-
- hash
- end
-end
\ No newline at end of file
diff --git a/app/views/users/private_message_details/show.json.jbuilder b/app/views/users/private_message_details/show.json.jbuilder
index 065767fb4..bd90fecab 100644
--- a/app/views/users/private_message_details/show.json.jbuilder
+++ b/app/views/users/private_message_details/show.json.jbuilder
@@ -1,4 +1,7 @@
json.count @count
+json.target do
+ json.partial! 'users/user_simple', user: target_user
+end
json.messages do
json.array! @messages.each do |message|
json.extract! message, :id, :user_id, :receiver_id, :sender_id, :content
diff --git a/public/react/public/css/edu-all.css b/public/react/public/css/edu-all.css
index 6bc9d30fc..9f129eabc 100644
--- a/public/react/public/css/edu-all.css
+++ b/public/react/public/css/edu-all.css
@@ -3416,3 +3416,7 @@ a.singlepublishtwo{
.shaiContent li.shaiItem:hover i.iconfont{
color: #4CACFF!important
}
+
+.detail_for_paragraph p{
+ white-space: pre-wrap;
+}
\ No newline at end of file
diff --git a/public/react/src/modules/tpm/TPMIndexHOC.js b/public/react/src/modules/tpm/TPMIndexHOC.js
index b122a904a..564e147fc 100644
--- a/public/react/src/modules/tpm/TPMIndexHOC.js
+++ b/public/react/src/modules/tpm/TPMIndexHOC.js
@@ -32,14 +32,14 @@ if (!window['indexHOCLoaded']) {
// $('head').append($('')
// .attr('href', `${_url_origin}/stylesheets/educoder/antd.min.css?1525440977`));
$('head').append($('')
- .attr('href', `${_url_origin}/stylesheets/css/edu-common.css?6`));
+ .attr('href', `${_url_origin}/stylesheets/css/edu-common.css?7`));
$('head').append($('')
- .attr('href', `${_url_origin}/stylesheets/educoder/edu-main.css?6`));
+ .attr('href', `${_url_origin}/stylesheets/educoder/edu-main.css?7`));
// index.html有加载
$('head').append($('')
- .attr('href', `${_url_origin}/stylesheets/educoder/edu-all.css?6`));
+ .attr('href', `${_url_origin}/stylesheets/educoder/edu-all.css?7`));
// $('head').append($('')
diff --git a/public/stylesheets/educoder/edu-all.css b/public/stylesheets/educoder/edu-all.css
index 33649a220..fa879a9e5 100644
--- a/public/stylesheets/educoder/edu-all.css
+++ b/public/stylesheets/educoder/edu-all.css
@@ -3712,3 +3712,7 @@ a.singlepublishtwo{
.shaiContent li.shaiItem:hover i.iconfont{
color: #4CACFF!important
}
+
+.detail_for_paragraph p{
+ white-space: pre-wrap;
+}
\ No newline at end of file