Merged galaxy/galaxy-central into default

config/plugins/visualizations/charts/static/views/group.js

@@ -254,7 +254,9 @@ return Backbone.View.extend({
         if (key_text === undefined) {
             key_text = '';
         }
-        this.group_key.value(key_text);
+        if (key_text != this.group_key.value()) {
+            this.group_key.value(key_text);
+        }
     }
 });
 

lib/galaxy/tools/wrappers.py

@@ -262,7 +262,7 @@ class HasDatasets:
         return DatasetFilenameWrapper( dataset, **wrapper_kwds )
 
 
-class DatasetListWrapper( list, HasDatasets ):
+class DatasetListWrapper( list, ToolParameterValueWrapper, HasDatasets ):
     """
     """
     def __init__( self, datasets, dataset_paths=[], **kwargs ):
@@ -277,7 +277,7 @@ class DatasetListWrapper( list, HasDatasets ):
         return ','.join( map( str, self ) )
 
 
-class DatasetCollectionWrapper( object, HasDatasets ):
+class DatasetCollectionWrapper( ToolParameterValueWrapper, HasDatasets ):
 
     def __init__( self, has_collection, dataset_paths=[], **kwargs ):
         super(DatasetCollectionWrapper, self).__init__()

lib/galaxy/webapps/galaxy/controllers/user.py

@@ -1167,8 +1167,6 @@ class User( BaseUIController, UsesFormDefinitionsMixin, CreatesUsersMixin, Creat
                     trans.sa_session.flush()
                     trans.log_event( "User reset password: %s" % email )
                 except Exception, e:
-                    status = 'error'
-                    message = 'Failed to reset password: %s' % str( e )
                     log.exception( 'Unable to reset password.' )
         return trans.fill_template( '/user/reset_password.mako',
                                     message=message,

templates/user/change_password.mako

@@ -10,7 +10,7 @@
         <div class="toolFormTitle">Change Password</div>
         %if token:
             <input type="hidden" name="token" value="${token|h}"/>
-        %elif not is_admin:
+        %else:
             <div class="form-row">
                 <label>Current password:</label>
                 <input type="password" name="current" value="" size="40"/>