Yuyu-billing/yuyu_dashboard
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'main' of https://github.com/Yuyu-billing/yuyu_dashboard into demo

Browse source
This commit is contained in:
Setyo Nugroho 2023-10-03 00:57:27 +07:00
commit 8799790cfd
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
yuyu/admin/projects_balance/views.py
View file

@ -34,7 +34,7 @@ class IndexView(tables.DataTableView):
def get_data(self):
try:
data = []
project_list, has_more = api.keystone.tenant_list(self.request)
project_list, has_more = api.keystone.tenant_list(self.request, user=self.request.user.id)
for d in self.balance_uc.list(self.request):
project = list(filter(lambda x: x.id == d['project']['tenant_id'], project_list))
project_name = 'Unknown Project'

2
yuyu/admin/projects_invoice/templates/projects_invoice/invoice_table.html
View file

@ -4,7 +4,7 @@
<div class="row" style="margin-bottom: 15px;">
<div class="col-md-6">
<b>Invoice Month</b>
<b>Project</b>
<select id="project_select" onchange="onProjectSelect(this.value)">
{% for i in project_list %}
<option

2
yuyu/admin/projects_invoice/views.py
View file

@ -46,7 +46,7 @@ class IndexView(tables.DataTableView):
def get_context_data(self, **kwargs):
context = super().get_context_data(**kwargs)
context['project_list'], _ = api.keystone.tenant_list(self.request)
context['project_list'], _ = api.keystone.tenant_list(self.request, user=self.request.user.id)
context['current_project_id'] = self.request.GET.get('project_id', self.request.user.project_id)
context['current_project_name'] = self.request.GET.get('project_name', self.request.user.project_id)
return context