diff --git a/app/controllers/members_controller.rb b/app/controllers/members_controller.rb
index ce899eff5..d0be72961 100644
--- a/app/controllers/members_controller.rb
+++ b/app/controllers/members_controller.rb
@@ -107,17 +107,24 @@ class MembersController < ApplicationController
AppliedProject.deleteappiled(member.user_id, @project.id)
end
end
- respond_to do |format|
- format.html { redirect_to_settings_in_projects }
- format.js { @members = members; @applied_members = applied_members; }
- format.api {
- @member = members.first
- if @member.valid?
- render :action => 'show', :status => :created, :location => membership_url(@member)
- else
- render_validation_errors(@member)
- end
- }
+ if params[:flag]
+ flash[:notice] = l(:label_invite_success)
+ respond_to do |format|
+ format.html { redirect_to invite_members_project_url(@project) }
+ end
+ else
+ respond_to do |format|
+ format.html { redirect_to_settings_in_projects }
+ format.js { @members = members; @applied_members = applied_members; }
+ format.api {
+ @member = members.first
+ if @member.valid?
+ render :action => 'show', :status => :created, :location => membership_url(@member)
+ else
+ render_validation_errors(@member)
+ end
+ }
+ end
end
elsif @course
course_info = []
@@ -310,6 +317,7 @@ class MembersController < ApplicationController
end
def autocomplete
+ @flag = params[:flag] || false
respond_to do |format|
format.js
end
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index f83580fba..4f84212b4 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -334,8 +334,7 @@ class ProjectsController < ApplicationController
end
def send_mail_to_member
-
- if !params[:mail].nil? && User.find_by_mail(params[:mail].to_s).nil?
+ if !params[:mail].blank? && User.find_by_mail(params[:mail].to_s).nil?
email = params[:mail]
Mailer.send_invite_in_project(email, @project, User.current).deliver
@is_zhuce =false
diff --git a/app/controllers/welcome_controller.rb b/app/controllers/welcome_controller.rb
index 290af0068..949ddd643 100644
--- a/app/controllers/welcome_controller.rb
+++ b/app/controllers/welcome_controller.rb
@@ -28,7 +28,8 @@ class WelcomeController < ApplicationController
# 企业版定制: params[:project]为传过来的参数
unless params[:organization].nil?
@organization = Organization.find params[:organization]
- @organization_projects = Project.visible.joins(:project_status).joins("LEFT JOIN project_scores ON projects.id = project_scores.project_id").where("projects.organization_id = ?", @organization.id).order("score DESC").limit(10).all
+ # @organization_projects = Project.joins(:project_status).joins("LEFT JOIN project_scores ON projects.id = project_scores.project_id").where("projects.organization_id = ?", @organization.id).order("score DESC").limit(10).all
+ @organization_projects = @organization.projects.visible.joins("LEFT JOIN project_scores ON projects.id = project_scores.project_id").order("project_scores.score DESC").limit(10).all
@part_projects = @organization_projects.count < 9 ? find_miracle_project( 9 - @organization_projects.count, 3,"score desc") : []
# @cur_projects = Project.find(params[:organization])
# @organization = @cur_projects.enterprise_name
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index a36f4b183..9629ed437 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -490,6 +490,15 @@ module ApplicationHelper
s.html_safe
end
+ #项目成员列表复选框生成
+ def project_member_check_box_tags_ex name, principals
+ s = ''
+ principals.each do |principal|
+ s << "#{ check_box_tag name, principal.id, false, :id => nil } #{h link_to principal.userInfo, user_path( principal.id)}\n"
+ end
+ s.html_safe
+ end
+
#扩展的checkbox生成
def principals_check_box_tags_ex(name, principals)
s = ''
diff --git a/app/helpers/members_helper.rb b/app/helpers/members_helper.rb
index 6c11199fb..ed18b7ae4 100644
--- a/app/helpers/members_helper.rb
+++ b/app/helpers/members_helper.rb
@@ -23,15 +23,22 @@ module MembersHelper
principal_count = scope.count
principal_pages = Redmine::Pagination::Paginator.new principal_count, 10, params['page'] #by young
principals = scope.offset(principal_pages.offset).limit(principal_pages.per_page).all
-
s = content_tag('div', principals_check_box_tags_ex('membership[user_ids][]', principals), :id => 'principals')
-
links = pagination_links_full(principal_pages, principal_count, :per_page_links => false) {|text, parameters, options|
link_to text, autocomplete_project_memberships_path(project, parameters.merge(:q => params[:q], :format => 'js')), :remote => true
}
-
s + content_tag('div', content_tag('ul', links), :class => 'pagination_new')
+ end
+ #获取项目可邀请的成员列表
+ def render_project_members project
+ scope = Principal.active.sorted.not_member_of(project).like(params[:q])
+ principals = paginateHelper scope,10
+ s = content_tag('ul', project_member_check_box_tags_ex('membership[user_ids][]', principals), :class => 'mb5', :style => "margin-left: -40px;")
+ links = pagination_links_full(@obj_pages, @obj_count, :per_page_links => false, :remote => false, :flag => true){|text, parameters, options|
+ link_to text, autocomplete_project_memberships_path(project, parameters.merge(:q => params[:q],:flag => true, :format => 'js')), :remote => true
+ }
+ s + content_tag('ul', links,:class => 'wlist')
end
# add by nwb
@@ -71,4 +78,18 @@ module MembersHelper
s + content_tag('div', content_tag('ul', links), :class => 'applied_new')
end
+ private
+ def paginateHelper obj, pre_size=20
+ @obj_count = obj.count
+ @obj_pages = Redmine::Pagination::Paginator.new @obj_count, pre_size, params['page']
+ if obj.kind_of? ActiveRecord::Base or obj.kind_of? ActiveRecord::Relation
+ obj.limit(@obj_pages.per_page).offset(@obj_pages.offset)
+ elsif obj.kind_of? Array
+ obj[@obj_pages.offset, @obj_pages.per_page]
+ else
+ logger.error "[ApplicationController] Error : application_controller#paginateHelper ===> unknow category: #{obj.class}"
+ raise RuntimeError, 'unknow type, Please input you type into this helper.'
+ end
+ end
+
end
diff --git a/app/views/layouts/base_projects.html.erb b/app/views/layouts/base_projects.html.erb
index 8c42298dd..4f5e10990 100644
--- a/app/views/layouts/base_projects.html.erb
+++ b/app/views/layouts/base_projects.html.erb
@@ -119,9 +119,14 @@
<% end %>
+ <%= l(:label_member) %>（）
+ |
+ <%= l(:label_user_watcher) %>（）
+ |
+ <%= l(:project_module_attachments) %>（