github/datasette
1
0
Fork 0
mirror of https://github.com/simonw/datasette.git synced 2025-12-10 16:51:24 +01:00
Code Issues Projects Releases Packages Wiki Activity

Sort databases on homepage by argument order - #591

Browse source 
Closes #585 - thanks, @rixx!
This commit is contained in:
Tobias Kunze 2019-10-14 05:52:33 +02:00 • committed by Simon Willison
commit 2ad1f0d34e
3 changed files with 3 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
datasette/app.py
View file

@ -159,7 +159,7 @@ class Datasette:
self.files = [MEMORY] self.files = [MEMORY]
elif memory: elif memory:
self.files = (MEMORY,) + self.files self.files = (MEMORY,) + self.files
self.databases = {} self.databases = collections.OrderedDict()
self.inspect_data = inspect_data self.inspect_data = inspect_data
for file in self.files: for file in self.files:
path = file path = file

2
datasette/views/index.py
View file

@ -97,8 +97,6 @@ class IndexView(BaseView):
} }
) )
databases.sort(key=lambda database: database["name"])
if as_format: if as_format:
headers = {} headers = {}
if self.ds.cors: if self.ds.cors:

4
tests/test_html.py
View file

@ -26,11 +26,11 @@ def test_homepage(app_client_two_attached_databases):
) )
# Should be two attached databases # Should be two attached databases
assert [ assert [
{"href": "/extra_database", "text": "extra_database"},
{"href": "/fixtures", "text": "fixtures"}, {"href": "/fixtures", "text": "fixtures"},
{"href": "/extra_database", "text": "extra_database"},
] == [{"href": a["href"], "text": a.text.strip()} for a in soup.select("h2 a")] ] == [{"href": a["href"], "text": a.text.strip()} for a in soup.select("h2 a")]
# The first attached database should show count text and attached tables # The first attached database should show count text and attached tables
h2 = soup.select("h2")[0] h2 = soup.select("h2")[1]
assert "extra_database" == h2.text.strip() assert "extra_database" == h2.text.strip()
counts_p, links_p = h2.find_all_next("p")[:2] counts_p, links_p = h2.find_all_next("p")[:2]
assert ( assert (