diff --git a/supplier_app/new_urls/AP_urls.py b/supplier_app/new_urls/AP_urls.py index fbc87ec..48185fc 100644 --- a/supplier_app/new_urls/AP_urls.py +++ b/supplier_app/new_urls/AP_urls.py @@ -18,10 +18,10 @@ company_pattern = [ - url(r'^$', CompanyListView.as_view(), name='company-list'), + url(r'^deprecated$', CompanyListView.as_view(), name='company-list-deprecated'), url(r'^create$', CompanyCreatorView.as_view(), name='company-create'), url(r'^invite$', company_invite, name='company-invite'), - url(r'^taxpayerList$', BuyerTaxpayersList.as_view(), name='buyer-taxpayer-list'), + url(r'^$', BuyerTaxpayersList.as_view(), name='company-list'), ] taxpayer_pattern = [ diff --git a/supplier_app/tests/test_view.py b/supplier_app/tests/test_view.py index c806884..5187ec7 100644 --- a/supplier_app/tests/test_view.py +++ b/supplier_app/tests/test_view.py @@ -1819,7 +1819,7 @@ def setUp(self): self.client.force_login(self.user) def test_company_list(self): - response = self.client.get(reverse('company-list')) + response = self.client.get(reverse('company-list-deprecated')) company1 = response.context[0]['company_list'][0] self.assertIn(company1, self.company_list) self.assertTrue( @@ -1827,7 +1827,7 @@ def test_company_list(self): ) def test_company_list_template(self): - response = self.client.get(reverse('company-list')) + response = self.client.get(reverse('company-list-deprecated')) self.assertTemplateUsed(response, 'supplier_app/AP/company_list.html') def test_company_search(self): @@ -1842,7 +1842,7 @@ def test_company_search(self): CompanyFactory(name='tes name'), ] response = self.client.get( - reverse('company-list'), + reverse('company-list-deprecated'), {'company': 'test'}, ) for company in company_list: @@ -2955,7 +2955,7 @@ def setUp(self): self.client.force_login(self.user_buyer_with_google_social) def test_taxpayer_eb_list(self): - response = self.client.get(reverse('buyer-taxpayer-list')) + response = self.client.get(reverse('company-list')) company1 = response.context[0]['company_list'][0] self.assertIn(company1, self.company_list) self.assertTrue( @@ -2966,5 +2966,5 @@ def test_taxpayer_eb_list(self): ) def test_taxpayer_eb_list_template(self): - response = self.client.get(reverse('buyer-taxpayer-list')) + response = self.client.get(reverse('company-list')) self.assertTemplateUsed(response, 'supplier_app/Buyer/taxpayer_list.html') \ No newline at end of file diff --git a/templates/navbar.html b/templates/navbar.html index 72e6dab..b68e2ef 100644 --- a/templates/navbar.html +++ b/templates/navbar.html @@ -76,12 +76,6 @@ {% endif %} -