diff --git a/app/controllers/organizations/clas_controller.rb b/app/controllers/organizations/clas_controller.rb index 953cc9d5c..ae88ee2f1 100644 --- a/app/controllers/organizations/clas_controller.rb +++ b/app/controllers/organizations/clas_controller.rb @@ -1,6 +1,7 @@ class Organizations::ClasController < Organizations::BaseController before_action :load_organization before_action :load_cla, only: [:show, :update, :destroy] + before_action :check_user_can_edit_org, only: [:create, :update, :destroy] def index @cla = @organization.cla diff --git a/app/controllers/pull_requests_controller.rb b/app/controllers/pull_requests_controller.rb index 0cf022f7c..037e201bf 100644 --- a/app/controllers/pull_requests_controller.rb +++ b/app/controllers/pull_requests_controller.rb @@ -67,6 +67,7 @@ class PullRequestsController < ApplicationController Issues::CreateForm.new({subject: params[:title], description: params[:body].blank? ? params[:body] : params[:body].b}).validate! @pull_request, @gitea_pull_request = PullRequests::CreateService.call(current_user, @owner, @project, params) if @gitea_pull_request[:status] == :success + PullRequests::SendJournalService.call(@project, @pull_request, current_user) @pull_request.bind_gitea_pull_request!(@gitea_pull_request[:body]["number"], @gitea_pull_request[:body]["id"]) reviewers = User.where(id: params[:reviewer_ids]) @pull_request.reviewers = reviewers diff --git a/app/controllers/users/clas_controller.rb b/app/controllers/users/clas_controller.rb index d5e93436e..bede9ac81 100644 --- a/app/controllers/users/clas_controller.rb +++ b/app/controllers/users/clas_controller.rb @@ -1,19 +1,33 @@ class Users::ClasController < Users::BaseController + before_action :require_login + before_action :private_user_resources! def index - @user_clas = UserCla.where(user: @_observed_user) + @user_clas = UserCla.where(user: current_user) end def create - tip_exception("已签署过该组织CLA!") if @_observed_user.user_clas.where(cla_id: params[:cla_id]).size > 0 - ActiveRecord::Base.transaction do - Users::UserClaForm.new(user_cla_params).validate! - @user_cla = UserCla.build(user_cla_params, @_observed_user.id) - render_ok + @user_cla = current_user.user_clas.find_by(cla_id: params[:cla_id]) + if @user_cla + @user_cla.update_attributes(state: 1) + else + ActiveRecord::Base.transaction do + Users::UserClaForm.new(user_cla_params).validate! + @user_cla = UserCla.build(user_cla_params, current_user.id) + + end end + render_ok rescue Exception => e uid_logger_error(e.message) tip_exception(e.message) end + + def destroy + @user_cla = current_user.user_clas.find_by(cla_id: params[:cla_id]) + @user_cla.update_attributes(state: 2) + render_ok + end + private def user_cla_params diff --git a/app/models/cla.rb b/app/models/cla.rb index 11f86dcd6..fca050430 100644 --- a/app/models/cla.rb +++ b/app/models/cla.rb @@ -36,7 +36,9 @@ class Cla < ApplicationRecord ) end - + def valid_sign(user_id) + user_clas.where(user_id: user_id, state:1).present? + end def fresh_count update(count:self.users.count) end diff --git a/app/services/pull_requests/send_journal_service.rb b/app/services/pull_requests/send_journal_service.rb new file mode 100644 index 000000000..67cc6ca89 --- /dev/null +++ b/app/services/pull_requests/send_journal_service.rb @@ -0,0 +1,32 @@ +class PullRequests::SendJournalService < ApplicationService + + def initialize(project, pull_request,current_user) + @project = project + @issue = pull_request + @current_user = current_user + @org = project.owner + end + + def call + if @org.enabling_cla && @org.cla.present? && @org.cla.pr_need && !@org.is_member?(@current_user&.id) && !@org.cla.valid_sign(@current_user&.id) + ActiveRecord::Base.transaction do + sender_id = if Rails.env.development? + User.last.id + else + 87461 + end + journal_params = { + journalized_id: @issue.id , + journalized_type: "Issue", + user_id: sender_id , + notes: "@xxx 您好！欢迎参与 #{@project.name} 的贡献。首次进行贡献请完成《#{@project.owner.cla.name}》的签署，签署完成后，项目成员才可查看到您的合并请求", + } + journal = Journal.new journal_params + if journal.save + TouchWebhookJob.set(wait: 5.seconds).perform_later('PullRequestComment', @issue&.id, sender_id, journal.id, 'created', {}) + push_activity_2_blockchain("issue_comment_create", journal) if Site.has_blockchain? && @project.use_blockchain + end + end + end + end +end diff --git a/app/views/projects/_detail.json.jbuilder b/app/views/projects/_detail.json.jbuilder index ed23fdef2..e60aaed8a 100644 --- a/app/views/projects/_detail.json.jbuilder +++ b/app/views/projects/_detail.json.jbuilder @@ -3,6 +3,7 @@ json.identifier project.identifier json.name project.name json.description project.description json.is_public project.is_public +json.pr_need @project.owner&.cla.try(:pr_need) json.owner do json.partial! "/users/user_simple", locals: {user: project.owner} end \ No newline at end of file diff --git a/app/views/pull_requests/index.json.jbuilder b/app/views/pull_requests/index.json.jbuilder index b7f642118..b888c99fd 100644 --- a/app/views/pull_requests/index.json.jbuilder +++ b/app/views/pull_requests/index.json.jbuilder @@ -11,6 +11,7 @@ json.project_author @project.owner.try(:login) json.project_author_name @project.owner.try(:show_real_name) json.has_created_pull_requests @project.pull_requests.size > 0 json.disable_pr_vew @project.pr_view_admin? && !@project.manager?(current_user) +json.pr_need @project.owner&.cla.try(:pr_need) json.issues do json.array! @issues.to_a do |issue| diff --git a/app/views/users/clas/_detail.json.jbuilder b/app/views/users/clas/_detail.json.jbuilder index 07bc5070b..5b6d246e5 100644 --- a/app/views/users/clas/_detail.json.jbuilder +++ b/app/views/users/clas/_detail.json.jbuilder @@ -5,4 +5,7 @@ json.state user_cla.state json.created_at format_time(user_cla.created_at) json.cla do json.partial! "/organizations/clas/detail", locals: {cla: user_cla.cla} -end \ No newline at end of file +end +json.organization do + json.partial! "organizations/organizations/simple", organization: user_cla.cla.organization + end \ No newline at end of file diff --git a/config/routes.rb b/config/routes.rb index 6ab9f228c..90526f9e6 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -390,7 +390,7 @@ Rails.application.routes.draw do scope module: :users do resource :interest, only: [:create] - resources :clas, only: [:index,:create] + resources :clas resources :accounts, only: [:show, :update] do resource :phone_bind, only: [:create] resource :email_bind, only: [:create]