Merge remote-tracking branch 'origin/standalone_develop' into standalone_develop

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
@@ -10,6 +11,9 @@ class Organizations::ClasController < Organizations::BaseController
         @is_admin = can_edit_org?
         @is_member = @organization.is_member?(current_user.id)
         @is_sign = @organization.is_sign?(current_user.id)
+        @cla_sign_email = if @is_sign 
+            @organization.cla_sign_email(current_user.id)
+        end
     end
 
     def create
@@ -57,7 +61,6 @@ class Organizations::ClasController < Organizations::BaseController
     def load_organization
         @organization = Organization.find_by(login: params[:organization_id]) || Organization.find_by(id: params[:organization_id])
         return render_not_found("组织不存在") if @organization.nil?
-        return render_forbidden("没有查看组织的权限") if org_limited_condition || org_privacy_condition
     end
 
     def load_cla

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

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 params[:id]
+        @user_cla.update_attributes(state: 2)
+        render_ok
+    end
+
     private 
 
     def user_cla_params

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

app/models/organization.rb

@@ -109,9 +109,14 @@ class Organization < Owner
 
   def is_sign?(user_id)
     return false if cla.nil?
-    cla.user_clas.where(user_id: user_id).present?
+    cla.user_clas.where(user_id: user_id, state: 1).present?
   end
 
+  def cla_sign_email(user_id)
+    cla.user_clas.find_by(user_id: user_id)&.email
+  end
+
+
   def is_owner?(user_id)
     team_users.joins(:team).where(user_id: user_id, teams: {authorize: %w(owner)}).present?
   end

app/models/pull_request.rb

@@ -24,10 +24,11 @@
 #
 
 class PullRequest < ApplicationRecord
-  #status 0 默认未合并， 1表示合并, 2表示请求拒绝(或已关闭)
+  #status 0 默认未合并， 1表示合并, 2表示请求拒绝(或已关闭) ,3 表示未签署CLA
   OPEN   = 0
   MERGED  = 1
   CLOSED = 2
+  NEEDCLA = 3
 
   belongs_to :issue
   belongs_to :user

app/models/user_cla.rb

@@ -26,8 +26,12 @@ class UserCla < ApplicationRecord
         cla.fresh_count
     end
 
-    def self.build(params,user_id)
-        self.create!(user_id: user_id,
+    before_save do
+        fresh_pull_request
+    end
+
+    def self.build(params,current_user_id)
+        self.create!(user_id: current_user_id,
                     cla_id: params[:cla_id],
                     real_name: params[:real_name], 
                     email: params[:email],
@@ -35,4 +39,13 @@ class UserCla < ApplicationRecord
                 )
     end
 
+    def fresh_pull_request
+        project_ids = cla.organization.projects.pluck(:id)
+        if state == "signed"
+            PullRequest.where(user_id: user_id, project_id: project_ids, status:3).update_all(status:0)
+        else
+            PullRequest.where(user_id: user_id, project_id: project_ids, status:0).update_all(status:3)
+        end
+    end
+
 end

app/services/admins/delete_organization_service.rb

@@ -6,9 +6,6 @@ class Admins::DeleteOrganizationService < Gitea::ClientService
     end
 
     def call
-        response = delete(url, params)
-        render_status(response)
-
         Gitea::Organization::DeleteService.call(token,name)
     end
     

app/services/pull_requests/send_journal_service.rb

@@ -0,0 +1,34 @@
+class PullRequests::SendJournalService < ApplicationService
+
+    def initialize(project, pull_request,current_user)
+        @project       = project
+        @pull_request  = pull_request
+        @issue  = pull_request.issue
+        @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: "@#{@current_user.nickname} 您好！欢迎参与 #{@project.name} 的贡献。首次进行贡献请完成《<a href='/#{@project.owner.login}/cla/#{@project.owner.cla.key}' target='_blank'>#{@project.owner.cla.name}</a>》的签署，签署完成后，项目成员才可查看到您的合并请求",
+                }
+                journal = Journal.new journal_params
+                if journal.save
+                    @pull_request.update_attributes(status: 3)
+                    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

app/views/admins/organizations/show.html.erb

@@ -28,11 +28,9 @@
       <div class="form-row">
         <%= f.input :lastname, label: '姓名', wrapper_html: { class: 'col-md-3' }, input_html: {  readonly: true, class: 'col-md-11', value: @org.real_name } %>
       </div>
-
       <div class="form-row">
-        <%= f.input :cla, label: '是否开通CLA', wrapper_html: { class: 'col-md-3' }, input_html: {  class: 'col-md-11', value: @org.cla } %>
+          <%= f.input :enabling_cla, as: :boolean, label: '开通CLA', checked_value: 1, unchecked_value: 0 %>
       </div>
-      
     </div>
   <% end %>
     <h3> 组织项目 </h3>

app/views/organizations/clas/show.json.jbuilder

@@ -1,6 +1,7 @@
 json.partial! "detail", cla: @cla, organization: @organization
 json.is_admin @is_admin
 json.is_sign @is_sign
+json.cla_sign_email @cla_sign_email
 json.is_member @is_member
 json.organization do 
   json.partial! "organizations/organizations/simple", organization: @organization

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

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.class == User ? false : @project.owner&.cla.try(:pr_need)
 
 json.issues do
   json.array! @issues.to_a do |issue|

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
+end
+json.organization do 
+    json.partial! "organizations/organizations/simple", organization: user_cla.cla.organization
+  end

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]