Skip to content

Commit 249bf23

Browse files
authored
Merge pull request #262 from buildingSMART/IVS-700_Can_not_open_Authoring_Tool_page_in_Django_Admin
IVS-700 - Fix unable to open Authoring Tool page
2 parents aa18d62 + 0079ed9 commit 249bf23

File tree

2 files changed

+20
-4
lines changed

2 files changed

+20
-4
lines changed

backend/apps/ifc_validation/admin.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -654,8 +654,8 @@ class AuthoringToolAdmin(BaseAdmin):
654654
('General Information', {"classes": ("wide"), "fields": ["id", "company", "name", "version", "nbr_of_requests"]}),
655655
('Auditing Information', {"classes": ("wide"), "fields": [("created", "updated")]})
656656
]
657-
list_display = ["id", "company_link", "name", "version", "nbr_of_requests_link", "created", "updated"]
658-
readonly_fields = ["id", "created", "updated"]
657+
list_display = ["id", "company_link", "name", "version", "nbr_of_requests", "created", "updated"]
658+
readonly_fields = ["id", "nbr_of_requests", "created", "updated"]
659659
list_filter = ["company", ('created', AdvancedDateFilter), ('updated', AdvancedDateFilter)]
660660
search_fields = ("name", "version", "company__name")
661661

@@ -678,7 +678,7 @@ def company_link(self, obj):
678678
company_link.admin_order_field = 'company'
679679

680680
@admin.display(description="# Requests")
681-
def nbr_of_requests_link(self, obj):
681+
def nbr_of_requests(self, obj):
682682

683683
link = reverse("admin:ifc_validation_models_validationrequest_changelist")
684684
query_string = '?model__produced_by__exact=' + str(obj.id)
@@ -688,7 +688,7 @@ def nbr_of_requests_link(self, obj):
688688
query_string,
689689
obj.nbr_of_requests
690690
)
691-
nbr_of_requests_link.admin_order_field = 'nbr_of_requests'
691+
nbr_of_requests.admin_order_field = 'nbr_of_requests'
692692

693693

694694
class UserAdditionalInfoInlineAdmin(admin.StackedInline):

e2e/tests/django_admin.test.js

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,22 @@ test.describe('UI - Django Admin', () => {
8585
await logout(page);
8686
});
8787

88+
test('navigate to Authoring Tool', async ({ page }) => {
89+
90+
// login
91+
await login(page);
92+
93+
// navigate and check elements of the screen
94+
await page.goto(`${BASE_URL}/ifc_validation_models/authoringtool/1/change`);
95+
await expect(page).toHaveURL(`${BASE_URL}/ifc_validation_models/authoringtool/1/change/`);
96+
await expect(page.getByText('Change Authoring Tool')).toBeVisible();
97+
await expect(page.getByText('General Information')).toBeVisible();
98+
await expect(page.getByText('Auditing Information')).toBeVisible();
99+
100+
// logout
101+
await logout(page);
102+
});
103+
88104
test('navigate to Validation Requests', async ({ page }) => {
89105

90106
// login

0 commit comments

Comments
 (0)