Commit 1daa8e7e authored by Franziska Koehn's avatar Franziska Koehn
Browse files

Merge branch 'develop' into feature/cSubAssessment-Extension

Conflicts:
	xsa/queries.py
parents edeca2bd 364aa838
......@@ -35,7 +35,7 @@ class QueryError(Error):
pass
class NoRestApiError(Error):
"""Should be raised when no REST-API-Interface was defined in the json-file of a root-type"""
"""Should be raised when no REST-API was defined in the json-file of a root-type"""
pass
class NoComparisonDataError(Error):
......
......@@ -204,6 +204,7 @@ def search_for(host, root_element, constraints, search_fields, user, passw):
:xsa.errors.ResponseNotReady:
:xsa.errors.QueryError:
"""
import xsa.errors
......
......@@ -113,6 +113,7 @@ class QueryView(gtk.VBox):
return list(e[0] for e in self.combobox.get_model()).index(root_field)
self.combobox.set_active(get_index())
self.treeView_search.set_query(root_field, query)
self.treeView_search.expand_all()
self.treeView_fields.set_fields(root_field, field_labels)
class TreeViewResultFields(gtk.TreeView):
......
......@@ -36,6 +36,11 @@ class XsaApp(gtk.Window):
self.connect("destroy", gtk.main_quit)
self.set_title("xsa")
def on_delete_event(*_):
import xsa.queries
xsa.queries.disconnect_xnat_server()
self.connect("delete-event", on_delete_event)
vbox_root = gtk.VBox(False, 1)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment