diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 9eabc95f2..625a1de74 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -2283,7 +2283,7 @@ class UsersController < ApplicationController @orgs = @user.organizations.where("name like ?", search).select{|org| OrgSubfield.where("organization_id = #{org.id} and field_type='Resource'").count > 0} end else - if params[:send_type].present? and params[:send_type] == 'news' + if params[:send_type].present? and (params[:send_type] == 'news' or params[:send_type] == 'message') @orgs = @user.organizations.select{|org| OrgSubfield.where("organization_id = #{org.id} and field_type='Post'").count > 0} else @orgs = @user.organizations.select{|org| OrgSubfield.where("organization_id = #{org.id} and field_type='Resource'").count > 0} diff --git a/app/helpers/avatar_helper.rb b/app/helpers/avatar_helper.rb index 0291d177f..5c3ffd950 100644 --- a/app/helpers/avatar_helper.rb +++ b/app/helpers/avatar_helper.rb @@ -63,7 +63,7 @@ module AvatarHelper if source.class && source.id && File.exist?(disk_filename(source.class,source.id)) avatar_image(source, false) elsif copy_course?(source.class, source.id) - avatar_image(source, true) + get_avatar(Course.find(source.is_copy)) rescue nil else File.join(relative_path,avatar_directory(source.class),'0') end diff --git a/app/views/org_document_comments/edit.html.erb b/app/views/org_document_comments/edit.html.erb index a6681d047..431eb588d 100644 --- a/app/views/org_document_comments/edit.html.erb +++ b/app/views/org_document_comments/edit.html.erb @@ -1,6 +1,6 @@ <%= content_for(:header_tags) do %> <%= import_ke(enable_at: false, prettify: false, init_activity: false) %> - <%= javascript_include_tag "des_kindEditor" %> + <%= javascript_include_tag "des_kindEditor" %> <% end %>