修复项目加入组织的bug

app/controllers/org_projects_controller.rb

@@ -14,5 +14,18 @@ class OrgProjectsController < ApplicationController
     @project = Project.find(params[:project_id])
     @org_project = OrgProject.find(params[:id])
     @org_project.destroy
+
+    condition = '%%'
+    project_org_ids = OrgProject.find_by_sql("select distinct organization_id from org_projects where project_id = #{params[:project_id]}").map(&:organization_id)
+    if project_org_ids.empty?
+      @orgs_not_in_project = Organization.where("(is_public or creator_id =?) = 1 and name like ?",User.current.id, condition).page( 1).per(10)
+      @org_count = Organization.where("is_public = 1 or creator_id =?", User.current.id).where("name like ?", condition).count
+    else
+      project_org_ids = "(" + project_org_ids.join(',') +  ")"
+      @orgs_not_in_project = Organization.where("id not in #{project_org_ids} and (is_public = 1 or creator_id =?) and name like ?", User.current.id, condition).page( 1).per(10)
+      @org_count =  Organization.where("id not in #{project_org_ids} and (is_public = 1 or creator_id =?)", User.current.id).where("name like ?", condition).count
+    end
+    # @project_count = Project.project_entities.visible.like(params[:name]).page(params[:page]).count
+    @orgs_page = Paginator.new @org_count, 10,1
   end
 end

app/controllers/projects_controller.rb

@@ -77,12 +77,12 @@ class ProjectsController < ApplicationController
     end
     project_org_ids = OrgProject.find_by_sql("select distinct organization_id from org_projects where project_id = #{params[:id]}").map(&:organization_id)
     if project_org_ids.empty?
-      @orgs_not_in_project = Organization.where("is_public = 1").where("name like ?", condition).page((params[:page].to_i || 1)).per(10)
-      @org_count = Organization.where("is_public = 1").where("name like ?", condition).count
+      @orgs_not_in_project = Organization.where("(is_public or creator_id =?) = 1 and name like ?",User.current.id, condition).page((params[:page].to_i || 1)).per(10)
+      @org_count = Organization.where("is_public = 1 or creator_id =?", User.current.id).where("name like ?", condition).count
     else
       project_org_ids = "(" + project_org_ids.join(',') +  ")"
-      @orgs_not_in_project = Organization.where("id not in #{project_org_ids} and is_public = 1").where("name like ?", condition).page((params[:page].to_i || 1)).per(10)
-      @org_count =  Organization.where("id not in #{project_org_ids} and is_public = 1").where("name like ?", condition).count
+      @orgs_not_in_project = Organization.where("id not in #{project_org_ids} and (is_public = 1 or creator_id =?) and name like ?", User.current.id, condition).page((params[:page].to_i || 1)).per(10)
+      @org_count =  Organization.where("id not in #{project_org_ids} and (is_public = 1 or creator_id =?)", User.current.id).where("name like ?", condition).count
     end
    # @project_count = Project.project_entities.visible.like(params[:name]).page(params[:page]).count
     @orgs_page = Paginator.new @org_count, 10,params[:page]

app/views/org_projects/destroy.js.erb

@@ -1,4 +1,22 @@
+//$("#search_orgs_result_list").html("");
+////$("#paginator").css("display", "none");
 $("#added_orgs").html("");
+$("#added_orgs").html('<%= escape_javascript(render :partial => "projects/settings/added_orgs", :locals => {:orgs => @project.organizations, :project_id => @project.id}) %>')
+//$.ajax({
+//    url: '<%#= url_for(:controller => 'projects', :action => 'search_public_orgs_not_in_project') %>'+'?page=1',
+//    type:'get'
+//});
 $("#search_orgs_result_list").html("");
+$("#search_orgs_result_list").append('<ul class="ml20">');
+<% @orgs_not_in_project.each do |org|%>
+link = "<li><label><input type='checkbox'class='mr5 fl mt3' name='orgNames[]' value='<%=org.id%>'/><span class='relateOrgName fl'> <%=org.name %> </span></label></li><div class='cl mt5'></div>";
+$("#search_orgs_result_list").append(link );
+<%end %>
+$("#search_orgs_result_list").append('</ul>')
+<% if @org_count > 10 %>
+$("#paginator").html(' <%=  pagination_links_full @orgs_page, @org_count ,:per_page_links => true,:remote =>true,:flag=>true%>');
+$("#paginator").css("display", "block");
+<% else %>
 $("#paginator").css("display", "none");
-$("#added_orgs").html('<%= escape_javascript(render :partial => "projects/settings/added_orgs", :locals => {:orgs => @project.organizations, :project_id => @project.id}) %>')
+<% end %>
+

app/views/projects/settings/_added_orgs.html.erb

@@ -1,7 +1,7 @@
 <ul>
   <li><span class="relatedListName fb fl">名称</span><span class="relatedListOption fb fl">操作</span></li>
   <% orgs.each do |org| %>
-    <li><a href="javascript:void(0);" class="relatedListName linkBlue fl"><%= org.name %></a>
+    <li><a href="<%= organization_path(org) %>" class="relatedListName linkBlue fl"><%= org.name %></a>
       <%= link_to "取消关联", org_project_path(:id => OrgProject.where(:organization_id => org.id, :project_id => project_id).first.id, :project_id => project_id),
                   :method => 'delete',:remote => true, :class => "relatedListOption fl linkGrey3" %>
     </li>

app/views/users/user_organizations.html.erb

@@ -15,7 +15,7 @@
       <% @orgs.each do |org| %>
           <div class="postRow">
             <div class="postPortrait">
-              <%= link_to image_tag(url_to_avatar(org), :width => '78', :height => '78', :alt => '组织logo'), :class => "linkGrey2" %>
+              <%= link_to image_tag(url_to_avatar(org), :width => '78', :height => '78', :alt => '组织logo'), organization_path(org), :class => "linkGrey2" %>
             </div>
             <div class="orgWrap">
               <div class="orgTitle">