Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
bwinf
medal
Commits
58395420
Commit
58395420
authored
Jan 26, 2021
by
Robert Czechowski
Browse files
Fix to
35a4bf7e
so that students with OAuth accounts can log in again
parent
fd5f188d
Pipeline
#989
passed with stages
in 18 minutes and 29 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
src/core.rs
View file @
58395420
...
...
@@ -1016,6 +1016,8 @@ pub fn show_profile<T: MedalConnection>(conn: &T, session_token: &str, user_id:
}
if
session
.oauth_provider
!=
Some
(
"pms"
.to_string
())
{
data
.insert
(
"profile_not_pms"
.into
(),
to_json
(
&
true
));
// This should be changed so that it can be configured if
// addresses can be obtained from OAuth provider
}
data
.insert
(
"ownprofile"
.into
(),
to_json
(
&
true
));
...
...
templates/jwinf/profile.hbs
View file @
58395420
...
...
@@ -24,7 +24,7 @@
</h3>
</div></div>
<div
class=
"columns"
>
<div
class=
"column is-8 is-offset-2"
{{#if
firstlogin
}}
style=
"border: 3px solid black; margin-bottom: 20px; margin-top: 20px; padding: 30px;"
{{/if}}
>
<div
class=
"column is-8 is-offset-2"
{{#if
firstlogin
}}{{#if
profile_logincode
}}
style=
"border: 3px solid black; margin-bottom: 20px; margin-top: 20px; padding: 30px;"
{{/if}}
{{/if}}
>
{{#if
profile_username
}}
...
...
@@ -206,7 +206,7 @@
{{/if}}
{{/if}}
{{#if
firstlogin
}}
{{#if
firstlogin
}}
{{#if
profile_logincode
}}
<script>
document
.
getElementById
(
"
delayvisibility1
"
).
style
.
display
=
"
none
"
;
document
.
getElementById
(
"
delayvisibility2
"
).
style
.
display
=
"
none
"
;
...
...
@@ -217,7 +217,7 @@ function delayvisibilitybuttonclick() {
document
.
getElementById
(
"
delayvisibility2
"
).
style
.
display
=
""
;
}
</script>
{{/if}}
{{/if}}
{{/if}}
{{/
inline
}}
{{~>
(
parent
)
~}}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment