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

11 years ago · c0f0e294e5
parent beeab518e8 0717148a0a
commit c0f0e294e5
2 changed files with 4 additions and 4 deletions
--- a/app/models/user_score.rb
+++ b/app/models/user_score.rb
@ -53,7 +53,7 @@ class UserScore < ActiveRecord::Base
    user_score = current_user.user_score_attr
    user_grade = nil   #项目个人得分
    project = obj.project
-    unless project.nil? && project.project_type == 0
+    unless project.nil?
        user_grade = UserGrade.find_by_user_id_and_project_id(current_user.id, project.id)
        if user_grade.nil?
           user_grade = UserGrade.create(:user_id => current_user.id,:project_id => project.id)
@ -178,7 +178,7 @@ class UserScore < ActiveRecord::Base
    current_user_grade = nil   #项目个人得分
    target_user_grade = nil
    project = obj.project
-    unless project.nil? && project.project_type == 0
+    unless project.nil?
      current_user_grade = UserGrade.find_by_user_id_and_project_id(current_user.id, project.id)
      target_user_grade = UserGrade.find_by_user_id_and_project_id(target_user.id, project.id)
      if current_user_grade.nil?
@ -285,7 +285,7 @@ class UserScore < ActiveRecord::Base
    user_score = current_user.try(:user_score_attr)
    user_grade = nil   #项目个人得分
    project = obj.project
-    unless project.nil? && project.project_type == 0
+    unless project.nil?
      user_grade = UserGrade.find_by_user_id_and_project_id(current_user.id, project.id)
      if user_grade.nil?
        user_grade = UserGrade.create(:user_id => current_user.id,:project_id => project.id)
--- a/app/views/layouts/base_users.html.erb
+++ b/app/views/layouts/base_users.html.erb
@ -35,7 +35,7 @@

 	</head>
    <!--加上 onload="Javascript:t()" 开始定时刷新分数 -->
-	<body class="<%= h body_css_classes %>" onload="Javascript:t()">
+	<body class="<%= h body_css_classes %>">
 		<div id="wrapper">
 			<div id="wrapper2">
 				<div id="wrapper3">