From 3690bf79f4d12aba8fee26be0761f1f911f60861 Mon Sep 17 00:00:00 2001 From: z9hang Date: Wed, 4 Jun 2014 09:31:16 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=B8=AA=E4=BA=BA?= =?UTF-8?q?=E5=8A=A8=E6=80=81=E4=B8=AD=E7=95=99=E8=A8=80=E4=BA=BA=E9=93=BE?= =?UTF-8?q?=E6=8E=A5=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/users/show.html.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb index eae28e856..58974aad2 100644 --- a/app/views/users/show.html.erb +++ b/app/views/users/show.html.erb @@ -53,13 +53,13 @@ <% if User.current.login == @user.login %> <%# if e.user_id == act.jour.id %> <%= link_to("#{l(:label_i)}", user_path(e.user_id)) %> <%= l(:label_have_feedback) %><%= - link_to("#{e.act.user.name}", user_path(e.user.id)) %><%= l(:label_of_feedback) + l(:label_layouts_feedback) %> + link_to("#{e.act.user.name}", user_path(e.act.user.id)) %><%= l(:label_of_feedback) + l(:label_layouts_feedback) %> <%# else %> <%# end %> <% else %> <%= link_to("#{e.user.name}", user_path(e.user_id)) %> <%= l(:label_have_feedback) %><%= - link_to("#{e.act.user.name}", user_path(e.user.id)) %><%= l(:label_of_feedback) + l(:label_layouts_feedback) %> + link_to("#{e.act.user.name}", user_path(e.act.user.id)) %><%= l(:label_of_feedback) + l(:label_layouts_feedback) %> <% end %>

<%= textilizable act.notes %>

From 51bfb6cae8776f5e29839de2c9b8665247fadb93 Mon Sep 17 00:00:00 2001 From: yanxd Date: Wed, 4 Jun 2014 10:08:54 +0800 Subject: [PATCH 2/2] user model save bug --- app/models/user.rb | 8 +-- app/models/{user_scores.rb => user_score.rb} | 72 ++++++++++---------- 2 files changed, 39 insertions(+), 41 deletions(-) rename app/models/{user_scores.rb => user_score.rb} (96%) diff --git a/app/models/user.rb b/app/models/user.rb index ddf40a827..aef29f18e 100644 --- a/app/models/user.rb +++ b/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 diff --git a/app/models/user_scores.rb b/app/models/user_score.rb similarity index 96% rename from app/models/user_scores.rb rename to app/models/user_score.rb index c939a20ff..f383d6670 100644 --- a/app/models/user_scores.rb +++ b/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