添加组织时,翻页提醒功能改善

tmp
ouyangxuhua 10 years ago
parent 219774afab
commit af981f841e

@ -46,6 +46,7 @@ class CoursesController < ApplicationController
end end
# @course_count = Project.course_entities.visible.like(params[:name]).page(params[:page]).count # @course_count = Project.course_entities.visible.like(params[:name]).page(params[:page]).count
@orgs_page = Paginator.new @org_count, 10,params[:page] @orgs_page = Paginator.new @org_count, 10,params[:page]
@hint_flag = params[:hint_flag]
#render :json => {:orgs => @orgs_not_in_course, :count => @org_count}.to_json #render :json => {:orgs => @orgs_not_in_course, :count => @org_count}.to_json
respond_to do |format| respond_to do |format|
format.js format.js

@ -86,6 +86,7 @@ class ProjectsController < ApplicationController
end end
# @project_count = Project.project_entities.visible.like(params[:name]).page(params[:page]).count # @project_count = Project.project_entities.visible.like(params[:name]).page(params[:page]).count
@orgs_page = Paginator.new @org_count, 10,params[:page] @orgs_page = Paginator.new @org_count, 10,params[:page]
@no_roll_hint = params[:hint_flag]
#render :json => {:orgs => @orgs_not_in_project, :count => @org_count}.to_json #render :json => {:orgs => @orgs_not_in_project, :count => @org_count}.to_json
respond_to do |format| respond_to do |format|
format.js format.js

@ -1,7 +1,9 @@
<% if @hint_flag.nil? %>
if($("#join_orgs_for_course input:checked").size() > 0) if($("#join_orgs_for_course input:checked").size() > 0)
{ {
alert("翻页或搜索后将丢失当前选择的用户数据"); alert("翻页或搜索后将丢失当前选择的用户数据");
} }
<% end %>
$("#search_orgs_result_list").html(""); $("#search_orgs_result_list").html("");
$("#search_orgs_result_list").append('<ul class="ml20">'); $("#search_orgs_result_list").append('<ul class="ml20">');
<% @orgs_not_in_course.each do |org|%> <% @orgs_not_in_course.each do |org|%>

@ -77,7 +77,7 @@
type: "post", type: "post",
success: function (data) { success: function (data) {
$.ajax({ $.ajax({
url: "/courses/" + courseId + "/search_public_orgs_not_in_course", url: "/courses/" + courseId + "/search_public_orgs_not_in_course?hint_flag=true&name=" + $("input[name='orgs']").val().trim(),
type: "get" type: "get"
}); });
} }

@ -1,9 +1,10 @@
//翻页提醒 //翻页提醒
<% if @no_roll_hint.nil? %>
if( $("#join_orgs_for_project input:checked").size() > 0) if( $("#join_orgs_for_project input:checked").size() > 0)
{ {
alert('翻页或搜索后将丢失当前选择的用户数据!'); alert('翻页或搜索后将丢失当前选择的用户数据!');
} }
<% end %>
$("#search_orgs_result_list").html(""); $("#search_orgs_result_list").html("");
$("#search_orgs_result_list").append('<ul class="ml20">'); $("#search_orgs_result_list").append('<ul class="ml20">');
<% @orgs_not_in_project.each do |org|%> <% @orgs_not_in_project.each do |org|%>

@ -77,7 +77,7 @@
type: 'post', type: 'post',
success: function (data) { success: function (data) {
$.ajax({ $.ajax({
url: '/projects/'+projectId+'/search_public_orgs_not_in_project', url: '/projects/'+projectId+'/search_public_orgs_not_in_project?hint_flag=true&name='+ $("input[name='orgs']").val().trim(),
type: 'get' type: 'get'
}); });
} }

@ -1295,7 +1295,7 @@ function cancel_org_course_relation(id, courseId){
type: "delete", type: "delete",
success:function(data){ success:function(data){
$.ajax({ $.ajax({
url: "/courses/" + courseId + "/search_public_orgs_not_in_course", url: "/courses/" + courseId + "/search_public_orgs_not_in_course?hint_flag=true",
type:'get' type:'get'
}); });
} }

@ -536,7 +536,7 @@ function cancel_relation(orgId,projectId){
type:'DELETE', type:'DELETE',
success:function(data) { success:function(data) {
$.ajax({ $.ajax({
url: ' /projects/'+projectId+'/search_public_orgs_not_in_project', url: ' /projects/'+projectId+'/search_public_orgs_not_in_project?hint_flag=true',
type:'get' type:'get'
}); });
} }

Loading…
Cancel
Save