diff --git a/custom_objects/views.py b/custom_objects/views.py index 20f5d15..26a6a95 100644 --- a/custom_objects/views.py +++ b/custom_objects/views.py @@ -41,11 +41,20 @@ class CustomFieldDefinitionViewSet(viewsets.ModelViewSet): user = self.request.user if not user or not user.is_authenticated: return qs.none() - if user.is_superuser or user.is_staff: - return qs - return qs.filter( - models.Q(custom_object__created_by=user) | models.Q(entity_name__isnull=False) - ) + if not (user.is_superuser or user.is_staff): + qs = qs.filter( + models.Q(custom_object__created_by=user) | models.Q(entity_name__isnull=False) + ) + + custom_object_id = self.request.query_params.get('custom_object') + if custom_object_id: + qs = qs.filter(custom_object_id=custom_object_id) + + entity_name = self.request.query_params.get('entity_name') + if entity_name: + qs = qs.filter(entity_name=entity_name) + + return qs def perform_create(self, serializer): with transaction.atomic(): diff --git a/frontend/src/stores/crm.js b/frontend/src/stores/crm.js index dafd2c0..a6b80b6 100644 --- a/frontend/src/stores/crm.js +++ b/frontend/src/stores/crm.js @@ -106,6 +106,23 @@ export const useCrmStore = defineStore('crm', { await this.fetchCustomObjects() return res.data }, + async fetchCustomFields(objectIdOrEntityName) { + try { + let url = '/custom-fields/' + if (typeof objectIdOrEntityName === 'number') { + url += `?custom_object=${objectIdOrEntityName}` + } else if (typeof objectIdOrEntityName === 'string') { + url += `?entity_name=${objectIdOrEntityName}` + } + const res = await api.get(url) + this.customFields = res.data.results || res.data + return this.customFields + } catch (err) { + console.error(err) + this.customFields = [] + return [] + } + }, async createCustomField(fieldData) { const res = await api.post('/custom-fields/', fieldData) await this.fetchCustomObjects() diff --git a/frontend/src/views/CustomObjectsView.vue b/frontend/src/views/CustomObjectsView.vue index d479351..10ffd7e 100644 --- a/frontend/src/views/CustomObjectsView.vue +++ b/frontend/src/views/CustomObjectsView.vue @@ -1,235 +1,286 @@