Merge pull request #25 from qresp-code-development/develop

New Release, v1.2.2

CHANGELOG.md

@@ -1,6 +1,12 @@
 Change Log
 ==========
 
+v1.2.2 (2020/09/25)
+-------------------
+
+- Fixed bug impacting workflow hover info cards.
+- Updated File server parser to make compatible with new file server.
+
 v1.2.1 (2020/05/26)
 -------------------
 

web/project/templates/base_explorer.html

@@ -34,7 +34,7 @@
     <link rel="stylesheet" href="{{ url_for('static', filename='./css/css-plugin-collections.css') }}">
 
     <!--vis-->
-    <link href="https://unpkg.com/vis-network@latest/dist/vis-network.min.css" rel="stylesheet" type="text/css" />
+    <link href="https://unpkg.com/vis-network@latest/dist/dist/vis-network.min.css" rel="stylesheet" type="text/css" />
 
     <script src="{{ url_for('static', filename='./javascript/vendor/jquery.min.js') }}"></script>
     <script src="{{ url_for('static', filename='./javascript/umd/popper.js') }}"></script>

web/project/util.py

@@ -117,11 +117,11 @@ def fetchForTreeFromHttp(self):
         """
         page = requests.get(self.__path, headers=self.__headers, verify=False)
         tree = html.fromstring(page.content)
-        for xtag in tree.xpath('//li/a'):
-            file = xtag.text_content().strip()
-            if 'Parent Directory' not in file:
+        for xtag in tree.xpath('//table//tr/td[2]/a'):
+            name, file = xtag.text_content().strip(), xtag.attrib['href']
+            if 'Parent Directory' not in name:
                 dataFile = DirectoryTree()
-                dataFile.title = file
+                dataFile.title = name
                 parent = self.__path.split("/")
                 parentName = parent[len(parent) - 2]
                 dataFile.key = self.__path + "/" + file.strip("/")

web/setup.py

@@ -2,7 +2,7 @@
 
 setup(
     name='qresp',
-    version='1.2.1',
+    version='1.2.2',
     url='http://qresp.org/',
     entry_points = {
         'console_scripts': ['qresp=project.__main__:main'],