Skip to content

Commit

Permalink
Fix login page app options
Browse files Browse the repository at this point in the history
  • Loading branch information
guerler committed May 9, 2017
1 parent cdee899 commit cfb1b73
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 7 deletions.
7 changes: 3 additions & 4 deletions client/galaxy/scripts/apps/login.js
Expand Up @@ -18,16 +18,15 @@ window.app = function app( options, bootstrapped ){
}

var LoginPage = Backbone.View.extend({
initialize: function( page, options ) {
this.options = options;
initialize: function( page ) {
this.model = new Backbone.Model({ title : _l( 'Login required' ) } );
this.setElement( this._template() );
},
render: function() {
$( '#galaxy_main' ).prop( 'src', this.options.config.welcome_url );
$( '#galaxy_main' ).prop( 'src', options.welcome_url );
},
_template : function() {
var login_url = this.options.root + 'user/login?' + $.param( { redirect : this.options.redirect } );
var login_url = options.root + 'user/login?' + $.param( { redirect : redirect } );
return '<iframe src="' + login_url + '" frameborder="0" style="width: 100%; height: 100%;"/>';
}
});
Expand Down
2 changes: 1 addition & 1 deletion static/scripts/bundled/libs.bundled.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion static/scripts/bundled/login.bundled.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion static/scripts/bundled/login.bundled.js.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit cfb1b73

Please sign in to comment.