From 83486c745e4b833af29114297b026a6ede7891f3 Mon Sep 17 00:00:00 2001 From: huang Date: Mon, 2 Nov 2015 15:04:17 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E5=A6=82=E6=9E=9C=E6=B2=A1=E6=9C=89?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=89=88=E6=9C=AC=E5=BA=93=EF=BC=8C=E7=82=B9?= =?UTF-8?q?=E5=87=BB=E9=93=BE=E6=8E=A5=E8=B7=B3=E8=87=B3=E9=85=8D=E7=BD=AE?= =?UTF-8?q?--=E6=96=B0=E5=A2=9E=202=E3=80=81=E5=B7=B2=E5=88=9B=E5=BB=BA?= =?UTF-8?q?=E8=BF=87gitlab=E9=A1=B9=E7=9B=AE=E5=88=99=E8=B7=B3=E8=87=B3git?= =?UTF-8?q?lab=20=E7=89=88=E6=9C=AC=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/repositories_controller.rb | 10 +- app/helpers/application_helper.rb | 6 + app/helpers/projects_helper.rb | 6 - .../projects/_development_group.html.erb | 8 +- .../settings/_new_repositories.html.erb | 129 +++++++++--------- 5 files changed, 84 insertions(+), 75 deletions(-) diff --git a/app/controllers/repositories_controller.rb b/app/controllers/repositories_controller.rb index 8a1b3bbe0..e05e79205 100644 --- a/app/controllers/repositories_controller.rb +++ b/app/controllers/repositories_controller.rb @@ -215,11 +215,11 @@ update end end - unless @repository.gitlab? - # redirect_to to_gitlab_project_repository_path(@project, @repository) - render :to_gitlab - return - end + # unless @repository.gitlab? + # # redirect_to to_gitlab_project_repository_path(@project, @repository) + # render :to_gitlab + # return + # end #if( !User.current.member_of?(@project) || @project.hidden_repo) @repository.fetch_changesets if Setting.autofetch_changesets? && @path.empty? diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 84364b4f6..01b126c26 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -609,6 +609,12 @@ module ApplicationHelper return @result end + # 判断版本库是否初始为gitlab + def rep_is_gitlab?(project) + rep = Repository.where("project_id =? and type =?", project, "Repository::Gitlab") + return rep.blank? ? true :false + end + # 判断当前用户是否为项目管理员 def is_project_manager?(user_id, project_id) @result = false diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb index 90ddca99f..48766813c 100644 --- a/app/helpers/projects_helper.rb +++ b/app/helpers/projects_helper.rb @@ -117,12 +117,6 @@ module ProjectsHelper end end - # 判断版本库是否初始为gitlab - def rep_is_gitlab?(project) - rep = Repository.where("project_id =? and type =?", project, "Repository::Gitlab") - return rep.blank? ? true :false - end - # 获取新增gitlab版本库 def rep_gitlab(project) rep = Repository.where("project_id =? and type =?", project, "Repository::Gitlab") diff --git a/app/views/projects/_development_group.html.erb b/app/views/projects/_development_group.html.erb index e6ba39aa3..67867ffbf 100644 --- a/app/views/projects/_development_group.html.erb +++ b/app/views/projects/_development_group.html.erb @@ -41,10 +41,14 @@ <%# --版本库被设置成私有、module中设置不显示、没有创建版本库 三种情况不显示-- %> <% if visible_repository?(@project) %>
- <%= link_to l(:project_module_repository), {:controller => 'repositories', :action => 'show', :id => @project.id, to: 'gitlab'}, :class => "f14 c_blue02" %> + <% if rep_is_gitlab?(@project) %> + <%= link_to l(:project_module_repository), {:controller => 'projects', :action => 'settings', :id => @project.id, :tab=>'repositories'}, :class => "f14 c_blue02" %> + <% else %> + <%= link_to l(:project_module_repository), {:controller => 'repositories', :action => 'show', :id => @project.id }, :class => "f14 c_blue02" %> + <% end %> (<%= @project.repositories.count %>) <% if (User.current.admin? || User.current.allowed_to?({:controller => 'projects', :action => 'settings'}, @project)) && rep_is_gitlab?(@project) %> - <%= link_to "+"+l(:project_module_create_repository), url_for(:controller => 'projects', :action => 'settings', :id => @project.id,:tab=>'repositories') , :class => "subnav_green" %> + <%= link_to "+"+l(:project_module_create_repository), url_for(:controller => 'projects', :action => 'settings', :id => @project.id, :tab=>'repositories') , :class => "subnav_green" %> <% end %>
<% end %> diff --git a/app/views/projects/settings/_new_repositories.html.erb b/app/views/projects/settings/_new_repositories.html.erb index c6ddb9fca..1eeb571cf 100644 --- a/app/views/projects/settings/_new_repositories.html.erb +++ b/app/views/projects/settings/_new_repositories.html.erb @@ -7,74 +7,79 @@ <%= str = error_messages_for 'repository' %> <% project_path_cut = RepositoriesHelper::PROJECT_PATH_CUT %> <% ip = RepositoriesHelper::REPO_IP_ADDRESS %> -<% if @project.repositories.any? %> - <%= render :partial => 'projects/settings/rep_gitlab', :locals => {:project => @project, :ip => "ip", :project_path_cut => "project_path_cut" } %> - <%#= render :partial => 'projects/settings/rep_forge', :locals => {:project => @project, :ip => "ip", :project_path_cut => "project_path_cut" } %> -
历史版本库
- - - <% rep_forge(@project).sort.each do |repository| %> - - + <%else %> + + <% end %> + + <% end %> + +
+<%# 新建版本库 %> +
+ <% if @project.repositories.count == 0 || rep_is_gitlab?(@project) %> + + + <% course_tag = @project.project_type %> + <% if User.current.allowed_to?(:manage_repository, @project) %> + + <%= link_to l(:label_repository_new_repos),"#" , :onclick=>"pro_st_show_ku();", :class => 'c_blue fl' %>

+ <% end %> + +
+ + <%= labelled_form_for :repository, @repository, :url =>project_repositories_path(@project),:html => {:id => 'repository-form',:method=>"post",:autocomplete=>'off'} do |f| %> +
+
    +
  • + + <%= select_tag('repository_scm', + options_for_select(["Git"],@repository.class.name.demodulize), + :data => {:remote => true, :method => 'get'})%> + <% if @repository && ! @repository.class.scm_available %> + <%= l(:text_scm_command_not_available) %> + <% end %> +
    • +
  • + + + + <%= f.text_field :identifier, :disabled =>@repository.nil? || @repository.identifier_frozen? ? true:false,:label=>"", :no_label => true %> + <% unless @repository.identifier_frozen? %> + <%=l(:text_length_between,:min=>1,:max=>254)< + <% end %> +
    • +
    +
+ <%=l(:button_save)%> + <%=l(:button_cancel)%> +
+ <% end %> + + <% end %> +
+ + <% if @project.repositories.any? %> + <%= render :partial => 'projects/settings/rep_gitlab', :locals => {:project => @project, :ip => "ip", :project_path_cut => "project_path_cut" } %> + <%#= render :partial => 'projects/settings/rep_forge', :locals => {:project => @project, :ip => "ip", :project_path_cut => "project_path_cut" } %> +
历史版本库
+ + + <% rep_forge(@project).sort.each do |repository| %> + + - - <%if repository.scm_name=="Git"%> - + <%if repository.scm_name=="Git"%> + - <%else %> - - <% end %> - - <% end %> - -
<%= repository.identifier %><%=h repository.scm_name %><%=h repository.scm_name %> <%=truncate( 'http://' << repository.login.to_s << '_'<< repository.identifier.to_s << '@'<< ip.to_s << h( repository.url.slice(project_path_cut, repository.url.length)),:length=>60) %> - <%=h truncate(repository.url,:length=>10) %>
-<% else %> -

<%= l(:label_repository_no_data) %>

-<% end %> + 		<%=h truncate(repository.url,:length=>10) %>
+ <% else %> +

<%= l(:label_repository_no_data) %>

+ <% end %> -<%# 新建版本库 %> -<% if @project.repositories.count == 0 || rep_is_gitlab?(@project) %> - - - <% course_tag = @project.project_type %> - <% if User.current.allowed_to?(:manage_repository, @project) %> - - <%= link_to l(:label_repository_new_repos),"#" , :onclick=>"pro_st_show_ku();", :class => 'c_blue fl' %>

- <% end %> - -
- <%= labelled_form_for :repository, @repository, :url =>project_repositories_path(@project),:html => {:id => 'repository-form',:method=>"post",:autocomplete=>'off'} do |f| %> -
- - <%=l(:button_save)%> - <%=l(:button_cancel)%> -
- <% end %> -<% end %>