diff --git a/app/controllers/org_courses_controller.rb b/app/controllers/org_courses_controller.rb
index 3d1d313c5..d054e41de 100644
--- a/app/controllers/org_courses_controller.rb
+++ b/app/controllers/org_courses_controller.rb
@@ -3,7 +3,9 @@ class OrgCoursesController < ApplicationController
org_ids = params[:orgNames]
@course = Course.find(params[:course_id])
org_ids.each do |org_id|
- OrgCourse.create(:organization_id => org_id.to_i, :course_id => params[:course_id].to_i, :created_at => Time.now)
+ if OrgCourse.where("organization_id =? and course_id =?", org_id.to_i, params[:course_id].to_i).count == 0
+ OrgCourse.create(:organization_id => org_id.to_i, :course_id => params[:course_id].to_i, :created_at => Time.now)
+ end
end
respond_to do |format|
format.js
diff --git a/app/controllers/org_document_comments_controller.rb b/app/controllers/org_document_comments_controller.rb
index 61a27c433..776bd132d 100644
--- a/app/controllers/org_document_comments_controller.rb
+++ b/app/controllers/org_document_comments_controller.rb
@@ -38,12 +38,19 @@ class OrgDocumentCommentsController < ApplicationController
act.update_attributes(:updated_at => @org_document.updated_at)
end
respond_to do |format|
- format.html {redirect_to organization_org_document_comments_path(:organization_id => @org_document.organization.id)}
+ format.html {
+ if params[:flag] == 0
+ redirect_to organization_org_document_comments_path(:organization_id => @org_document.organization.id)
+ else
+ redirect_to org_document_comment_path(@org_document.root.id, :organization_id => @org_document.organization.id)
+ end
+ }
end
end
def edit
@org_document = OrgDocumentComment.find(params[:id])
+ @flag = params[:flag]
@organization = Organization.find(params[:organization_id])
end
diff --git a/app/controllers/org_projects_controller.rb b/app/controllers/org_projects_controller.rb
index 29e60a62a..a455ce408 100644
--- a/app/controllers/org_projects_controller.rb
+++ b/app/controllers/org_projects_controller.rb
@@ -3,7 +3,9 @@ class OrgProjectsController < ApplicationController
org_ids = params[:orgNames]
@project = Project.find(params[:project_id])
org_ids.each do |org_id|
- OrgProject.create(:organization_id => org_id.to_i, :project_id => params[:project_id].to_i, :created_at => Time.now)
+ if OrgProject.where("organization_id =? and project_id =?", org_id.to_i, @project.id).count == 0
+ OrgProject.create(:organization_id => org_id.to_i, :project_id => params[:project_id].to_i, :created_at => Time.now)
+ end
end
respond_to do |format|
format.js
diff --git a/app/controllers/organizations_controller.rb b/app/controllers/organizations_controller.rb
index 0d22ab461..ba4dda939 100644
--- a/app/controllers/organizations_controller.rb
+++ b/app/controllers/organizations_controller.rb
@@ -175,4 +175,75 @@ class OrganizationsController < ApplicationController
format.js
end
end
+
+ def join_course_menu
+ @organization = Organization.find(params[:id])
+ respond_to do |format|
+ format.js
+ end
+ end
+
+ def search_courses
+ @organization = Organization.find(params[:id])
+ condition = '%%'
+ if !params[:name].nil?
+ condition = "%#{params[:name].strip}%".gsub(" ","")
+ end
+ #sql = "select courses.* from courses inner join members on courses.id = members.course_id inner join org_courses on courses.id = org_courses.course_id where org_courses.organization_id != #{@organization.id} and members.user_id = #{User.current.id} and courses.name like '#{condition}'"
+ sql = "select courses.* from courses inner join members on courses.id = members.course_id where members.user_id = #{User.current.id} and courses.name like '#{condition}'"
+ user_courses = Course.find_by_sql(sql)
+ @added_course_ids = @organization.courses.map(&:id)
+ @courses = []
+ user_courses.each do |course|
+ if !@added_course_ids.include?(course.id)
+ @courses << course
+ end
+ end
+ end
+
+ def join_courses
+ @organization = Organization.find(params[:id])
+ course_ids = params[:courseNames]
+ course_ids.each do |id|
+ OrgCourse.create(:organization_id => @organization.id, :course_id => id.to_i, :created_at => Time.now)
+ end
+ respond_to do |format|
+ 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.project_id where members.user_id = #{User.current.id} and projects.status != 9 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/courses/settings/_join_org.html.erb b/app/views/courses/settings/_join_org.html.erb
index cd2d515cc..fff0f807c 100644
--- a/app/views/courses/settings/_join_org.html.erb
+++ b/app/views/courses/settings/_join_org.html.erb
@@ -68,8 +68,7 @@
});
});
function cancel_join_orgs() {
- $("#search_orgs_result_list").html("");
- $("#paginator").css("display", "none")
+ $("#join_orgs_for_course input:checked").attr("checked", false);
}
function course_join_org(courseId) {
$.ajax({
diff --git a/app/views/layouts/base_org.html.erb b/app/views/layouts/base_org.html.erb
index 84edf02e1..b89977b09 100644
--- a/app/views/layouts/base_org.html.erb
+++ b/app/views/layouts/base_org.html.erb
@@ -85,10 +85,24 @@
-