From 7c4759f3b7f1b19e8c2059059c3cefbc42c2c798 Mon Sep 17 00:00:00 2001 From: huang Date: Mon, 1 Aug 2016 15:52:05 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=B7=A6=E4=BE=A7?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0pull=20request=E5=85=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/pull_rquests_controller.rb | 3 ++- app/views/projects/_development_group.html.erb | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app/controllers/pull_rquests_controller.rb b/app/controllers/pull_rquests_controller.rb index 2fcdf79df..c3f7c2925 100644 --- a/app/controllers/pull_rquests_controller.rb +++ b/app/controllers/pull_rquests_controller.rb @@ -1,5 +1,5 @@ class PullRquestsController < ApplicationController - before_filter :find_project + before_filter :find_project_and_repository layout "base_projects" def index @@ -12,6 +12,7 @@ class PullRquestsController < ApplicationController def find_project @project = Project.find(params[:project_id]) + @repository = Repository.where(:project_id => @project.id, :type => "Repository::Gitlab") rescue ActiveRecord::RecordNotFound render_404 end diff --git a/app/views/projects/_development_group.html.erb b/app/views/projects/_development_group.html.erb index a218e368d..0647fcd1e 100644 --- a/app/views/projects/_development_group.html.erb +++ b/app/views/projects/_development_group.html.erb @@ -59,9 +59,9 @@ <% if User.current.member_of?(@project) %>
- <%= link_to "Pull Requests", project_files_path(@project), :class => "f14 c_blue02" %> + <%= link_to "Pull Requests", project_pull_rquest_path(@project), :class => "f14 c_blue02" %> <% unless @project.project_score.attach_num == 0 %> - <%= link_to "(#{@project.project_score.attach_num})", project_files_path(@project), :class => "subnav_num c_orange",:id=>'project_files_count_nav' %> + <%#= link_to "(#{@project.project_score.attach_num})", project_files_path(@project), :class => "subnav_num c_orange",:id=>'project_files_count_nav' %> <% end %>
<% end %> From 685f9d8090702cb81b39313cf434f39587c5158d Mon Sep 17 00:00:00 2001 From: huang Date: Mon, 1 Aug 2016 16:19:15 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=B7=A6=E4=BE=A7?= =?UTF-8?q?=E6=9D=83=E9=99=90=E6=8E=A7=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/pull_rquests_controller.rb | 2 +- app/helpers/application_helper.rb | 12 ++++++++++++ app/views/projects/_development_group.html.erb | 4 ++-- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/app/controllers/pull_rquests_controller.rb b/app/controllers/pull_rquests_controller.rb index c3f7c2925..aaef56595 100644 --- a/app/controllers/pull_rquests_controller.rb +++ b/app/controllers/pull_rquests_controller.rb @@ -10,7 +10,7 @@ class PullRquestsController < ApplicationController end - def find_project + def find_project_and_repository @project = Project.find(params[:project_id]) @repository = Repository.where(:project_id => @project.id, :type => "Repository::Gitlab") rescue ActiveRecord::RecordNotFound diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index d64d95223..9d0439120 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -814,6 +814,18 @@ module ApplicationHelper return @result end + # 必须是项目成，项目必须提交过代码 + def allow_pull_request project + return false if project.gpid.nil? + g = Gitlab.client + count = g.user_static(project.gpid, :rev => "master").count + if User.current.member_of?(project) && count > 0 + true + else + false + end + end + # 判断版本库是否初始为gitlab def rep_is_gitlab?(project) rep = project.repositories.where("type =?", "Repository::Gitlab") diff --git a/app/views/projects/_development_group.html.erb b/app/views/projects/_development_group.html.erb index 0647fcd1e..d8d25dd3d 100644 --- a/app/views/projects/_development_group.html.erb +++ b/app/views/projects/_development_group.html.erb @@ -57,9 +57,9 @@ <% end %> -<% if User.current.member_of?(@project) %> +<% if allow_pull_request(@project) %>
- <%= link_to "Pull Requests", project_pull_rquest_path(@project), :class => "f14 c_blue02" %> + <%= link_to "Pull Requests", project_pull_rquest_path(:project_id => @project.id), :class => "f14 c_blue02" %> <% unless @project.project_score.attach_num == 0 %> <%#= link_to "(#{@project.project_score.attach_num})", project_files_path(@project), :class => "subnav_num c_orange",:id=>'project_files_count_nav' %> <% end %> From b718803bd97c2e51572047a0f2c98ae5ad9686be Mon Sep 17 00:00:00 2001 From: huang Date: Mon, 1 Aug 2016 16:54:31 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8E=A7=E5=88=B6?= =?UTF-8?q?=E5=99=A8=E5=90=8D=E7=A7=B0=E5=8F=8A=E6=8E=A7=E5=88=B6=E5=99=A8?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E8=AE=BF=E9=97=AE=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../javascripts/pull_requests.js.coffee | 3 ++ app/assets/stylesheets/pull_requests.css.scss | 3 ++ app/controllers/pull_requests_controller.rb | 36 +++++++++++++++++++ app/controllers/pull_rquests_controller.rb | 14 +++++++- app/helpers/pull_requests_helper.rb | 2 ++ .../projects/_development_group.html.erb | 2 +- app/views/pull_requests/index.html.erb | 0 app/views/pull_requests/new.html.erb | 0 app/views/pull_requests/show.html.erb | 0 config/routes.rb | 2 +- .../pull_requests_controller_spec.rb | 5 +++ 11 files changed, 64 insertions(+), 3 deletions(-) create mode 100644 app/assets/javascripts/pull_requests.js.coffee create mode 100644 app/assets/stylesheets/pull_requests.css.scss create mode 100644 app/controllers/pull_requests_controller.rb create mode 100644 app/helpers/pull_requests_helper.rb create mode 100644 app/views/pull_requests/index.html.erb create mode 100644 app/views/pull_requests/new.html.erb create mode 100644 app/views/pull_requests/show.html.erb create mode 100644 spec/controllers/pull_requests_controller_spec.rb diff --git a/app/assets/javascripts/pull_requests.js.coffee b/app/assets/javascripts/pull_requests.js.coffee new file mode 100644 index 000000000..761567942 --- /dev/null +++ b/app/assets/javascripts/pull_requests.js.coffee @@ -0,0 +1,3 @@ +# Place all the behaviors and hooks related to the matching controller here. +# All this logic will automatically be available in application.js. +# You can use CoffeeScript in this file: http://jashkenas.github.com/coffee-script/ diff --git a/app/assets/stylesheets/pull_requests.css.scss b/app/assets/stylesheets/pull_requests.css.scss new file mode 100644 index 000000000..f69ac413b --- /dev/null +++ b/app/assets/stylesheets/pull_requests.css.scss @@ -0,0 +1,3 @@ +// Place all the styles related to the pull_requests controller here. +// They will automatically be included in application.css. +// You can use Sass (SCSS) here: http://sass-lang.com/ diff --git a/app/controllers/pull_requests_controller.rb b/app/controllers/pull_requests_controller.rb new file mode 100644 index 000000000..61fb9c9e4 --- /dev/null +++ b/app/controllers/pull_requests_controller.rb @@ -0,0 +1,36 @@ +class PullRequestsController < ApplicationController + before_filter :find_project_and_repository + before_filter :connect_gitlab, :only => [:index, :show] + + layout "base_projects" + + def index + results = @g.merge_requests(@project.gpid) + end + + def new + + end + + def create + + end + + def show + + end + + private + def connect_gitlab + @g = Gitlab.client + end + + def find_project_and_repository + @project = Project.find(params[:project_id]) + render_404 if @project.gpid.blank? + @repository = Repository.where(:project_id => @project.id, :type => "Repository::Gitlab") + rescue ActiveRecord::RecordNotFound + render_404 + end + +end diff --git a/app/controllers/pull_rquests_controller.rb b/app/controllers/pull_rquests_controller.rb index aaef56595..230f832bd 100644 --- a/app/controllers/pull_rquests_controller.rb +++ b/app/controllers/pull_rquests_controller.rb @@ -1,17 +1,29 @@ class PullRquestsController < ApplicationController before_filter :find_project_and_repository + before_filter :connect_gitlab, :only => [:index, :show] + layout "base_projects" def index - + results = @g.merge_requests(@project.gpid) end def new end + def create + + end + + private + def connect_gitlab + @g = Gitlab.client + end + def find_project_and_repository @project = Project.find(params[:project_id]) + render_404 if @project.gpid.blank? @repository = Repository.where(:project_id => @project.id, :type => "Repository::Gitlab") rescue ActiveRecord::RecordNotFound render_404 diff --git a/app/helpers/pull_requests_helper.rb b/app/helpers/pull_requests_helper.rb new file mode 100644 index 000000000..fa8554854 --- /dev/null +++ b/app/helpers/pull_requests_helper.rb @@ -0,0 +1,2 @@ +module PullRequestsHelper +end diff --git a/app/views/projects/_development_group.html.erb b/app/views/projects/_development_group.html.erb index d8d25dd3d..4dec58793 100644 --- a/app/views/projects/_development_group.html.erb +++ b/app/views/projects/_development_group.html.erb @@ -59,7 +59,7 @@ <% if allow_pull_request(@project) %>
- <%= link_to "Pull Requests", project_pull_rquest_path(:project_id => @project.id), :class => "f14 c_blue02" %> + <%= link_to "Pull Requests", project_pull_requests_path(@project), :class => "f14 c_blue02" %> <% unless @project.project_score.attach_num == 0 %> <%#= link_to "(#{@project.project_score.attach_num})", project_files_path(@project), :class => "subnav_num c_orange",:id=>'project_files_count_nav' %> <% end %> diff --git a/app/views/pull_requests/index.html.erb b/app/views/pull_requests/index.html.erb new file mode 100644 index 000000000..e69de29bb diff --git a/app/views/pull_requests/new.html.erb b/app/views/pull_requests/new.html.erb new file mode 100644 index 000000000..e69de29bb diff --git a/app/views/pull_requests/show.html.erb b/app/views/pull_requests/show.html.erb new file mode 100644 index 000000000..e69de29bb diff --git a/config/routes.rb b/config/routes.rb index 724ce69e4..4a67cbfe3 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -805,7 +805,7 @@ RedmineApp::Application.routes.draw do end end - resources :pull_rquests do + resources :pull_requests do collection do end member do diff --git a/spec/controllers/pull_requests_controller_spec.rb b/spec/controllers/pull_requests_controller_spec.rb new file mode 100644 index 000000000..1e6838c53 --- /dev/null +++ b/spec/controllers/pull_requests_controller_spec.rb @@ -0,0 +1,5 @@ +require 'rails_helper' + +RSpec.describe PullRequestsController, :type => :controller do + +end