IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

FIX: Don't require device capabilities when calculating login methods

Browse Source
This commit is contained in:
David Taylor 2018-08-08 10:37:25 +01:00
parent 575d9e0b1a
commit d4d5088324
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/assets/javascripts/discourse/controllers/preferences/second-factor.js.es6
View File

@ -34,13 +34,7 @@ export default Ember.Controller.extend({
@computed @computed
displayOAuthWarning() { displayOAuthWarning() {
return ( return findAll().length > 0;
findAll(
this.siteSettings,
getOwner(this).lookup("capabilities:main"),
this.site.isMobileDevice
).length > 0
);
}, },
toggleSecondFactor(enable) { toggleSecondFactor(enable) {

5
app/assets/javascripts/discourse/models/login-method.js.es6
View File

@ -86,7 +86,10 @@ export function findAll(siteSettings, capabilities, isMobileDevice) {
}); });
// On Mobile, Android or iOS always go with full screen // On Mobile, Android or iOS always go with full screen
if (isMobileDevice || capabilities.isIOS || capabilities.isAndroid) { if (
isMobileDevice ||
(capabilities && (capabilities.isIOS || capabilities.isAndroid))
) {
methods.forEach(m => m.set("full_screen_login", true)); methods.forEach(m => m.set("full_screen_login", true));
} }