Revision 59cf966f
Added by Lutz Suhrbier over 12 years ago
| eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/forms/password/PasswordWizard.java | ||
|---|---|---|
| 19 | 19 |
import eu.etaxonomy.cdm.model.common.User; |
| 20 | 20 |
import eu.etaxonomy.cdm.persistence.hibernate.CdmDataChangeMap; |
| 21 | 21 |
import eu.etaxonomy.taxeditor.store.CdmStore; |
| 22 |
import eu.etaxonomy.taxeditor.store.StoreUtil; |
|
| 22 | 23 |
import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory; |
| 23 | 24 |
|
| 24 | 25 |
/** |
| ... | ... | |
| 44 | 45 |
public void addPages() {
|
| 45 | 46 |
CdmFormFactory formFactory = new CdmFormFactory(Display.getDefault()); |
| 46 | 47 |
|
| 47 |
// if(CdmStore.getLoginManager().isAdmin()){
|
|
| 48 |
// |
|
| 49 |
// }else{
|
|
| 50 |
// } |
|
| 51 | 48 |
passwordPage = new PasswordWizardPage(formFactory, getConversationHolder(), user); |
| 52 | 49 |
addPage(passwordPage); |
| 53 | 50 |
} |
| ... | ... | |
| 57 | 54 |
*/ |
| 58 | 55 |
@Override |
| 59 | 56 |
public boolean performFinish() {
|
| 57 |
String userName = user.getUsername(); |
|
| 60 | 58 |
ConversationHolder internalConversation = CdmStore.getLoginManager().getConversationHolder(); |
| 61 | 59 |
internalConversation.bind(); |
| 62 |
if(CdmStore.getLoginManager().isAdmin()){
|
|
| 63 |
CdmStore.getService(IUserService.class).changePasswordForUser(user.getUsername(), passwordPage.getNewPassword()); |
|
| 64 |
}else{
|
|
| 65 |
CdmStore.getService(IUserService.class).changePassword(passwordPage.getOldPassword(), passwordPage.getNewPassword()); |
|
| 60 |
try{
|
|
| 61 |
if(CdmStore.getLoginManager().isAdmin()){
|
|
| 62 |
CdmStore.getService(IUserService.class).changePasswordForUser(userName, passwordPage.getNewPassword()); |
|
| 63 |
}else{
|
|
| 64 |
CdmStore.getService(IUserService.class).changePassword(passwordPage.getOldPassword(), passwordPage.getNewPassword()); |
|
| 65 |
} |
|
| 66 |
internalConversation.commit(); |
|
| 67 |
return true; |
|
| 68 |
}catch(Exception e){
|
|
| 69 |
StoreUtil.errorDialog("Error while changing password", getClass(), "There was a problem changing the password.", e);
|
|
| 70 |
return false; |
|
| 71 |
}finally{
|
|
| 72 |
conversation.bind(); |
|
| 66 | 73 |
} |
| 67 |
internalConversation.commit(); |
|
| 68 |
conversation.bind(); |
|
| 69 |
return true; |
|
| 70 | 74 |
} |
| 71 | 75 |
|
| 72 | 76 |
/* (non-Javadoc) |
Also available in: Unified diff
Result of first merge, updated getTaxon() String