Improve error handling, add success and warning messages

galaxyproject · Mar 17, 2017 · 39c9f79 · 39c9f79
1 parent 474b0c1
commit 39c9f79
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 11 deletions.
diff --git a/client/galaxy/scripts/mvc/user/user-custom-builds.js b/client/galaxy/scripts/mvc/user/user-custom-builds.js
@@ -78,8 +78,8 @@ define( [ 'utils/utils', 'mvc/ui/ui-misc', 'mvc/form/form-view', 'mvc/ui/ui-tabl
                         help    : 'Provide the data source.',
                         type    : 'select',
                         value   : 'file',
-                        data    : [ { value : 'fasta',  label : 'FASTA-file from History' },
-                                    { value : 'file',   label : 'Len-file from History' },
+                        data    : [ { value : 'fasta',  label : 'FASTA-file from history' },
+                                    { value : 'file',   label : 'Len-file from history' },
                                     { value : 'text',   label : 'Len-file by copy/paste' } ]
                     },
                     cases       : [ {
@@ -118,16 +118,21 @@ define( [ 'utils/utils', 'mvc/ui/ui-misc', 'mvc/form/form-view', 'mvc/ui/ui-tabl
                         onclick  : function() {
                             var data = form.data.create();
                             if ( !data.id || !data.name ) {
-                                self.message.update({ message: 'All inputs are required.', status: 'danger' });
+                                self.message.update( { message: 'All inputs are required.', status: 'danger' } );
                             } else {
                                 self.collection.create( data, {
                                     wait    : true,
                                     success : function( response ) {
+                                        if ( response.get( 'message' ) ) {
+                                            self.message.update( { message: response.get( 'message' ), status: 'warning' } );
+                                        } else {
+                                            self.message.update( { message: 'Successfully added custom build.', status: 'success' } );
+                                        }
                                         _.each( form.field_list, function( field ) { field.value( null ) } );
                                     },
                                     error   : function( response, err ) {
                                         var message = err && err.responseJSON && err.responseJSON.err_msg;
-                                        self.message.update({ message: message || 'Failed to create custom build.', status: 'danger' });
+                                        self.message.update( { message: message || 'Failed to create custom build.', status: 'danger' } );
                                     }
                                 });
                             }

diff --git a/lib/galaxy/webapps/galaxy/api/users.py b/lib/galaxy/webapps/galaxy/api/users.py
@@ -732,7 +732,7 @@ def add_custom_builds(self, trans, id, key, payload={}, **kwd):
                         lines_skipped += 1
                         continue
                     if chrom != escape(chrom):
-                        message = 'Invalid chromosome(s) with HTML detected and skipped'
+                        build_dict[ 'message' ] = 'Invalid chromosome(s) with HTML detected and skipped'
                         lines_skipped += 1
                         continue
                     counter += 1

diff --git a/static/maps/mvc/user/user-custom-builds.js.map b/static/maps/mvc/user/user-custom-builds.js.map
diff --git a/static/scripts/bundled/analysis.bundled.js b/static/scripts/bundled/analysis.bundled.js
diff --git a/static/scripts/bundled/analysis.bundled.js.map b/static/scripts/bundled/analysis.bundled.js.map
diff --git a/static/scripts/bundled/libs.bundled.js.map b/static/scripts/bundled/libs.bundled.js.map
diff --git a/static/scripts/mvc/user/user-custom-builds.js b/static/scripts/mvc/user/user-custom-builds.js