Changeset 1864 for ComponentRegistry/tags/ComponentRegistry-1.11.1/ComponentRegistry/src/main/java/clarin/cmdi/componentregistry/frontend/UserSettingsPage.java
- Timestamp:
- 04/05/12 15:38:51 (12 years ago)
- Location:
- ComponentRegistry/tags/ComponentRegistry-1.11.1
- Files:
-
- 3 edited
- 1 copied
Legend:
- Unmodified
- Added
- Removed
-
ComponentRegistry/tags/ComponentRegistry-1.11.1
- Property svn:mergeinfo changed
/ComponentRegistry/trunk (added) merged: 1859-1863
- Property svn:mergeinfo changed
-
ComponentRegistry/tags/ComponentRegistry-1.11.1/ComponentRegistry
- Property svn:mergeinfo changed
/ComponentRegistry/trunk/ComponentRegistry (added) merged: 1860-1863
- Property svn:mergeinfo changed
-
ComponentRegistry/tags/ComponentRegistry-1.11.1/ComponentRegistry/src/main/java
- Property svn:mergeinfo changed
/ComponentRegistry/trunk/ComponentRegistry/src/main/java (added) merged: 1860,1862-1863
- Property svn:mergeinfo changed
-
ComponentRegistry/tags/ComponentRegistry-1.11.1/ComponentRegistry/src/main/java/clarin/cmdi/componentregistry/frontend/UserSettingsPage.java
r1779 r1864 5 5 package clarin.cmdi.componentregistry.frontend; 6 6 7 import clarin.cmdi.componentregistry.ComponentRegistryFactory; 8 import clarin.cmdi.componentregistry.UserCredentials; 7 9 import clarin.cmdi.componentregistry.impl.database.UserDao; 8 10 import clarin.cmdi.componentregistry.model.RegistryUser; … … 29 31 @SpringBean 30 32 private UserDao userDao; 33 @SpringBean(name = "componentRegistryFactory") 34 private ComponentRegistryFactory componentRegistryFactory; 31 35 private RegistryUser registryUser; 32 36 … … 35 39 36 40 Principal userPrincipal = ((WebRequestCycle) (RequestCycle.get())).getWebRequest().getHttpServletRequest().getUserPrincipal(); 37 registryUser = userDao.getByPrincipalName(userPrincipal.getName());38 41 registryUser = componentRegistryFactory.getOrCreateUser(new UserCredentials(userPrincipal)); 42 39 43 add(new Label("userName", registryUser.getPrincipalName())); 40 44
Note: See TracChangeset
for help on using the changeset viewer.