From 690d52420a78c94274659f3629ef7268c8bd48bb Mon Sep 17 00:00:00 2001 From: Valentina Kiryushkina Date: Tue, 2 Aug 2016 12:16:25 +0300 Subject: [PATCH] Fix EDU-630 Missing email in settings and login dialog in case I've already logged in --- .../src/com/jetbrains/edu/learning/stepic/LoginDialog.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/python/educational-core/student/src/com/jetbrains/edu/learning/stepic/LoginDialog.java b/python/educational-core/student/src/com/jetbrains/edu/learning/stepic/LoginDialog.java index e483adc8df31..9f0a2779f936 100644 --- a/python/educational-core/student/src/com/jetbrains/edu/learning/stepic/LoginDialog.java +++ b/python/educational-core/student/src/com/jetbrains/edu/learning/stepic/LoginDialog.java @@ -1,7 +1,10 @@ package com.jetbrains.edu.learning.stepic; +import com.intellij.openapi.project.Project; +import com.intellij.openapi.project.ProjectUtil; import com.intellij.openapi.ui.DialogWrapper; import com.intellij.openapi.util.text.StringUtil; +import com.jetbrains.edu.learning.StudyTaskManager; import com.jetbrains.edu.learning.ui.LoginPanel; import org.jetbrains.annotations.NotNull; @@ -44,6 +47,10 @@ public class LoginDialog extends DialogWrapper { final StepicUser user = EduStepicConnector.login(myLoginPanel.getLogin(), myLoginPanel.getPassword()); if (user != null) { doJustOkAction(); + final Project project = ProjectUtil.guessCurrentProject(myLoginPanel.getContentPanel()); + user.setEmail(myLoginPanel.getLogin()); + user.setPassword(myLoginPanel.getPassword()); + StudyTaskManager.getInstance(project).setUser(user); } else { setErrorText("Login failed");