fix if we don't have a prefilled user objecte

galaxyproject · Aug 12, 2016 · ff9f39a · ff9f39a
1 parent 320f17b
commit ff9f39a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 8 deletions.
diff --git a/client/galaxy/scripts/mvc/user/extra-information.js b/client/galaxy/scripts/mvc/user/extra-information.js
@@ -29,12 +29,8 @@ var ExtraInformation = Backbone.View.extend({
             item_object = data["preferences"][item];
             // sets the model for each plugin data and 
             // values to each input field
-            if( item_object["name"] === "section_apollo_url" ) {
-                model = plugins["section_apollo_url"];
-            }
-            else if( item_object["name"] === "section_openstack_account" ) {
-                 model = plugins["section_openstack_account"];
-            }
+
+            model = item_object["name"];
 
             template = template + '<div class="form-row '+ item_object["name"] +' ">';
             template = template + "<label>" + item_object["description"] + ":</label>";

diff --git a/lib/galaxy/webapps/galaxy/api/user_preferences.py b/lib/galaxy/webapps/galaxy/api/user_preferences.py
@@ -556,10 +556,11 @@ def get_extra_preferences( self, trans, cntrller='user_preferences', **kwd ):
             with open(path, 'r') as stream:
                 config = load(stream)
         except:
-            log.warn('Config file (%s) could not be found or is malformed.' % path)
+            log.error('Config file (%s) could not be found or is malformed.' % path)
 
         user = trans.user
-        plugin_data = user.preferences.get("dynamic_user_preferences", {})
+        plugin_data = user.preferences.get("dynamic_user_preferences", '{}')
+        log.warn(plugin_data)
         # deserializes the json and returns to the client 
         return { "config": config,
                  "plugins": json.loads(plugin_data)