diff --git a/apps/herd/services/rancher_dashboard_service.py b/apps/herd/services/rancher_dashboard_service.py index 68b43d9..8ab8639 100644 --- a/apps/herd/services/rancher_dashboard_service.py +++ b/apps/herd/services/rancher_dashboard_service.py @@ -117,7 +117,7 @@ class RancherDashboardService: rancher_quota_data.update({ 'product': stat.quota.product.name, 'product_id': stat.quota.product.id, - 'quota_id': stat.quota.id, + 'quota_id': stat.quota.quota_id, }) rancher_data_by_quota_usage.append(rancher_quota_data) diff --git a/apps/product/web/api/v1/viewsets/product_api.py b/apps/product/web/api/v1/viewsets/product_api.py index c4c3e66..7c3a5fb 100644 --- a/apps/product/web/api/v1/viewsets/product_api.py +++ b/apps/product/web/api/v1/viewsets/product_api.py @@ -455,7 +455,6 @@ class IncentivePlanViewSet(SoftDeleteMixin, viewsets.ModelViewSet, DynamicSearch base_query['group'] = group today = datetime.now().date() - user_relations = product_models.UserRelations.objects.filter(user=request.user).first() incentive_plans = self.queryset.filter( Q(is_time_unlimited=False) | Q(start_date_limit__lte=today, end_date_limit__gte=today),