Browse Source

fix: organization gitea_token read by associations

pull/313/head
yystopf 4 years ago
parent
commit
8f5bb0e2d9
2 changed files with 5 additions and 1 deletions
  1. +4
    -0
      app/models/organization.rb
  2. +1
    -1
      app/services/organizations/create_service.rb

+ 4
- 0
app/models/organization.rb View File

@@ -83,6 +83,10 @@ class Organization < Owner

after_save :reset_cache_data

def gitea_token
team_users.joins(:team).where(teams: {authorize: "owner"}).take&.user&.gitea_token
end

def reset_cache_data
Cache::V2::OwnerCommonService.new(self.id).reset
end


+ 1
- 1
app/services/organizations/create_service.rb View File

@@ -47,7 +47,7 @@ class Organizations::CreateService < ApplicationService
end

def create_org_and_extension
@organization = Organization.build(params[:name], params[:nickname], user.gitea_token)
@organization = Organization.build(params[:name], params[:nickname])
org_extension = OrganizationExtension.build(organization.id, description, website,
location, repo_admin_change_team_access,
visibility, max_repo_creation)


Loading…
Cancel
Save