diff --git a/app/controllers/contributions_controller.rb b/app/controllers/contributions_controller.rb index cba11358f..768d73d9a 100644 --- a/app/controllers/contributions_controller.rb +++ b/app/controllers/contributions_controller.rb @@ -29,7 +29,7 @@ class InvalidRevisionParam < Exception; end class ContributionsController < ApplicationController include ApplicationHelper - menu_item :repository + menu_item :contribution menu_item :settings, :only => [:new, :create, :edit, :update, :destroy, :committers] default_search_scope :changesets @@ -537,7 +537,7 @@ update # update_commits_date(@project, @changesets_latest_coimmit) # end - render :layout => 'base_projects' + render :action => 'show', :layout => 'base_projects' end end diff --git a/app/controllers/repositories_controller.rb b/app/controllers/repositories_controller.rb index 2ce1f6c23..0157414e4 100644 --- a/app/controllers/repositories_controller.rb +++ b/app/controllers/repositories_controller.rb @@ -537,7 +537,7 @@ update update_commits_date(@project, @changesets_latest_coimmit) end - render :action => 'show', :layout => 'base_projects' + render :layout => 'base_projects' end end diff --git a/app/views/contributions/show.html.erb b/app/views/contributions/show.html.erb index 32860cad6..393014731 100644 --- a/app/views/contributions/show.html.erb +++ b/app/views/contributions/show.html.erb @@ -1,70 +1,2 @@ -
-
- -
-
- <%= render :partial => 'navigation' %> -
- ZIP下载 - <% if !@entries.blank? && User.current.member_of?(@project) && @project.is_public? %> - <% if quality_analysis(User.current.try(:login), @repository.id).nil? %> - <%= link_to "质量分析", quality_analysis_path(:id => @project.id, :repository_id => @repository.identifier, :rev => @rev, :default_branch => @g_default_branch, :type => "1"), :remote => true, :class => "btn_zipdown fl ml10" %> - <% else %> - <%= link_to "重新分析", quality_analysis_path(:id => @project.id, :repository_id => @repository.identifier, :rev => @rev, :default_branch => @g_default_branch, :type => "2"), :remote => true, :class => "btn_zipdown fl ml10" %> - <% end %> - <% end %> - <% unless QualityAnalysis.where(:project_id => @project.id).first.nil? %> - <%= link_to "代码分析结果", project_quality_analysis_path(:project_id => @project.id), :class => "btn_zipdown fl ml10" %> - <% end %> -
- - - -
-
- -
- <%= render :partial => 'latest_commit' %> -
- - <% if !@entries.blank? && authorize_for('repositories', 'browse') %> - <%= render :partial => 'dir_list' %> - <% else %> - <%= render :partial => "projects/no_data" %> - <% end %> - - <% memo = Memo.where(:id => 1232).first %> - <% unless memo.nil? %> - <%=Setting.host_name %>/forums/1/memos/1232" class="linkBlue2" target="_blank">如何提交代码 - <% end %> - <% unless @entries.blank? %> -
- 导出统计结果: - <%= link_to "最近一周", {:controller => 'repositories', :action => 'export_rep_static', :format => 'xls', :rev => @rev, :cycle => "week" }, :class => "linkBlue2" %> | - <%= link_to "最近一月", {:controller => 'repositories', :action => 'export_rep_static', :format => 'xls', :rev => @rev, :cycle => "month" }, :class => "linkBlue2" %> -
-
- <% end %> - <%#= link_to "导出excel", {:controller => 'repositories', :action => 'export_rep_static', :rev => @rev}, :format => 'xls' %> - -
-
-<%# content_for :header_tags do %> -<%#= stylesheet_link_tag "scm" %> -<%# end %> - -<% html_title(l(:label_repository)) -%> +<% html_title(l(:label_contribution)) -%>