Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

correct full screen login feature

This commit is contained in:
Sam 2015-10-13 13:11:39 +11:00
parent 5b16adc0e8
commit fab51496cb
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/discourse/controllers/login.js.es6
View File

@ -114,7 +114,7 @@ export default Ember.Controller.extend(ModalFunctionality, {
customLogin();
} else {
var authUrl = Discourse.getURL("/auth/" + name);
if (loginMethod.get("full_screen_login")) {
if (loginMethod.get("fullScreenLogin")) {
window.location = authUrl;
} else {
this.set('authenticate', name);

2
app/views/users/omniauth_callbacks/complete.html.erb
View File

@ -26,7 +26,7 @@
window.opener.Discourse.authenticationComplete(<%=@auth_result.to_client_hash.to_json.html_safe%>);
window.close();
} else {
window.location = <%= @origin.inspect %>;
window.location = <%= @origin.inspect.html_safe %>;
}
</script>
</div>

3
lib/plugin/auth_provider.rb
View File

@ -2,7 +2,7 @@ class Plugin::AuthProvider
def self.auth_attributes
[:glyph, :background_color, :title, :message, :frame_width, :frame_height, :authenticator,
:title_setting, :enabled_setting]
:title_setting, :enabled_setting, :full_screen_login]
end
attr_accessor(*auth_attributes)
@ -19,6 +19,7 @@ class Plugin::AuthProvider
result['messageOverride'] = message if message
result['frameWidth'] = frame_width if frame_width
result['frameHeight'] = frame_height if frame_height
result['fullScreenLogin'] = full_screen_login if full_screen_login
result.to_json
end