diff options
Diffstat (limited to 'core')
| -rw-r--r-- | core/TESTS/tests.py | 4 | ||||
| -rw-r--r-- | core/admin.py | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/core/TESTS/tests.py b/core/TESTS/tests.py index 11f3bc4..946d579 100644 --- a/core/TESTS/tests.py +++ b/core/TESTS/tests.py @@ -289,13 +289,13 @@ class PageTests(TestCase): def test_page_site_media_css(self): # Flat file tests. - response = self.client.get('/site_media/css/main3.css') + response = self.client.get('/site_media/css/trog3.css') if response.status_code != 200: self.assertEqual(response.status_code, 302) if response.status_code != 302: self.assertEqual(response.status_code, 200) content = response.content.decode() # need to check it is not just an error page - ph = r'This text is used by the test system to determine that main3.css loaded correctly' + ph = r'This text is used by the test system to determine that trog3.css loaded correctly' phmatch = re.search(ph, content) self.assertIsNotNone(phmatch, "Failed to find expected text: '" + ph +"'") diff --git a/core/admin.py b/core/admin.py index 0e69527..c71f4f6 100644 --- a/core/admin.py +++ b/core/admin.py @@ -61,16 +61,16 @@ class LogbookEntryAdmin(TroggleModelAdmin): inlines = (PersonTripInline, QMsFoundInline) class Media: css = { - "all": ("css/troggleadmin.css",) + "all": ("css/troggleadmin.css",) # this does not exist } actions=('export_logbook_entries_as_html','export_logbook_entries_as_txt') def export_logbook_entries_as_html(self, modeladmin, request, queryset): - response=downloadLogbook(request=request, queryset=queryset, extension='html') + response=downloadLogbook(request=request, queryset=queryset, extension='html') #fails, no queryset return response def export_logbook_entries_as_txt(self, modeladmin, request, queryset): - response=downloadLogbook(request=request, queryset=queryset, extension='txt') + response=downloadLogbook(request=request, queryset=queryset, extension='txt') #fails, no queryset return response |