Skip to content

Commit

Permalink
bugfix in the json implementation
Browse files Browse the repository at this point in the history
  • Loading branch information
@bgruening
bgruening committed Aug 12, 2016
1 parent 4b53ae0 commit b3d7a02
Show file tree
Hide file tree
Showing 2 changed files with 42 additions and 42 deletions.
82 changes: 41 additions & 41 deletions client/galaxy/scripts/mvc/user/manage-user-information.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -384,13 +384,13 @@ var ManageUserInformation = Backbone.View.extend({
'<div style="clear: both"></div>' +
'</div>' +
'<div class="form-row">' +
'<label>Institution:</label>' +
'<div style="float: left; width: 250px; margin-right: 10px;">' +
'<input type="text" name="institution" value="' + ( address_object ? address_object.institution : '' ) + '" size="40">' +
'</div>' +
'<div class="toolParamHelp" style="clear: both;">Required</div>' +
'<div style="clear: both"></div>' +
'</div>' +
'<label>Institution:</label>' +
'<div style="float: left; width: 250px; margin-right: 10px;">' +
'<input type="text" name="institution" value="' + ( address_object ? address_object.institution : '' ) + '" size="40">' +
'</div>' +
'<div class="toolParamHelp" style="clear: both;">Required</div>' +
'<div style="clear: both"></div>' +
'</div>' +
'<div class="form-row">' +
'<label>Address:</label>' +
'<div style="float: left; width: 250px; margin-right: 10px;">' +
Expand All @@ -407,40 +407,40 @@ var ManageUserInformation = Backbone.View.extend({
'<div class="toolParamHelp" style="clear: both;">Required</div>' +
'<div style="clear: both"></div>' +
'</div>' +
'<div class="form-row">' +
'<label>State/Province/Region:</label>' +
'<div style="float: left; width: 250px; margin-right: 10px;">' +
'<input type="text" name="state" value="' + ( address_object ? address_object.state : '' ) + '" size="40">' +
'</div>' +
'<div class="toolParamHelp" style="clear: both;">Required</div>' +
'<div style="clear: both"></div>' +
'</div>' +
'<div class="form-row">' +
'<label>Postal Code:</label>' +
'<div style="float: left; width: 250px; margin-right: 10px;">' +
'<input type="text" name="postal_code" value="' + ( address_object ? address_object.postal_code : '' ) + '" size="40">' +
'</div>' +
'<div class="toolParamHelp" style="clear: both;">Required</div>' +
'<div style="clear: both"></div>' +
'</div>' +
'<div class="form-row">' +
'<label>Country:</label>' +
'<div style="float: left; width: 250px; margin-right: 10px;">' +
'<input type="text" name="country" value="' + ( address_object ? address_object.country : '' ) + '" size="40">' +
'</div>' +
'<div class="toolParamHelp" style="clear: both;">Required</div>' +
'<div style="clear: both"></div>' +
'</div>' +
'<div class="form-row">' +
'<label>Phone:</label>' +
'<div style="float: left; width: 250px; margin-right: 10px;">' +
'<input type="text" name="phone" value="' + ( address_object ? address_object.phone : '' ) + '" size="40">' +
'</div>' +
'<div style="clear: both"></div>' +
'</div>' +
'<div class="form-row">' +
'<input type="button" class="action-button '+ cssClass +'" name="'+ btnName +'" value="'+ value +'">' +
'</div>';
'<div class="form-row">' +
'<label>State/Province/Region:</label>' +
'<div style="float: left; width: 250px; margin-right: 10px;">' +
'<input type="text" name="state" value="' + ( address_object ? address_object.state : '' ) + '" size="40">' +
'</div>' +
'<div class="toolParamHelp" style="clear: both;">Required</div>' +
'<div style="clear: both"></div>' +
'</div>' +
'<div class="form-row">' +
'<label>Postal Code:</label>' +
'<div style="float: left; width: 250px; margin-right: 10px;">' +
'<input type="text" name="postal_code" value="' + ( address_object ? address_object.postal_code : '' ) + '" size="40">' +
'</div>' +
'<div class="toolParamHelp" style="clear: both;">Required</div>' +
'<div style="clear: both"></div>' +
'</div>' +
'<div class="form-row">' +
'<label>Country:</label>' +
'<div style="float: left; width: 250px; margin-right: 10px;">' +
'<input type="text" name="country" value="' + ( address_object ? address_object.country : '' ) + '" size="40">' +
'</div>' +
'<div class="toolParamHelp" style="clear: both;">Required</div>' +
'<div style="clear: both"></div>' +
'</div>' +
'<div class="form-row">' +
'<label>Phone:</label>' +
'<div style="float: left; width: 250px; margin-right: 10px;">' +
'<input type="text" name="phone" value="' + ( address_object ? address_object.phone : '' ) + '" size="40">' +
'</div>' +
'<div style="clear: both"></div>' +
'</div>' +
'<div class="form-row">' +
'<input type="button" class="action-button '+ cssClass +'" name="'+ btnName +'" value="'+ value +'">' +
'</div>';
template = template + '</form></div></div></div>';
return template;
},
Expand Down
2 changes: 1 addition & 1 deletion lib/galaxy/webapps/galaxy/api/user_preferences.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -575,7 +575,7 @@ def save_extra_preferences( self, trans, cntrller='user_preferences', **kwd ):
user = trans.user
plugin_data = kwd.get( "plugin_data", {} )
# serializes the json and save the user preferences
user.preferences["dynamic_user_preferences"] = json.dumps( plugin_data )
user.preferences["dynamic_user_preferences"] = plugin_data
# saves the user data
trans.sa_session.add( user )
trans.sa_session.flush()
Expand Down

0 comments on commit b3d7a02

Please sign in to comment.