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

app/models/user.rb

@@ -86,8 +86,6 @@ class User < Principal
 ## added by xianbo for delete 
   has_many :biding_projects, :dependent => :destroy
   has_many :contesting_projects, :dependent => :destroy
-  has_many :contesting_softapplications, :dependent => :destroy
-  has_many :projecting_softapplications, :dependent => :destroy
   belongs_to :softapplication, :foreign_key => 'id', :dependent => :destroy
 ##ended by xianbo
   
@@ -203,14 +201,14 @@ class User < Principal
   # ======================================================================
   # 集中处理 User 扩展表为空的问题
   validate :valid_user_extensions
-  before_save :save_user_extensions
+  after_save :save_user_extensions
 
   def extensions
-    self.user_extensions ||= self.create_user_extensions
+    self.user_extensions ||= UserExtensions.new
   end
 
   def respond_to?(m, include_private = false)
-    flag = extensions.respond_to? m.to_sym
+    flag = UserExtensions.instance_methods.include? m.to_sym
     if flag
       flag
     else

app/models/user_score.rb

@@ -1,36 +1,36 @@
-# Redmine - project management software
-# Copyright (C) 2006-2013  Jean-Philippe Lang
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
-class UserScore < ActiveRecord::Base
-  belongs_to :user
-
-  def self.find_max_file
-    self.maximum(:file)
-  end
-  
-  def self.find_min_file
-    self.minimum(:file)
-  end
-  
-  def self.find_max_issue
-    self.maximum(:issue)
-  end
-  
-  def self.find_min_issue
-    self.minimum(:file)
-  end
-end
+# Redmine - project management software
+# Copyright (C) 2006-2013  Jean-Philippe Lang
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+class UserScore < ActiveRecord::Base
+  belongs_to :user
+
+  def self.find_max_file
+    self.maximum(:file)
+  end
+  
+  def self.find_min_file
+    self.minimum(:file)
+  end
+  
+  def self.find_max_issue
+    self.maximum(:issue)
+  end
+  
+  def self.find_min_issue
+    self.minimum(:file)
+  end
+end

app/views/users/show.html.erb

@@ -53,13 +53,13 @@
 	<% if User.current.login == @user.login %>
 		<%# if e.user_id == act.jour.id %>
                               <tr><td colspan="2" valign="top"><strong><%= link_to("#{l(:label_i)}", user_path(e.user_id)) %></strong>&nbsp;<span class="font_lighter"><%= l(:label_have_feedback) %><%=
-                                  link_to("#{e.act.user.name}", user_path(e.user.id)) %><%= l(:label_of_feedback) + l(:label_layouts_feedback)  %></span></td></tr>
+                                  link_to("#{e.act.user.name}", user_path(e.act.user.id)) %><%= l(:label_of_feedback) + l(:label_layouts_feedback)  %></span></td></tr>
 		<%# else %>
 						<!-- <tr><td colspan="2" valign="top" class="font_lighter"><strong><%#= link_to("#{e.user.name}", user_path(e.user_id)) %> 给 <%#= link_to("#{act.at_user.name if act.at_user}", user_path(act.jour.id)) %> 留言了</strong>&nbsp;</td></tr> -->
 		<%# end %>
 	<% else %>
                               <tr><td colspan="2" valign="top"><strong><%= link_to("#{e.user.name}", user_path(e.user_id)) %></strong>&nbsp;<span class="font_lighter"><%= l(:label_have_feedback) %><%=
-                                  link_to("#{e.act.user.name}", user_path(e.user.id)) %><%= l(:label_of_feedback) + l(:label_layouts_feedback)  %></span></td></tr>
+                                  link_to("#{e.act.user.name}", user_path(e.act.user.id)) %><%= l(:label_of_feedback) + l(:label_layouts_feedback)  %></span></td></tr>
 	<% end %>
                           <tr>
                             <td colspan="2" width="580"><p class="font_description"> <%= textilizable act.notes %> </p>