json/admin/config/Plugin/Section displays option dictionary

src/pyscripts/plugins/JSONAPI/admin/config.py

@@ -1,5 +1,5 @@
 from xsbs.http.jsonapi import JsonAdminSite
-from xsbs.settings import pluginNames, pluginSections, sectionOptions, setOption
+from xsbs.settings import pluginNames, pluginSections, sectionOptionValues, setOption
 
 try:
 	import json
@@ -23,11 +23,15 @@ def __init__(self, plugin_name, section_name):
 		JsonAdminSite.__init__(self)
 		self.plugin_name = plugin_name
 		self.section_name = section_name
+		optvals = sectionOptionValues(plugin_name, section_name)
+		self.options = {}
+		for option, value in optvals:
+			self.options[option] = value
 	def render_admin_JSON(self, request, user):
 		return json.dumps({
 			'plugin': self.plugin_name,
 			'section': self.section_name,
-			'options': sectionOptions(self.plugin_name, self.section_name)
+			'options': self.options
 			})
 
 class ConfigSite(JsonAdminSite):

src/pyscripts/xsbs/settings.py

@@ -53,9 +53,8 @@ def pluginNames():
 def pluginSections(plugin_name):
 	return remove_dups(strip_arr(session.query(ConfigOption.section).filter_by(plugin=plugin_name)))
 
-def sectionOptions(plugin_name, section):
-
-	return remove_dups(strip_arr(session.query(ConfigOption.section).filter_by(plugin=plugin_name).filter_by(section=section)))
+def sectionOptionValues(plugin_name, section):
+	return session.query(ConfigOption.name, ConfigOption.value).filter_by(plugin=plugin_name).filter_by(section=section)
 
 def setOption(plugin_name, section, option, value):
 	pass