diff options
author | Lauri Ojansivu <x@xet7.org> | 2019-02-17 18:16:11 +0200 |
---|---|---|
committer | Lauri Ojansivu <x@xet7.org> | 2019-02-17 18:16:11 +0200 |
commit | fa0b4d7edda138caf951b4b9416450df15df68f0 (patch) | |
tree | 3d3d4a976691d1afbcec29e792ef63d4cc2bd828 /client/components | |
parent | d5593e059b8b2a4b3e515a9cf9f5933459f37020 (diff) | |
parent | 4bf0914f1e5943fd10c5318db34e755ce895c4bb (diff) | |
download | wekan-fa0b4d7edda138caf951b4b9416450df15df68f0.tar.gz wekan-fa0b4d7edda138caf951b4b9416450df15df68f0.tar.bz2 wekan-fa0b4d7edda138caf951b4b9416450df15df68f0.zip |
Merge branch 'edge' into meteor-1.8
Diffstat (limited to 'client/components')
-rw-r--r-- | client/components/main/layouts.jade | 2 | ||||
-rw-r--r-- | client/components/settings/connectionMethod.jade | 7 | ||||
-rw-r--r-- | client/components/settings/connectionMethod.js | 3 |
3 files changed, 9 insertions, 3 deletions
diff --git a/client/components/main/layouts.jade b/client/components/main/layouts.jade index a6115ec1..f2c40b9f 100644 --- a/client/components/main/layouts.jade +++ b/client/components/main/layouts.jade @@ -24,7 +24,7 @@ template(name="userFormsLayout") section.auth-dialog +Template.dynamic(template=content) if currentSetting.displayAuthenticationMethod - +connectionMethod + +connectionMethod(authenticationMethod=currentSetting.defaultAuthenticationMethod) div.at-form-lang select.select-lang.js-userform-set-language each languages diff --git a/client/components/settings/connectionMethod.jade b/client/components/settings/connectionMethod.jade index ac4c8c64..d191929f 100644 --- a/client/components/settings/connectionMethod.jade +++ b/client/components/settings/connectionMethod.jade @@ -2,5 +2,8 @@ template(name='connectionMethod') div.at-form-authentication label {{_ 'authentication-method'}} select.select-authentication - each authentications - option(value="{{value}}") {{_ value}} + each authentications + if isSelected value + option(value="{{value}}" selected) {{_ value}} + else + option(value="{{value}}") {{_ value}}
\ No newline at end of file diff --git a/client/components/settings/connectionMethod.js b/client/components/settings/connectionMethod.js index 9fe8f382..db9da25f 100644 --- a/client/components/settings/connectionMethod.js +++ b/client/components/settings/connectionMethod.js @@ -31,4 +31,7 @@ Template.connectionMethod.helpers({ authentications() { return Template.instance().authenticationMethods.get(); }, + isSelected(match) { + return Template.instance().data.authenticationMethod === match; + }, }); |