rough draft of fix for #24 (#25)

fermitools · Mar 21, 2024 · 2c1af90 · 2c1af90
1 parent c48bd8f
commit 2c1af90
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git a/setup.py b/setup.py
@@ -11,7 +11,7 @@ def get_version():
 
 
 setup(
-    name = "metacat_client",
+    name = "metacat-client",
     version = get_version(),
     author = "Marc Mengel, Igor Mandrichenko",
     author_email = "mengel@fnal.gov",

diff --git a/upload_pypi.sh b/upload_pypi.sh
@@ -2,7 +2,7 @@
 
 
 rm -rf build dist *.egg-info
-python setup.py sdist bdist_wheel
+python setup.py sdist bdist
 twine upload dist/*
 rm -rf build dist *.egg-info
 
diff --git a/webserver/gui_handler.py b/webserver/gui_handler.py
@@ -891,6 +891,7 @@ def datasets(self, request, relpath, selection=None, page=0, page_size=1000, sor
         page_links = self.make_page_links(npages, page, page_size, all_page_links, 2)
 
         return self.render_to_response("datasets.html", datasets=datasets, 
+            selection=selection, 
             page=page, npages=npages, page_links=page_links, namematch=namematch,
             owned_namespaces = owned_namespaces, other_namespaces=other_namespaces,
             selection=selection, user=user, **self.messages(args))

diff --git a/webserver/templates/datasets.html b/webserver/templates/datasets.html
@@ -71,13 +71,13 @@
 
     <table class="data">
     	<tr>
-		<th>Name<a href="./datasets?sort_by=Name&sort_asc=d&namematch={{namematch}}" style="text-decoration: none">&dArr;</a><a href="./datasets?sort_by=Name&sort_asc=a&namematch={{namematch}}" style="text-decoration: none">&uArr;</a></th>
+		<th>Name<a href="./datasets?sort_by=Name&sort_asc=d&namematch={{namematch}}&selection={{selection}}" style="text-decoration: none">&dArr;</a><a href="./datasets?sort_by=Name&sort_asc=a&namematch={{namematch}}&selection={{selection}}" style="text-decoration: none">&uArr;</a></th>
             <th>Namespace</th>
-            {% if logged_in %}<th>Creator<a href="./datasets?sort_by=Creator&sort_asc=d&namematch={{namematch}}" style="text-decoration: none">&dArr;</a><a href="./datasets?sort_by=Creator&sort_asc=a&namematch={{namematch}}" style="text-decoration: none">&uArr;</a></th>{% endif %}
-            <th>Created<a href="./datasets?sort_by=Created&sort_asc=d&namematch={{namematch}}" style="text-decoration: none">&dArr;</a><a href="./datasets?sort_by=Created&sort_asc=a&namematch={{namematch}}" style="text-decoration: none">&uArr;</a></th>
-            {% if logged_in %}<th>Owner<a href="./datasets?sort_by=Owner&sort_asc=d&namematch={{namematch}}" style="text-decoration: none">&dArr;</a><a href="./datasets?sort_by=Owner&sort_asc=a&namematch={{namematch}}" style="text-decoration: none">&uArr;</a></th>{% endif %}
+            {% if logged_in %}<th>Creator<a href="./datasets?sort_by=Creator&sort_asc=d&namematch={{namematch}}&selection={{selection}}" style="text-decoration: none">&dArr;</a><a href="./datasets?sort_by=Creator&sort_asc=a&namematch={{namematch}}&selection={{selection}}" style="text-decoration: none">&uArr;</a></th>{% endif %}
+            <th>Created<a href="./datasets?sort_by=Created&sort_asc=d&namematch={{namematch}}&selection={{selection}}" style="text-decoration: none">&dArr;</a><a href="./datasets?sort_by=Created&sort_asc=a&namematch={{namematch}}&selection={{selection}}" style="text-decoration: none">&uArr;</a></th>
+            {% if logged_in %}<th>Owner<a href="./datasets?sort_by=Owner&sort_asc=d&namematch={{namematch}}&selection={{selection}}" style="text-decoration: none">&dArr;</a><a href="./datasets?sort_by=Owner&sort_asc=a&namematch={{namematch}}&selection={{selection}}" style="text-decoration: none">&uArr;</a></th>{% endif %}
     		<th>Flags</th>
-    		<th>Files<sup>*</sup><a href="./datasets?sort_by=Files&sort_asc=d&namematch={{namematch}}" style="text-decoration: none">&dArr;</a><a href="./datasets?sort_by=Files&sort_asc=a&namematch={{namematch}}" style="text-decoration: none">&uArr;</a></th>
+    		<th>Files<sup>*</sup><a href="./datasets?sort_by=Files&sort_asc=d&namematch={{namematch}}&selection={{selection}}" style="text-decoration: none">&dArr;</a><a href="./datasets?sort_by=Files&sort_asc=a&namematch={{namematch}}&selection={{selection}}" style="text-decoration: none">&uArr;</a></th>
             <th>Children</th>
             <th>Subsets</th>
             <th>Parents</th>