From 681546b860c2e1924221954a1b391e8517771c93 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Wed, 22 Apr 2015 16:49:07 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BC=BA=E9=99=B7=E4=B8=8A=E4=BC=A0=E9=99=84?=
 =?UTF-8?q?=E4=BB=B6=E6=98=BE=E7=A4=BA=20=E9=A1=B9=E7=9B=AE=E9=82=AE?=
 =?UTF-8?q?=E4=BB=B6=E9=82=80=EF=BC=88=E6=9C=AA=E5=AE=8C=E6=88=90=EF=BC=8C?=
 =?UTF-8?q?=E9=9C=80=E5=88=87=E6=8D=A2=E5=88=86=E6=94=AF=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/projects_controller.rb             | 7 +++++--
 app/models/mailer.rb                               | 3 ++-
 app/services/users_service.rb                      | 8 +++++---
 app/views/attachments/_project_file_links.html.erb | 2 +-
 4 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 5e67e0a2c..845f32dab 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -243,8 +243,10 @@ class ProjectsController < ApplicationController
   # Author lizanle
   # Description  项目动态展示方法，删除了不必要的代码
   def show
-
-    # 试图跳转到请求的按钮
+    # params[:login]为邮箱邀请用户加入，主要功能：
+    # 1、自动注册
+    # 2、加入项目、创建角色
+    # 3、用户得分
     if params[:login]
       login = params[:login]
       login = login.sub(/%40/,'@')
@@ -252,6 +254,7 @@ class ProjectsController < ApplicationController
       password = params[:password]
       us = UsersService.new
       user = us.register_auto(login,mail, password)
+
       Member.create(:role_ids => [4], :user_id => user.id,:project_id => @project.id)
       UserGrade.create(:user_id => user.id, :project_id => @project.id)
       User.current = user unless User.current.nil?
diff --git a/app/models/mailer.rb b/app/models/mailer.rb
index ce3924119..acc268275 100644
--- a/app/models/mailer.rb
+++ b/app/models/mailer.rb
@@ -53,7 +53,8 @@ class Mailer < ActionMailer::Base
     @subject = "#{invitor.name} #{l(:label_invite_project)} #{project.name} "
     @password = newpass(6)
     @project_url = url_for(:controller => 'projects', :action => 'show', :id => project.id,
-                           :password => @password,  :login => email)
+                             :password => @password,
+                             :login => email)
     mail :to => email, :subject => @subject
   end
 
diff --git a/app/services/users_service.rb b/app/services/users_service.rb
index c1f716fd1..75dd316c0 100644
--- a/app/services/users_service.rb
+++ b/app/services/users_service.rb
@@ -44,13 +44,16 @@ class UsersService
     #location = get_user_location @user
     #{:id => @user.id, :img_url => img_url, :nickname => @user.login, :gender => gender, :work_unit => work_unit, :mail => @user.mail, :location => location, :brief_introduction => @user.user_extensions.brief_introduction}
   end
+
+  # 自动注册功能 FOR：邮件邀请
   def register_auto(login,mail,password)
     @user = User.new
     @user.admin = false
     @user.register
     @user.login = login
-    @user.mail =mail
+    @user.mail = mail
     password_confirmation = password
+    # 自动注册，跳过代码验证
     should_confirmation_password = true
     if !password.blank? && !password_confirmation.blank? && should_confirmation_password
       @user.password, @user.password_confirmation = password, password_confirmation
@@ -59,9 +62,7 @@ class UsersService
     else
       @user.password = ""
     end
-
     @user = automatically_register(@user)
-
     if @user.id != nil
       ue = @user.user_extensions ||= UserExtensions.new
       ue.user_id = @user.id
@@ -69,6 +70,7 @@ class UsersService
     end
     @user
   end
+
   #显示用户
   #id用户id
   def show_user(params)
diff --git a/app/views/attachments/_project_file_links.html.erb b/app/views/attachments/_project_file_links.html.erb
index 9a65556d8..0135ee239 100644
--- a/app/views/attachments/_project_file_links.html.erb
+++ b/app/views/attachments/_project_file_links.html.erb
@@ -64,7 +64,7 @@
       <% images = attachments.select(&:thumbnailable?) %>
       <% if images.any? %>
             <% images.each do |attachment| %>
-                <div class="pro_pic fl "><%= thumbnail_issue_tag(attachment) %></div>
+                <div class="pro_pic fl " width="100" height="73"><%= thumbnail_issue_tag(attachment) %></div>
             <% end %>
       <% end %>
   <% end %>