Project

General

Profile

« Previous | Next » 

Revision 707b6237

Added by Niels Hoffmann over 12 years ago

Merged with trunk

View differences:

eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/forms/password/PasswordWizard.java
43 43 
	@Override
44 44 
	public void addPages() {
45 45 
		CdmFormFactory formFactory = new CdmFormFactory(Display.getDefault());
46
47 
//		if(CdmStore.getLoginManager().isAdmin()){
48 
//
49 
//		}else{
50 
//		}
46 51 
		passwordPage = new PasswordWizardPage(formFactory, getConversationHolder(), user);
47 
		super.addPage(passwordPage);
52 
		addPage(passwordPage);
48 53 
	}
49 54
50 55 
	/* (non-Javadoc)
......
54 59 
	public boolean performFinish() {
55 60 
		ConversationHolder internalConversation = CdmStore.getLoginManager().getConversationHolder();
56 61 
		internalConversation.bind();
57 
		CdmStore.getService(IUserService.class).changePassword(passwordPage.getOldPassword(), passwordPage.getNewPassword());
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());
66 
		}
58 67 
		internalConversation.commit();
59 68 
		conversation.bind();
60 69 
		return true;

Also available in: Unified diff