From eab8cc723188db97cc873d095c2b9dc18787be1e Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Fri, 8 Jan 2016 21:22:36 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E5=A4=8D=E5=88=B6=E5=AD=A6=E6=9C=9F?=
 =?UTF-8?q?=E7=9A=84=E9=BB=98=E8=AE=A4=E5=9B=BE=E7=89=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/courses/_copy_course.html.erb | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/views/courses/_copy_course.html.erb b/app/views/courses/_copy_course.html.erb
index d4debb601..a759946f6 100644
--- a/app/views/courses/_copy_course.html.erb
+++ b/app/views/courses/_copy_course.html.erb
@@ -37,7 +37,10 @@
 <ul class="mt10">
   <%=labelled_form_for @new_course do |f| %>
     <input name="copy_course" value="<%=@course.id %>" style="display: none"/>
-    <li class="ml45 mb10"> <a href="javascript:void(0)" class="upimg fl"> <img alt="上传图片" id="avatar_image" src="images/courses/pic_courses.jpg" height="60" width="60"> </a> <!--<a href="javascript:void(0)" class="upbtn fl ml30" onclick="$('#upload_course_logo').click();">上传图片</a>-->
+    <li class="ml45 mb10">
+      <a href="javascript:void(0)" class="upimg fl">
+        <%= image_tag(url_to_avatar(@new_course), id: "avatar_image", :width =>"60", :height =>"60",:alt=>"上传图片")%>
+      </a> <!--<a href="javascript:void(0)" class="upbtn fl ml30" onclick="$('#upload_course_logo').click();">上传图片</a>-->
       <!--</span>-->
       <div class="cl"></div>
     </li>

From a3370b693c99072d3cf4e66666871d21a3372ec0 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Fri, 8 Jan 2016 21:46:10 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E5=85=B3=E8=81=94?=
 =?UTF-8?q?=E7=BB=84=E7=BB=87=E5=88=97=E8=A1=A8=E4=B8=BA=E7=A9=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/courses_controller.rb | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb
index 70794fa71..5c7e8dfc3 100644
--- a/app/controllers/courses_controller.rb
+++ b/app/controllers/courses_controller.rb
@@ -39,17 +39,17 @@ class CoursesController < ApplicationController
     end
     limit = 15
     course_org_ids = OrgCourse.find_by_sql("select distinct organization_id from org_courses where course_id = #{params[:id]}").map(&:organization_id)
-    @orgs_not_in_course = User.current.organizations.where("organizations.id not in (#{course_org_ids.join(',')}) and organizations.name like ?", condition).page(params[:page].to_i || 1).per(limit)
-    @org_count = User.current.organizations.where("organizations.id not in (#{course_org_ids.join(',')}) and organizations.name like ?", condition).count
-    # if course_org_ids.empty?
-    #   @orgs_not_in_course = Organization.where("(is_public or creator_id =?) and name like ?",User.current.id, condition).page((params[:page].to_i || 1)).per(limit)
-    #   @org_count = Organization.where("is_public = 1 or creator_id =?", User.current.id).where("name like ?", condition).count
-    # else
-    #   course_org_ids = "(" + course_org_ids.join(',') +  ")"
-    #   @orgs_not_in_course = Organization.where("id not in #{course_org_ids} and (is_public = 1 or creator_id =?) and name like ?", User.current.id, condition).page((params[:page].to_i || 1)).per(limit)
-    #   @org_count =  Organization.where("id not in #{course_org_ids} and (is_public = 1 or creator_id =?)", User.current.id).where("name like ?", condition).count
-    # end
-    # @course_count = Project.course_entities.visible.like(params[:name]).page(params[:page]).count
+    #@orgs_not_in_course = User.current.organizations.where("organizations.id not in (#{course_org_ids.join(',')}) and organizations.name like ?", condition).page(params[:page].to_i || 1).per(limit)
+    #@org_count = User.current.organizations.where("organizations.id not in (#{course_org_ids.join(',')}) and organizations.name like ?", condition).count
+     if course_org_ids.empty?
+       @orgs_not_in_course = User.current.organizations.where("name like ?",condition).page((params[:page].to_i || 1)).per(limit)
+       @org_count = @orgs_not_in_course.count
+     else
+       course_org_ids = "(" + course_org_ids.join(',') +  ")"
+       @orgs_not_in_course =  User.current.organizations.where("id not in #{course_org_ids} and name like ?", condition).page((params[:page].to_i || 1)).per(limit)
+       @org_count =  @orgs_not_in_course.count
+     end
+     @course_count = Project.course_entities.visible.like(params[:name]).page(params[:page]).count
     @orgs_page = Paginator.new @org_count, limit,params[:page]
     @hint_flag = params[:hint_flag]
     #render :json => {:orgs => @orgs_not_in_course, :count => @org_count}.to_json

From bb0a03b3093ae496da29c496b9bf47b8d0d017df Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Fri, 8 Jan 2016 22:02:35 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E8=8B=A5=E6=97=A0=E4=BB=BB=E4=BD=95?=
 =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E7=95=99=E8=A8=80=EF=BC=8C=E6=88=96=E8=80=85?=
 =?UTF-8?q?=E5=BD=93=E5=89=8D=E7=94=A8=E6=88=B7=E6=97=A0=E6=9D=83=E9=99=90?=
 =?UTF-8?q?=E7=9C=8B=E5=88=B0=E4=BB=BB=E4=BD=95=E4=B8=AA=E4=BA=BA=E7=95=99?=
 =?UTF-8?q?=E8=A8=80=EF=BC=8C=E4=B8=8D=E8=A6=81=E6=98=BE=E7=A4=BA=E7=99=BD?=
 =?UTF-8?q?=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/words/destroy.js.erb | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/views/words/destroy.js.erb b/app/views/words/destroy.js.erb
index 7194a16a4..6a56249a3 100644
--- a/app/views/words/destroy.js.erb
+++ b/app/views/words/destroy.js.erb
@@ -6,6 +6,9 @@
     destroyedItem.fadeOut(600,function(){
         destroyedItem.remove();
     });
+    <% if @jours_count && @jours_count == 0 %>
+        $("#user_jour_list").css("padding","0px");
+    <% end %>
   <% else %>
       <% if @bid && @jours_count %>
         $('#jours_count').html("<%= @jours_count %>");

From 66c3cee3f88d02837dbcc28af2a709848edb901b Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Fri, 8 Jan 2016 22:30:04 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E5=85=B3=E8=81=94?=
 =?UTF-8?q?=E7=BB=84=E7=BB=87=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/courses_controller.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb
index 5c7e8dfc3..279975c77 100644
--- a/app/controllers/courses_controller.rb
+++ b/app/controllers/courses_controller.rb
@@ -46,8 +46,8 @@ class CoursesController < ApplicationController
        @org_count = @orgs_not_in_course.count
      else
        course_org_ids = "(" + course_org_ids.join(',') +  ")"
-       @orgs_not_in_course =  User.current.organizations.where("id not in #{course_org_ids} and name like ?", condition).page((params[:page].to_i || 1)).per(limit)
-       @org_count =  @orgs_not_in_course.count
+       @orgs_not_in_course =  User.current.organizations.where("organizations.id not in #{course_org_ids} and organizations.name like ?", condition).page((params[:page].to_i || 1)).per(limit)
+       @org_count = @orgs_not_in_course.empty? ? 0 : @orgs_not_in_course.count
      end
      @course_count = Project.course_entities.visible.like(params[:name]).page(params[:page]).count
     @orgs_page = Paginator.new @org_count, limit,params[:page]