Fix delete request, fix error triggered by attempting invalid convers…

…ions

client/galaxy/scripts/mvc/user/user-custom-builds.js

@@ -41,7 +41,7 @@ define( [ 'utils/utils', 'mvc/ui/ui-misc', 'mvc/form/form-view', 'mvc/ui/ui-tabl
                     icon    : 'fa-trash-o',
                     cls     : 'ui-button-icon-plain',
                     tooltip : 'Delete custom build.',
-                    onclick : function() { alert( model.id ); }
+                    onclick : function() { model.destroy() }
                 } ) ).$el );
                 self.table.append( model.id );
             });

lib/galaxy/webapps/galaxy/api/users.py

@@ -652,19 +652,22 @@ def get_custom_builds(self, trans, id, payload={}, **kwd):
         for key, attributes in dbkeys.items():
             if 'count' not in attributes:
                 fasta_dataset = trans.sa_session.query( trans.app.model.HistoryDatasetAssociation ).get( attributes[ 'fasta' ] )
-                len_dataset = fasta_dataset.get_converted_dataset( trans, "len" )
-                # HACK: need to request dataset again b/c get_converted_dataset()
-                # doesn't return dataset (as it probably should).
-                len_dataset = fasta_dataset.get_converted_dataset( trans, "len" )
-                if len_dataset.state != trans.app.model.Job.states.ERROR:
-                    chrom_count_dataset = len_dataset.get_converted_dataset( trans, "linecount" )
-                    if chrom_count_dataset and chrom_count_dataset.state == trans.app.model.Job.states.OK:
-                        try:
-                            chrom_count = int( open( chrom_count_dataset.file_name ).readline() )
-                            attributes[ 'count' ] = chrom_count
-                            updated = True
-                        except Exception as e:
-                            raise MessageException('Failed to open chrom count dataset: %s.' % e)
+                try:
+                    len_dataset = fasta_dataset.get_converted_dataset( trans, "len" )
+                    # HACK: need to request dataset again b/c get_converted_dataset()
+                    # doesn't return dataset (as it probably should).
+                    len_dataset = fasta_dataset.get_converted_dataset( trans, "len" )
+                    if len_dataset.state != trans.app.model.Job.states.ERROR:
+                        chrom_count_dataset = len_dataset.get_converted_dataset( trans, "linecount" )
+                        if chrom_count_dataset and chrom_count_dataset.state == trans.app.model.Job.states.OK:
+                            try:
+                                chrom_count = int( open( chrom_count_dataset.file_name ).readline() )
+                                attributes[ 'count' ] = chrom_count
+                                updated = True
+                            except Exception as e:
+                                pass
+                except Exception as e:
+                    pass
         if updated:
             user.preferences['dbkeys'] = json.dumps(dbkeys)
             trans.sa_session.flush()

lib/galaxy/webapps/galaxy/buildapp.py

@@ -573,7 +573,7 @@ def populate_api_routes( webapp, app ):
                            conditions=dict( method=["PUT"] ) )
 
     webapp.mapper.connect( 'delete_custom_builds',
-                           '/api/users/{id}/custom_builds',
+                           '/api/users/{id}/custom_builds/{key}',
                            controller='users',
                            action='delete_custom_builds',
                            conditions=dict( method=["DELETE"] ) )