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/users/search_user_course.js.erb b/app/views/users/search_user_course.js.erb
index 11db47950..d2eb3e7c8 100644
--- a/app/views/users/search_user_course.js.erb
+++ b/app/views/users/search_user_course.js.erb
@@ -1,8 +1,10 @@
-//var screenWidth = $(window).width();
-//var screenHeight = $(window).height(); //当前浏览器窗口的 宽高
-//var scrolltop = $(document).scrollTop();//获取当前窗口距离页面顶部高度
-//var objLeft = (screenWidth - 2)/2.5 ; //2 可以根据需要修改
-//var objTop = (screenHeight - 100)/2 + scrolltop; //100可以根据需要修改
+var screenWidth = $(window).width();
+var screenHeight = $(window).height(); //当前浏览器窗口的 宽高
+var boxWidth = 452;
+
+var scrolltop = $(document).scrollTop();//获取当前窗口距离页面顶部高度
+var objLeft = (screenWidth - boxWidth)/2 ; //2 可以根据需要修改
+var objTop = (screenHeight - 100)/2 + scrolltop; //100可以根据需要修改
//var popupHeight = $(".resourceSharePopup").outerHeight(true);
//$(".resourceSharePopup").css("marginTop",-popupHeight/2);
//
@@ -10,16 +12,16 @@
//$("#upload_box").html('<%#= escape_javascript( render :partial => "resource_share_popup" ,:locals => {:courses=>@course,:user=>@user,:send_id=>@send_id,:send_ids=>@send_ids})%>');
//$("#upload_box").css('display','block');
<% if params[:send_type].present? && params[:send_type] == 'news' %>
- $("#ajax-modal").html('<%= escape_javascript( render :partial => 'users/share_news_to_course' , :locals => {:courses => @course, :user => @user, :send_id => @send_id, :send_ids => @send_ids}) %>');
+ $("#ajax-modal").html('<%= escape_javascript( render :partial => 'users/share_news_to_course' ,:locals => {:courses=>@course,:user=>@user,:send_id=>@send_id,:send_ids=>@send_ids})%>');
<% elsif params[:send_type] == 'file' %>
- $("#ajax-modal").html('<%= escape_javascript( render :partial => 'users/resource_share_popup' , :locals => {:courses => @course, :user => @user, :send_id => @send_id, :send_ids => @send_ids}) %>');
+ $("#ajax-modal").html('<%= escape_javascript( render :partial => 'users/resource_share_popup' ,:locals => {:courses=>@course,:user=>@user,:send_id=>@send_id,:send_ids=>@send_ids})%>');
<% elsif params[:send_type] == 'message' %>
- $("#ajax-modal").html('<%= escape_javascript( render :partial => 'users/share_message_to_course' ,:locals => {:courses => @course, :user => @user, :send_id => @send_id, :send_ids => @send_ids}) %>');
+ $("#ajax-modal").html('<%= escape_javascript( render :partial => 'users/share_message_to_course' ,:locals => {:courses=>@course,:user=>@user,:send_id=>@send_id,:send_ids=>@send_ids})%>');
<% end %>
showModal('ajax-modal', '452px');
$('#ajax-modal').siblings().remove();
$('#ajax-modal').before("");
-$('#ajax-modal').parent().css("top","50%").css("left","50%");
+$('#ajax-modal').parent().css("top",objTop+"px").css("left", objLeft+200+ "px");
$('#ajax-modal').parent().addClass("popbox").addClass("resourceUploadPopup");
$('#ajax-modal').css("padding-left","16px").css("padding-bottom","16px");
var val = $("#search_course_input").val();
diff --git a/app/views/users/search_user_org.js.erb b/app/views/users/search_user_org.js.erb
index 0d4b71a60..382b243ea 100644
--- a/app/views/users/search_user_org.js.erb
+++ b/app/views/users/search_user_org.js.erb
@@ -5,10 +5,19 @@
<% elsif params[:send_type] == 'message' %>
$("#ajax-modal").html('<%= escape_javascript( render :partial => 'users/share_message_to_org' ,:locals => {:orgs=>@orgs,:user=>@user,:send_id=>@send_id,:send_ids=>@send_ids})%>');
<% end %>
+
+var screenWidth = $(window).width();
+var screenHeight = $(window).height(); //当前浏览器窗口的 宽高
+var boxWidth = 452;
+
+var scrolltop = $(document).scrollTop();//获取当前窗口距离页面顶部高度
+var objLeft = (screenWidth - boxWidth)/2 ; //2 可以根据需要修改
+var objTop = (screenHeight - 100)/2 + scrolltop; //100可以根据需要修改
+
showModal('ajax-modal', '452px');
$('#ajax-modal').siblings().remove();
$('#ajax-modal').before("");
-$('#ajax-modal').parent().css("top","50%").css("left","50%");
+$('#ajax-modal').parent().css("top",objTop+"px").css("left",objLeft+200+"px");
$('#ajax-modal').parent().addClass("popbox").addClass("shareDP");
$('#ajax-modal').css("padding-left","16px").css("padding-bottom","16px");
var val = $("#search_org_input").val();
diff --git a/app/views/users/search_user_project.js.erb b/app/views/users/search_user_project.js.erb
index 79615d301..17e0ed918 100644
--- a/app/views/users/search_user_project.js.erb
+++ b/app/views/users/search_user_project.js.erb
@@ -5,10 +5,19 @@
<% elsif params[:send_type] == 'message' %>
$("#ajax-modal").html('<%= escape_javascript( render :partial => 'users/share_message_to_project', :locals => {:projects => @projects, :user => @user, :send_id => @send_id, :send_ids => @send_ids}) %>');
<% end %>
+
+var screenWidth = $(window).width();
+var screenHeight = $(window).height(); //当前浏览器窗口的 宽高
+var boxWidth = 452;
+
+var scrolltop = $(document).scrollTop();//获取当前窗口距离页面顶部高度
+var objLeft = (screenWidth - boxWidth)/2 ; //2 可以根据需要修改
+var objTop = (screenHeight - 100)/2 + scrolltop; //100可以根据需要修改
+
showModal('ajax-modal', '452px');
$('#ajax-modal').siblings().remove();
$('#ajax-modal').before("");
-$('#ajax-modal').parent().css("top","50%").css("left","50%");
+$('#ajax-modal').parent().css("top",objTop+"px").css("left",objLeft+200+"px");
$('#ajax-modal').parent().addClass("resourceUploadPopup").addClass("popbox")
$('#ajax-modal').css("padding-left","16px").css("padding-bottom","16px");
//$("#search_project_input").focus();
diff --git a/public/javascripts/des_kindEditor.js b/public/javascripts/des_kindEditor.js
index 1b952672a..206448044 100644
--- a/public/javascripts/des_kindEditor.js
+++ b/public/javascripts/des_kindEditor.js
@@ -126,7 +126,8 @@ function init_des_data(){
nh_reset_form(params);
});
params.submit_btn.click(function () {
- params.form.submit();
+ params.editor.sync();
+ params.form[0].submit();
});
params.textarea.data('init', 1);
$(this).show();