parent
9b36644a31
commit
a482a083bf
14 changed files with 13 additions and 86 deletions
|
@ -72,9 +72,6 @@ func (c CharacteristicService) List(val *url.Values, claims *types.Claims) (type
|
|||
Measurements: measurements,
|
||||
Strains: strains,
|
||||
Species: species,
|
||||
Meta: &models.CharacteristicMeta{
|
||||
CanAdd: helpers.CanAdd(claims),
|
||||
},
|
||||
}
|
||||
|
||||
return &payload, nil
|
||||
|
@ -191,9 +188,7 @@ func (c CharacteristicService) Create(e *types.Entity, genus string, claims *typ
|
|||
}
|
||||
|
||||
payload.Characteristic = characteristic
|
||||
payload.Meta = &models.CharacteristicMeta{
|
||||
CanAdd: helpers.CanAdd(claims),
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
|
|
|
@ -50,9 +50,6 @@ func (s SpeciesService) List(val *url.Values, claims *types.Claims) (types.Entit
|
|||
payload := payloads.ManySpecies{
|
||||
Species: species,
|
||||
Strains: strains,
|
||||
Meta: &models.SpeciesMeta{
|
||||
CanAdd: helpers.CanAdd(claims),
|
||||
},
|
||||
}
|
||||
|
||||
return &payload, nil
|
||||
|
@ -73,9 +70,6 @@ func (s SpeciesService) Get(id int64, genus string, claims *types.Claims) (types
|
|||
payload := payloads.Species{
|
||||
Species: species,
|
||||
Strains: strains,
|
||||
Meta: &models.SpeciesMeta{
|
||||
CanAdd: helpers.CanAdd(claims),
|
||||
},
|
||||
}
|
||||
|
||||
return &payload, nil
|
||||
|
@ -116,9 +110,6 @@ func (s SpeciesService) Update(id int64, e *types.Entity, genus string, claims *
|
|||
|
||||
payload.Species = species
|
||||
payload.Strains = strains
|
||||
payload.Meta = &models.SpeciesMeta{
|
||||
CanAdd: helpers.CanAdd(claims),
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
@ -151,9 +142,6 @@ func (s SpeciesService) Create(e *types.Entity, genus string, claims *types.Clai
|
|||
// Note, no strains when new species
|
||||
|
||||
payload.Species = species
|
||||
payload.Meta = &models.SpeciesMeta{
|
||||
CanAdd: helpers.CanAdd(claims),
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
|
|
|
@ -85,9 +85,6 @@ func (s StrainService) List(val *url.Values, claims *types.Claims) (types.Entity
|
|||
Species: species,
|
||||
Measurements: measurements,
|
||||
Characteristics: characteristics,
|
||||
Meta: &models.StrainMeta{
|
||||
CanAdd: helpers.CanAdd(claims),
|
||||
},
|
||||
}
|
||||
|
||||
return &payload, nil
|
||||
|
@ -141,9 +138,6 @@ func (s StrainService) Get(id int64, genus string, claims *types.Claims) (types.
|
|||
Species: &manySpecies,
|
||||
Characteristics: characteristics,
|
||||
Measurements: measurements,
|
||||
Meta: &models.StrainMeta{
|
||||
CanAdd: helpers.CanAdd(claims),
|
||||
},
|
||||
}
|
||||
|
||||
return &payload, nil
|
||||
|
@ -179,9 +173,6 @@ func (s StrainService) Update(id int64, e *types.Entity, genus string, claims *t
|
|||
|
||||
payload.Strain = strain
|
||||
payload.Species = &manySpecies
|
||||
payload.Meta = &models.StrainMeta{
|
||||
CanAdd: helpers.CanAdd(claims),
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
@ -213,9 +204,6 @@ func (s StrainService) Create(e *types.Entity, genus string, claims *types.Claim
|
|||
|
||||
payload.Strain = strain
|
||||
payload.Species = &manySpecies
|
||||
payload.Meta = &models.StrainMeta{
|
||||
CanAdd: helpers.CanAdd(claims),
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
|
|
@ -57,9 +57,6 @@ func (u UserService) List(val *url.Values, claims *types.Claims) (types.Entity,
|
|||
|
||||
payload := payloads.Users{
|
||||
Users: users,
|
||||
Meta: &models.UserMeta{
|
||||
CanAdd: claims.Role == "A",
|
||||
},
|
||||
}
|
||||
return &payload, nil
|
||||
}
|
||||
|
@ -79,9 +76,6 @@ func (u UserService) Get(id int64, dummy string, claims *types.Claims) (types.En
|
|||
|
||||
payload := payloads.User{
|
||||
User: user,
|
||||
Meta: &models.UserMeta{
|
||||
CanAdd: claims.Role == "A",
|
||||
},
|
||||
}
|
||||
return &payload, nil
|
||||
}
|
||||
|
|
Reference in a new issue