@@ -32,6 +32,15 @@ function change_option(flag) {
<%= form_tag({:controller => 'code_review', :action=>'index', :id => @project}, :id => 'optionform') do %>
<%= check_box_tag 'show_closed', 'true', @show_closed, :onchange => "change_option($('#show_closed').is(':checked'));"%> <%=h l(:label_show_closed_reviews) %>
+
<% end %>
<%# observe_field 'show_closed', :with => 'show_closed', :update => 'content' %>
From 378c06379ea7a7ce06d2ed6b231ca5e6c5af288a Mon Sep 17 00:00:00 2001
From: z9hang
Date: Sat, 16 Aug 2014 16:28:35 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=96=87=E6=A1=A3?=
=?UTF-8?q?=E5=BE=97=E5=88=86=E8=AE=A1=E7=AE=97=E9=94=99=E8=AF=AF=E9=97=AE?=
=?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/controllers/application_controller.rb | 2 +-
app/helpers/project_score_helper.rb | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 178a82d17..4f731e580 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -279,7 +279,7 @@ class ApplicationController < ActionController::Base
# Find project of id params[:id]
def find_project
- @project = Project.find(params[:id])
+ @project = Project.find_by_id(params[:id])
rescue ActiveRecord::RecordNotFound
render_404
end
diff --git a/app/helpers/project_score_helper.rb b/app/helpers/project_score_helper.rb
index 07b0ee921..bdb070cc2 100644
--- a/app/helpers/project_score_helper.rb
+++ b/app/helpers/project_score_helper.rb
@@ -16,7 +16,7 @@ module ProjectScoreHelper
end
#文档数量
- def document_num project
+ def documents_num project
project.documents.count
end
@@ -48,8 +48,8 @@ module ProjectScoreHelper
end
#文档得分
- def document_score project
- d_num = document_num project
+ def documents_score project
+ d_num = documents_num(project)
d_num * 4
end
@@ -67,7 +67,7 @@ module ProjectScoreHelper
#计算项目得分
def project_scores project
- result = (issue_score project) + (news_score project) + (document_score project) + (changesets_score project) + (board_message_score project)
+ result = (issue_score project) + (news_score project) + (documents_score project) + (changesets_score project) + (board_message_score project)
pss = ProjectScore.where("project_id = '#{project.id}'")
if pss.nil? || pss.count == 0
ps = ProjectScore.new
From 4f0817a14693df9e9114f39921bab0319d364b21 Mon Sep 17 00:00:00 2001
From: linhk <304431313@.com>
Date: Sat, 16 Aug 2014 17:02:37 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E9=A1=B9=E7=9B=AE--=E6=96=87=E6=A1=A3--?=
=?UTF-8?q?=E6=96=87=E4=BB=B6--=E4=BB=A3=E7=A0=81=E8=AF=84=E5=AE=A1=20?=
=?UTF-8?q?=E4=B8=AD=E7=94=A8=E6=88=B7=E5=A4=B4=E5=83=8F=E6=98=BE=E7=A4=BA?=
=?UTF-8?q?=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/helpers/application_helper.rb | 2 ++
app/views/layouts/base_projects.html.erb | 2 +-
.../redmine_code_review/app/views/code_review/_reply.html.erb | 3 ++-
.../redmine_code_review/app/views/code_review/_show.html.erb | 3 ++-
4 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 4d8b53e3c..7f38d8db9 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -1442,6 +1442,8 @@ module ApplicationHelper
email = $1
end
return gravatar(email.to_s.downcase, options) unless email.blank? rescue nil
+ #options ={"class" => ["avatar2"],"width" =>["80px"],"height" =>["80px"]}
+ #return image_tag url_to_avatar(user), options
else
''
end
diff --git a/app/views/layouts/base_projects.html.erb b/app/views/layouts/base_projects.html.erb
index eea7a0f61..9edc803a2 100644
--- a/app/views/layouts/base_projects.html.erb
+++ b/app/views/layouts/base_projects.html.erb
@@ -50,7 +50,7 @@