diff --git a/server/compose/service/module.go b/server/compose/service/module.go index 60dd9f536..96935d65a 100644 --- a/server/compose/service/module.go +++ b/server/compose/service/module.go @@ -1064,11 +1064,14 @@ func loadModuleField(ctx context.Context, s store.Storer, namespaceID, moduleID, err = ModuleErrNotFound() } - if err == nil && (namespaceID != res.NamespaceID || moduleID != res.ModuleID) { - // Make sure chart belongs to the right namespace + if err == nil && (moduleID != res.ModuleID) { + // Make sure module-field belongs to the right module return nil, ModuleErrNotFound() } + // add namespace ID on the module-field + res.NamespaceID = namespaceID + return } diff --git a/server/compose/types/module_field.go b/server/compose/types/module_field.go index 42becf9bd..104919965 100644 --- a/server/compose/types/module_field.go +++ b/server/compose/types/module_field.go @@ -19,7 +19,7 @@ type ( // Modules - CRM module definitions ModuleField struct { ID uint64 `json:"fieldID,string"` - NamespaceID uint64 `json:"namspaceID,string"` + NamespaceID uint64 `json:"namespaceID,string"` ModuleID uint64 `json:"moduleID,string"` Place int `json:"-"`