Defect #722 » 0001-refs-722.patch
| src/com/appspot/skillmaps/client/Skillmaps.java | ||
|---|---|---|
|
import com.appspot.skillmaps.shared.model.Login;
|
||
|
import com.google.gwt.core.client.EntryPoint;
|
||
|
import com.google.gwt.core.client.GWT;
|
||
|
import com.google.gwt.event.logical.shared.ValueChangeEvent;
|
||
|
import com.google.gwt.event.logical.shared.ValueChangeHandler;
|
||
|
import com.google.gwt.user.client.History;
|
||
|
import com.google.gwt.user.client.Window;
|
||
|
import com.google.gwt.user.client.rpc.AsyncCallback;
|
||
|
import com.google.gwt.user.client.ui.RootPanel;
|
||
| ... | ... | |
|
RootPanel.get("contents").add(contentsPanel);
|
||
|
|
||
|
RootPanel.get("footer").add(new Footer());
|
||
|
injector.getAccountService().login(GWT.getHostPageBaseURL() + Window.Location.getQueryString(),
|
||
|
injector.getAccountService().login(GWT.getHostPageBaseURL() +
|
||
|
Window.Location.getQueryString() +
|
||
|
Window.Location.getHash(),
|
||
|
new AsyncCallback<Login>() {
|
||
|
|
||
|
@Override
|
||
|
public void onSuccess(Login result) {
|
||
|
Login login = injector.getLogin();
|
||
|
final Login login = injector.getLogin();
|
||
|
login.setAdmin(result.isAdmin());
|
||
|
login.setEmailAddress(result.getEmailAddress());
|
||
|
login.setKey(result.getKey());
|
||
| ... | ... | |
|
login.setProfile(result.getProfile());
|
||
|
login.setReceiveEmail(result.getReceiveEmail());
|
||
|
login.setVersion(result.getVersion());
|
||
|
login.setRawLoginUrl(result.getRawLoginUrl());
|
||
|
|
||
|
//TODO headerもdisplay化？
|
||
|
RootPanel.get("header").clear();
|
||
|
RootPanel.get("header").add(new Header(login));
|
||
|
|
||
|
History.addValueChangeHandler(new ValueChangeHandler<String>() {
|
||
|
@Override
|
||
|
public void onValueChange(ValueChangeEvent<String> event) {
|
||
|
login.setLoginUrl(login.getRawLoginUrl()+
|
||
|
GWT.getHostPageBaseURL() +
|
||
|
Window.Location.getQueryString() +
|
||
|
Window.Location.getHash());
|
||
|
RootPanel.get("header").clear();
|
||
|
RootPanel.get("header").add(new Header(login));
|
||
|
}
|
||
|
});
|
||
|
injector.getHistoryHandler().handleCurrentHistory();
|
||
|
|
||
|
}
|
||
|
|
||
|
@Override
|
||
| ... | ... | |
|
Window.alert("初期処理に失敗しました。再表示してください。");
|
||
|
}
|
||
|
});
|
||
|
|
||
|
}
|
||
|
|
||
|
}
|
||
| src/com/appspot/skillmaps/server/service/AccountServiceImpl.java | ||
|---|---|---|
|
} else {
|
||
|
login.setLoggedIn(false);
|
||
|
login.setLoginUrl(userService.createLoginURL(requestUri));
|
||
|
login.setRawLoginUrl(userService.createLoginURL(""));
|
||
|
}
|
||
|
|
||
|
return login;
|
||
| src/com/appspot/skillmaps/shared/model/Login.java | ||
|---|---|---|
|
private String receiveEmail;
|
||
|
private boolean admin;
|
||
|
private Profile profile;
|
||
|
private String rawLoginUrl;
|
||
|
|
||
|
public Key getKey() {
|
||
|
return key;
|
||
| ... | ... | |
|
return admin;
|
||
|
}
|
||
|
|
||
|
public void setRawLoginUrl(String rawLoginUrl) {
|
||
|
this.rawLoginUrl = rawLoginUrl;
|
||
|
}
|
||
|
|
||
|
public String getRawLoginUrl() {
|
||
|
return rawLoginUrl;
|
||
|
}
|
||
|
|
||
|
}
|
||
| war/WEB-INF/appengine-web.xml | ||
|---|---|---|
|
<?xml version="1.0" encoding="utf-8"?>
|
||
|
<appengine-web-app xmlns="http://appengine.google.com/ns/1.0">
|
||
|
<application>skillmaps</application>
|
||
|
<version>stable-001</version>
|
||
|
<version>fix-722</version>
|
||
|
<precompilation-enabled>true</precompilation-enabled>
|
||
|
|
||
|
<system-properties>
|
||