Merge branch 'szzh' into develop

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("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]
     @hint_flag = params[:hint_flag]
     #render :json => {:orgs => @orgs_not_in_course, :count => @org_count}.to_json

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>

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 %>");