From 151fc561acacb98c6a69a2a1bf8da7920a87000f Mon Sep 17 00:00:00 2001
From: alan <547533434@qq.com>
Date: Sat, 7 Mar 2015 11:30:25 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=82=AE=E4=BB=B6?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F=EF=BC=8C=E5=A2=9E=E5=8A=A0=E7=9B=B8=E5=BA=94?=
 =?UTF-8?q?=E7=9A=84=E6=8F=90=E7=A4=BA=20Signed-off-by:=20alan=20<54753343?=
 =?UTF-8?q?4@qq.com>?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/mailer.rb                             | 5 +++--
 app/views/mailer/send_invite_in_project.html.erb | 4 ++++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/app/models/mailer.rb b/app/models/mailer.rb
index 14c01b93d..b404ea531 100644
--- a/app/models/mailer.rb
+++ b/app/models/mailer.rb
@@ -31,10 +31,11 @@ class Mailer < ActionMailer::Base
   # 发送邀请未注册用户加入项目邮件
   # 功能： 在加入项目的同时自动注册用户
   def  send_invite_in_project(email, project, invitor)
+    @email = email
     @subject = "#{invitor.name} #{l(:label_invite_project)} #{project.name} "
-    password = newpass(6)
+    @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/views/mailer/send_invite_in_project.html.erb b/app/views/mailer/send_invite_in_project.html.erb
index 980adc12d..6dbfcbda6 100644
--- a/app/views/mailer/send_invite_in_project.html.erb
+++ b/app/views/mailer/send_invite_in_project.html.erb
@@ -6,6 +6,10 @@
 		<span style="float: left; width: 526px">
         	<p><%= @subject %> </p>
            <p> <%= link_to @project_url, @project_url%></p>
+          <p>点击链接后，将自动为您注册账号</p>
+          <p>您的账号为:<%= @email %></p>
+          <p>密码为： <%= @password %></p>
+
         </span>
     </li>
 

From 6cf7e156d15d24f234561bae793dfe5e4ae5edc9 Mon Sep 17 00:00:00 2001
From: alan <547533434@qq.com>
Date: Sat, 7 Mar 2015 11:35:57 +0800
Subject: [PATCH 2/4] Signed-off-by: alan <547533434@qq.com>

---
 app/controllers/projects_controller.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 1428b4997..6ab757336 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -249,7 +249,7 @@ class ProjectsController < ApplicationController
   # Author lizanle
   # Description  项目动态展示方法，删除了不必要的代码
   def show
-=begin
+
     # 试图跳转到请求的按钮
     if params[:login]
       login = params[:login]
@@ -265,7 +265,7 @@ class ProjectsController < ApplicationController
     if params[:jump] && redirect_to_project_menu_item(@project, params[:jump])
       return
     end
-
+=begin
     cond = @project.project_condition(Setting.display_subprojects_issues?)
     has = {
       "show_issues" => true ,

From e8bdc13f24e7263375b0cf6afbd2b6d8f5de03e1 Mon Sep 17 00:00:00 2001
From: lizanle <491823689@qq.com>
Date: Sat, 7 Mar 2015 12:25:42 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E7=BC=BA=E9=99=B71975=EF=BC=8C=E6=89=93?=
 =?UTF-8?q?=E5=BC=80project=20330=E7=9A=84=E6=97=B6=E5=80=99=E6=8A=A5?=
 =?UTF-8?q?=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/projects/show.html.erb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/views/projects/show.html.erb b/app/views/projects/show.html.erb
index 6a47f07f0..37c7a81a7 100644
--- a/app/views/projects/show.html.erb
+++ b/app/views/projects/show.html.erb
@@ -21,7 +21,8 @@
   <div class="scroll">
     <% unless @events_pages.empty? %>
     <% @events_pages.each do |e| -%>
-      <% act = e.forge_act %>
+      <% act = e.forge_act;
+         next if act.nil? %>
       <% if e.forge_act_type == "Issue" %>
       <div class="activity-item underline-evreycontent" style="font-size: 14px;line-height:1.5em;width: 100%;word-wrap: break-word;word-break: break-all;margin-top: 10px;">
         <div class="activity-avatar" style="float: left; margin:3px; height: 100%;">

From 77f81ac171e088952e50f8279751da6cd7fb1ea3 Mon Sep 17 00:00:00 2001
From: lizanle <491823689@qq.com>
Date: Sat, 7 Mar 2015 14:32:34 +0800
Subject: [PATCH 4/4] =?UTF-8?q?kaminari=E5=88=86=E9=A1=B5=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config/initializers/kaminari_config.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/config/initializers/kaminari_config.rb b/config/initializers/kaminari_config.rb
index 2ae42e414..5505662f3 100644
--- a/config/initializers/kaminari_config.rb
+++ b/config/initializers/kaminari_config.rb
@@ -23,10 +23,10 @@
 Kaminari.configure do |config|
   # config.default_per_page = 25
   # config.max_per_page = nil
-  # config.window = 4
+   config.window = 2
   # config.outer_window = 3
-  # config.left = 0
-  # config.right = 0
+  # config.left = 2
+  # config.right = 2
   # config.page_method_name = :page
   # config.param_name = :page
 end