From 10eeeaa95cbe937457879a7fe1a8e96469b739f7 Mon Sep 17 00:00:00 2001
From: guange <8863824@gmail.com>
Date: Wed, 3 Feb 2016 23:30:07 +0800
Subject: [PATCH 1/6] =?UTF-8?q?=E5=BC=B9=E5=87=BA=E6=A1=86=E5=B1=85?=
 =?UTF-8?q?=E4=B8=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/search_user_course.js.erb  | 14 ++++++++------
 app/views/users/search_user_org.js.erb     | 11 ++++++++++-
 app/views/users/search_user_project.js.erb | 11 ++++++++++-
 3 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/app/views/users/search_user_course.js.erb b/app/views/users/search_user_course.js.erb
index eed7499d5..a5559a610 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);
 //
@@ -19,7 +21,7 @@
 showModal('ajax-modal', '452px');
 $('#ajax-modal').siblings().remove();
 $('#ajax-modal').before("<a href='javascript:void(0)' onclick='hideModal();' style='margin-left: 435px;' class='resourceClose'></a>");
-$('#ajax-modal').parent().css("top","415px").css("left","1045px");
+$('#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 877629e34..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("<a href='javascript:void(0)' onclick='hideModal();' style='margin-left: 435px;' class='resourceClose'></a>");
-$('#ajax-modal').parent().css("top","415px").css("left","1045px");
+$('#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 f80be34f8..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("<a href='javascript:void(0)' onclick='hideModal();' style='margin-left: 435px;' class='resourceClose'></a>");
-$('#ajax-modal').parent().css("top","415px").css("left","1045px");
+$('#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();

From b2551f904b80eb87cf311fd36fefe30fc389d952 Mon Sep 17 00:00:00 2001
From: guange <8863824@gmail.com>
Date: Thu, 4 Feb 2016 12:51:23 +0800
Subject: [PATCH 2/6] =?UTF-8?q?=E7=BB=84=E7=BB=87=E6=B2=A1=E6=9C=89?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/users_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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}

From 2cf253a26bef4b7273322c42cb30c26509ddc314 Mon Sep 17 00:00:00 2001
From: guange <8863824@gmail.com>
Date: Thu, 4 Feb 2016 17:30:49 +0800
Subject: [PATCH 3/6] =?UTF-8?q?=E5=A4=8D=E5=88=B6=E8=AF=BE=E7=A8=8B?=
 =?UTF-8?q?=E5=9B=BE=E7=89=87=E5=87=BA=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/helpers/avatar_helper.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

From c7bfe8f20fe2c7cc40ab60f2a79d01b9eb168a39 Mon Sep 17 00:00:00 2001
From: guange <8863824@gmail.com>
Date: Sat, 6 Feb 2016 12:04:43 +0800
Subject: [PATCH 4/6] =?UTF-8?q?=E7=BB=84=E7=BB=87=E9=A6=96=E9=A1=B5?=
 =?UTF-8?q?=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/organizations/_show_home_page.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/organizations/_show_home_page.html.erb b/app/views/organizations/_show_home_page.html.erb
index f447c5022..0e725532e 100644
--- a/app/views/organizations/_show_home_page.html.erb
+++ b/app/views/organizations/_show_home_page.html.erb
@@ -50,7 +50,7 @@
 </div>
 
 <script type="text/javascript">
-    $("#intro_content_<%= @document.id%> p,#intro_content_<%= @document.id%> span,#intro_content_<%= @document.id%> em").each(function(){
+    $("#intro_content_<%= document.id%> p,#intro_content_<%= document.id%> span,#intro_content_<%= document.id%> em").each(function(){
         var postContent = $(this).html();
         postContent = postContent.replace(/&nbsp;/g," ");
         postContent= postContent.replace(/ {2}/g,"&nbsp; ");

From a421e8c6fac0bb09bfe8d0d5badf3a586250dcc1 Mon Sep 17 00:00:00 2001
From: guange <8863824@gmail.com>
Date: Thu, 18 Feb 2016 14:29:46 +0800
Subject: [PATCH 5/6] =?UTF-8?q?=E7=BB=84=E7=BB=87=E6=96=87=E7=AB=A0?=
 =?UTF-8?q?=E6=97=A0=E6=B3=95=E7=BC=96=E8=BE=91=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/org_document_comments/edit.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/org_document_comments/edit.html.erb b/app/views/org_document_comments/edit.html.erb
index b17ae0e75..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 %>
 
 <script>

From ac121ce585d59bea73266e2ab2d7b80e23c67239 Mon Sep 17 00:00:00 2001
From: guange <8863824@gmail.com>
Date: Thu, 18 Feb 2016 15:26:07 +0800
Subject: [PATCH 6/6] =?UTF-8?q?=E7=BB=84=E7=BB=87=E6=96=87=E7=AB=A0?=
 =?UTF-8?q?=E6=97=A0=E6=B3=95=E7=BC=96=E8=BE=91=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/javascripts/des_kindEditor.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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();