diff --git a/Gemfile b/Gemfile index bb94100a5..250176066 100644 --- a/Gemfile +++ b/Gemfile @@ -57,7 +57,7 @@ group :development do gem 'grape-swagger' gem 'better_errors', '~> 1.1.0' # gem "query_reviewer" - # gem 'rack-mini-profiler', '~> 0.9.3' + gem 'rack-mini-profiler', '~> 0.9.3' if RUBY_PLATFORM =~ /w32/ gem 'win32console' end diff --git a/app/controllers/repositories_controller.rb b/app/controllers/repositories_controller.rb index ca5d7040e..12e41a83a 100644 --- a/app/controllers/repositories_controller.rb +++ b/app/controllers/repositories_controller.rb @@ -365,41 +365,41 @@ update render_403 return end + # 获取版本库目录结构 @entries = @repository.entries(@path, @rev) - @changeset = @repository.find_changeset_by_name(@rev) if request.xhr? @entries ? render(:partial => 'dir_list_content') : render(:nothing => true) else @changesets = @g.commits(@project.gpid, :ref_name => @rev) + # 最近一次提交 + @changesets_latest_coimmit = @changesets[0] g_project = @g.project(@project.gpid) # 总的提交数 @changesets_all_count = @g.user_static(@project.gpid, :rev => @rev).count - # @changesets_all_count = @project.gpid.nil? ? 0 : commit_count(@project, @rev) + + # 获取默认分支 @g_default_branch = g_project.default_branch.nil? ? "master" : g_project.default_branch - # 访问该页面的是会后则刷新 - if @project.project_score.nil? + + # 访问版本庫后更新project_score表数据;changeset_num为提交总数 + project_score = @project.project_score + if project_score.nil? ProjectScore.create(:project_id => @project.id, :score => false) - end - # 刷新改页面的时候,更新统计数 - if @changesets_all_count != @project.project_score.changeset_num && @changesets_all_count != 0 - update_commits_count(@project, @changesets_all_count) + else + project_score.update_column(:changeset_num, @changesets_all_count) end - # 最近一次提交 - @changesets_latest_coimmit = @changesets[0] - unless @changesets_latest_coimmit.blank? - update_commits_date(@project, @changesets_latest_coimmit) - end - @creator = User.where("id =?", @project.user_id).first.try(:login) - # @properties = @repository.properties(@path, @rev) - # @repositories = @project.repositories - # project_path_cut = RepositoriesHelper::PROJECT_PATH_CUT - # ip = RepositoriesHelper::REPO_IP_ADDRESS + # unless @changesets_latest_coimmit.blank? + # update_commits_date(@project, @changesets_latest_coimmit) + # end + @creator = @project.owner.to_s gitlab_address = Redmine::Configuration['gitlab_address'] + # REDO:需优化,仅测试用 @zip_path = Gitlab.endpoint.to_s + "/projects/" + @project.gpid.to_s + "/repository/archive?&private_token=" + Gitlab.private_token + + # 获取版本库路径,主要分为两种,一种随Gitlab类型,另一种为Git类型,Git类型为无用数据,最终需要删掉这种类型。 if @repository.type.to_s == "Repository::Gitlab" - @repos_url = gitlab_address.to_s+"/"+@project.owner.to_s+"/"+@repository.identifier+"."+"git" + @repos_url = gitlab_address.to_s+"/" + @creator + "/" + @repository.identifier+"."+"git" else @repos_url = "http://"+@repository.login.to_s+"_"+@repository.identifier.to_s+"@"+ip.to_s + @repository.url.slice(project_path_cut, @repository.url.length).to_s end diff --git a/app/views/repositories/_navigation.html.erb b/app/views/repositories/_navigation.html.erb index d99df5ed1..bf7c19879 100644 --- a/app/views/repositories/_navigation.html.erb +++ b/app/views/repositories/_navigation.html.erb @@ -21,9 +21,9 @@ <%= select_tag :branch, options_for_select(@repository.branches, @rev), :id => 'branch' %> <% end -%> - <% if !@repository.tags.nil? && @repository.tags.length > 0 -%> - <%= select_tag :tag, options_for_select([''] + @repository.tags, @rev), :id => 'tag', :style=>" display:none" %> - <% end -%> + <%# if !@repository.tags.nil? && @repository.tags.length > 0 -%> + <%#= select_tag :tag, options_for_select([''] + @repository.tags, @rev), :id => 'tag', :style=>" display:none" %> + <%# end -%> <% if @repository.supports_all_revisions? %> <%= hidden_field_tag 'rev', @rev, :size => 8 %> diff --git a/app/views/repositories/show.html.erb b/app/views/repositories/show.html.erb index 05f25822b..f4a50dfb9 100644 --- a/app/views/repositories/show.html.erb +++ b/app/views/repositories/show.html.erb @@ -1,17 +1,11 @@ -<%= call_hook(:view_repositories_show_contextual, {:repository => @repository, :project => @project}) %> +<%#= call_hook(:view_repositories_show_contextual, {:repository => @repository, :project => @project}) %>

<%= render :partial => 'breadcrumbs', :locals => {:path => @path, :kind => 'dir', :revision => @rev} %>

<% unless @entries.nil? %> ZIP下载 - <%# if is_project_manager?(User.current, @project.id) && QualityAnalysis.where(:project_id => @project.id).first.nil? %> - <%# if User.current.member_of?(@project) %> <% if quality_analysis(User.current.try(:login), @repository.id).nil? && User.current.member_of?(@project) && @project.is_public? %> <%= link_to "质量分析", quality_analysis_path(:id => @project.id, :repository_id => @repository.identifier, :rev => @rev, :default_branch => @g_default_branch ), :remote => true, :class => "btn_zipdown fr" %> <% end %> - <%# end %> - <%# else %> - <%#= link_to "质量分析", project_quality_analysis_path(:project_id => @project.id, :resource_id => @proje), :class => "btn_zipdown fr" %> - <%# end %> <% end %>
@@ -23,29 +17,29 @@ 该版本库还没有上传代码!
<% end %> - <% if @repository.type.to_s=="Repository::Gitlab" %> + <% if @repository.type.to_s == "Repository::Gitlab" %> 版本库地址:<%= @repos_url %> <% else %> 版本库地址:<%= h @repository.url %> <% end %> -
<% else %> <%= render :partial => 'navigation' %>
克隆网址:
- +
<%=link_to "代码统计", stats_repository_project_path(:id => @project.id, :repository_id => @repository.identifier, :rev => @rev, :creator => @creator, :default_branch => @g_default_branch ), :class => "fl vl_zip" %>
- <%# 针对公开项目:用户必须创建了项目,否则用户无法同步 %> + <% if User.current.id != @project.user_id %>
<%= link_to "".html_safe+"Fork", {:controller => 'repositories', :action => 'forked'}, :class=>"vl_btn", :target => "_blank", :confirm=>"平台将为您创建一个新的同名项目和版本库,请问是否继续?" %> <%= @project.forked_count.to_i %>
<% end %>
+
<% if @changesets && !@changesets.empty? %> <% if !user_commit_rep(@changesets_latest_coimmit.author_email).nil? %> @@ -77,7 +71,7 @@ <%# 数据统计 %> <%#= render :partial => 'summary' %> <%# end %> - <%= render :partial => 'dir_list' %> + <%#= render :partial => 'dir_list' %> <% end %> <%#= render_properties(@properties) %> @@ -87,8 +81,8 @@ 如何提交代码
-<% content_for :header_tags do %> - <%= stylesheet_link_tag "scm" %> -<% end %> +<%# content_for :header_tags do %> + <%#= stylesheet_link_tag "scm" %> +<%# end %> <% html_title(l(:label_repository)) -%>