Merge remote-tracking branch 'origin/szzh' into szzh

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

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

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
+  def documents_score project
-    d_num = document_num 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

plugins/redmine_code_review/app/views/code_review/_reply.html.erb

@@ -20,7 +20,8 @@
 
         <%= authoring reply.created_on, reply.user %>.
        </p>
-  <%= avatar(reply.user, :size => "32") %>
+  <%= image_tag(url_to_avatar(reply.user), :class => 'avatar2', :width=>32, :height=>32) %>
+  <%#= avatar(reply.user, :size => "32") %>
     <ul>
     <% for detail in reply.details %>
        <li><%= show_detail(detail) %></li>

plugins/redmine_code_review/app/views/code_review/_show.html.erb

@@ -62,7 +62,8 @@
 
       <!-- author and creation time -->
       <p class="author">
-        <%= avatar(@review.user, :size => "64") %>
+        <%= image_tag(url_to_avatar(@review.user), :class => 'avatar2', :width=>64, :height=>64) %>
+        <%#= avatar(@review.user, :size => "64") %>
         <br />
         <%= authoring @review.created_at, @review.user %>.
         <%= l(:label_updated_time, distance_of_time_in_words(Time.now, @review.updated_at)) + '.' if @review.created_at != @review.updated_at %>

plugins/redmine_code_review/app/views/code_review/index.html.erb

@@ -19,8 +19,8 @@
 
 <script>
 function change_option(flag) {
-  var url = "<%= raw url_for(:controller => 'code_review', :action=>'index', :id => @project) %>";
+ // var url = "<%= raw url_for(:controller => 'code_review', :action=>'index', :id => @project) %>";
-  $('#content').load(url, {'show_closed': flag});
+ // $('#content').load(url, {'show_closed': flag});
 }
 </script>
 <div id="code_review_list">
@@ -32,6 +32,15 @@ function change_option(flag) {
     <p>
       <%= 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) %>
+      <script type="text/javascript">
+           $(document).ready(function (){
+
+               $("#optionform").change(function(){
+                   $("#optionform").submit();
+               });
+           });
+
+      </script>
       <% end %>
       <%# observe_field 'show_closed', :with => 'show_closed', :update => 'content' %>
     </p>