Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh

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 ,

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
 

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>
 

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%;">

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.left = 2
-  # config.right = 0
+  # config.right = 2
   # config.page_method_name = :page
   # config.param_name = :page
 end