Browse Source

Merge pull request 'CLA 组织id问题修复' (#61) from KingChan/forgeplus:chenjing into standalone_develop

pull/343/head
KingChan 3 years ago
parent
commit
af1e2ae003
2 changed files with 4 additions and 4 deletions
  1. +2
    -2
      app/controllers/organizations/clas_controller.rb
  2. +2
    -2
      app/models/cla.rb

+ 2
- 2
app/controllers/organizations/clas_controller.rb View File

@@ -15,7 +15,7 @@ class Organizations::ClasController < Organizations::BaseController
return tip_exception("组织已存在CLA!")
else
Organizations::CreateClaForm.new(cla_params).validate!
@cla = Cla.build(cla_params)
@cla = Cla.build(cla_params,@organization.id)
end
end
rescue Exception => e
@@ -57,7 +57,7 @@ class Organizations::ClasController < Organizations::BaseController
end

def load_cla
@cla = Cla.find_by!(organization:params[:organization_id], key: params[:id])
@cla = Cla.find_by!(organization:@organization, key: params[:id])
end

end

+ 2
- 2
app/models/cla.rb View File

@@ -27,8 +27,8 @@ class Cla < ApplicationRecord
self.key.parameterize
end

def self.build(params)
self.create!(organization_id: params[:organization_id],
def self.build(params,org_id)
self.create!(organization_id: org_id,
name: params[:name],
key: params[:key],
content: params[:content],


Loading…
Cancel
Save