diff --git a/app/controllers/organizations_controller.rb b/app/controllers/organizations_controller.rb index 4277b5976..dce472346 100644 --- a/app/controllers/organizations_controller.rb +++ b/app/controllers/organizations_controller.rb @@ -195,7 +195,7 @@ class OrganizationsController < ApplicationController @added_course_ids = @organization.courses.map(&:id) @courses = [] user_courses.each do |course| - if @added_course_ids.include?(course.id) + if !@added_course_ids.include?(course.id) @courses << course end end @@ -211,4 +211,39 @@ class OrganizationsController < ApplicationController format.js end end + + def join_project_menu + @organization = Organization.find(params[:id]) + respond_to do |format| + format.js + end + end + + def search_projects + @organization = Organization.find(params[:id]) + condition = '%%' + if !params[:name].nil? + condition = "%#{params[:name].strip}%".gsub(" ","") + end + sql = "select projects.* from projects inner join members on projects.id = members.course_id where members.user_id = #{User.current.id} and projects.name like '#{condition}'" + user_projects = Course.find_by_sql(sql) + @added_course_ids = @organization.projects.map(&:id) + @projects = [] + user_projects.each do |project| + if !@added_course_ids.include?(project.id) + @projects << project + end + end + end + + def join_projects + @organization = Organization.find(params[:id]) + project_ids = params[:projectNames] + project_ids.each do |id| + OrgProject.create(:organization_id => @organization.id, :project_id => id.to_i, :created_at => Time.now) + end + respond_to do |format| + format.js + end + end end diff --git a/app/views/layouts/base_org.html.erb b/app/views/layouts/base_org.html.erb index 7c55060b4..e5c238ac5 100644 --- a/app/views/layouts/base_org.html.erb +++ b/app/views/layouts/base_org.html.erb @@ -86,6 +86,18 @@ <%= link_to "动态",organization_path(@organization), :class => "homepageMenuText" %>
项目 +
+ +
@@ -101,7 +113,7 @@