From 5ff43fdea762d99ddaab16f359abdb98599f988f Mon Sep 17 00:00:00 2001 From: alan <547533434@qq.com> Date: Sat, 7 Mar 2015 10:52:20 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=B7=BB=E5=8A=A0=E6=96=B0?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E9=82=AE=E4=BB=B6=E5=8F=91=E9=80=81=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=20Signed-off-by:=20alan=20<547533434@qq.com>?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/projects_controller.rb | 12 +- app/views/layouts/base_projects.html.erb | 2 +- .../projects/_invite_members_by_mail.html.erb | 21 + app/views/projects/invite_members.html.erb | 132 +++---- .../projects/invite_members_by_mail.html.erb | 2 + .../projects/invite_members_by_mail.js.erb | 10 + app/views/projects/show.html.erb | 362 +++++++++--------- app/views/tags/_project_tag.html.erb | 40 +- config/routes.rb | 2 + db/schema.rb | 19 +- public/stylesheets/project.css | 182 +++++++++ 11 files changed, 502 insertions(+), 282 deletions(-) create mode 100644 app/views/projects/_invite_members_by_mail.html.erb create mode 100644 app/views/projects/invite_members_by_mail.html.erb create mode 100644 app/views/projects/invite_members_by_mail.js.erb create mode 100644 public/stylesheets/project.css diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index 7e549509b..1428b4997 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -332,10 +332,18 @@ class ProjectsController < ApplicationController @wiki ||= @project.wiki end - + def send_mail_to_member + unless params[:mail].nil? + email = params[:mail] + Mailer.send_invite_in_project(email, @project, User.current).deliver + end + end #发送邮件邀请新用户 def invite_members_by_mail - + respond_to do |format| + format.html + format.js + end end # 邀请Trustie注册用户 diff --git a/app/views/layouts/base_projects.html.erb b/app/views/layouts/base_projects.html.erb index 40f13a2f8..de85e7257 100644 --- a/app/views/layouts/base_projects.html.erb +++ b/app/views/layouts/base_projects.html.erb @@ -129,7 +129,7 @@