Merge pull request #28 from guerler/remove_mako_user_pref_000

Restore changes
jmchilton · Nov 3, 2016 · d5804d6 · d5804d6
2 parents 8f49202 + 301c5ec
commit d5804d6
Show file tree

Hide file tree

Showing 14 changed files with 335 additions and 494 deletions.
diff --git a/client/galaxy/scripts/layout/menu.js b/client/galaxy/scripts/layout/menu.js
@@ -234,13 +234,11 @@ var Collection = Backbone.Collection.extend({
                 tooltip         : 'Account preferences and saved data',
                 menu            : [{
                         title   : 'Logged in as ' + Galaxy.user.get( 'email' )
-                    },
-                    {
+                    },{
                         title   : 'User Preferences',
                         url     : 'user?cntrller=user',
                         target  : 'galaxy_main'
-                    },
-                    {
+                    },{
                         title   : 'Custom Builds',
                         url     : 'user/dbkeys',
                         target  : 'galaxy_main'
@@ -268,15 +266,14 @@ var Collection = Backbone.Collection.extend({
                 }]
             };
 
-            if( window.Galaxy.config.enable_new_user_preferences ) {
+            if( Galaxy.config.enable_new_user_preferences ) {
                 userTab.menu.push({
                     title   : 'New User Preferences',
                     url     : 'user',
                     onclick : function() {
-                        if (Galaxy.app) {
-                            Galaxy.app.display(new Preferences.UserPreferences());
-                        } 
-                        else {
+                        if ( Galaxy.app ) {
+                            Galaxy.app.display( new Preferences.UserPreferences() );
+                        } else {
                             window.location = Galaxy.root + "user";
                         }
                     }

diff --git a/client/galaxy/scripts/layout/page.js b/client/galaxy/scripts/layout/page.js
@@ -140,7 +140,7 @@ var PageLayoutView = Backbone.View.extend( BaseMVC.LoggableMixin ).extend({
             port = window.Galaxy.config.communication_server_port,
             $chat_icon_element = $( "#show-chat-online" );
         /** Check if the user has deactivated the communication in it's personal settings */
-        if ( window.Galaxy.user.attributes.preferences !== undefined && ( window.Galaxy.user.attributes.preferences.communication_server === '1' || window.Galaxy.user.attributes.preferences.communication_server === 'true' ) ) {
+        if ( Galaxy.user.attributes.preferences && [ '1', 'true' ].indexOf( Galaxy.user.attributes.preferences.communication_server ) != -1 ) {
             // See if the configured communication server is available
             $.ajax({
                 url: host + ":" + port,

diff --git a/client/galaxy/scripts/mvc/form/form-input.js b/client/galaxy/scripts/mvc/form/form-input.js
@@ -125,4 +125,4 @@ define([], function() {
                                  .append( $( '<div/>' ).addClass( 'ui-form-preview' ) );
         }
     });
-});
+});
diff --git a/client/galaxy/scripts/mvc/form/form-parameters.js b/client/galaxy/scripts/mvc/form/form-parameters.js
@@ -41,9 +41,6 @@ define(['utils/utils',
                 Galaxy.emit.debug('form-parameters::_addRow()', 'Auto matched field type (' + input_def.type + ').');
             }
             input_def.value === undefined && ( input_def.value = null );
-            if ( field.value ) { // added for input submit
-                field.value( input_def.value );
-            }
             return field;
         },
 
@@ -219,4 +216,4 @@ define(['utils/utils',
     return {
         View: View
     };
-});
+});
diff --git a/client/galaxy/scripts/mvc/form/form-section.js b/client/galaxy/scripts/mvc/form/form-section.js
@@ -172,4 +172,4 @@ function( Utils, Ui, Portlet, Repeat, InputElement, Parameters ) {
     return {
         View: View
     };
-});
+});
diff --git a/client/galaxy/style/less/base.less b/client/galaxy/style/less/base.less
@@ -1762,24 +1762,4 @@ div.toolTitleNoSection
         color:black;
         text-align:left;
     }
-}
-
-// for user preferences javascript files
-.manage-userinfo, 
-.link-filter, 
-.change-password,
-.change-permissions,
-.manage-api-keys,
-.manage-toolbox-filters,
-.change-communication-setting,
-.logout-user {
-    cursor: pointer;
-}
-
-.edit-address, delete-address {
-    margin-right: 2px;
-}
-
-.toolForm {
-    margin-top: 1%;
-}
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -125,4 +125,4 @@ define([], function() { @@
                                      .append( $( '<div/>' ).addClass( 'ui-form-preview' ) );
             }
         });
-    });
+    });