You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by il...@apache.org on 2012/04/17 10:26:37 UTC
svn commit: r1326988 - in
/incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages:
BasePage.java Login.java Todo.java UserModalPage.java
UserRequestModalPage.java
Author: ilgrosso
Date: Tue Apr 17 08:26:36 2012
New Revision: 1326988
URL: http://svn.apache.org/viewvc?rev=1326988&view=rev
Log:
[SYNCOPE-58] UserRequestModalPage was always set to UserModalPage.Mode.SELF, now can also be UserModalPage.Mode.ADMIN
Modified:
incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/BasePage.java
incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/Login.java
incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/Todo.java
incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/UserModalPage.java
incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/UserRequestModalPage.java
Modified: incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/BasePage.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/BasePage.java?rev=1326988&r1=1326987&r2=1326988&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/BasePage.java (original)
+++ incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/BasePage.java Tue Apr 17 08:26:36 2012
@@ -151,7 +151,7 @@ public class BasePage extends WebPage im
editProfileFrag = new Fragment("editProfile", "editProfileFrag", this);
- AjaxLink editProfileLink = new IndicatingAjaxLink("link") {
+ final AjaxLink editProfileLink = new IndicatingAjaxLink("link") {
private static final long serialVersionUID = -7978723352517770644L;
@@ -162,7 +162,7 @@ public class BasePage extends WebPage im
@Override
public Page createPage() {
return new UserRequestModalPage(BasePage.this.getPageReference(), editProfileModalWin,
- userTO);
+ userTO, UserModalPage.Mode.SELF);
}
});
Modified: incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/Login.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/Login.java?rev=1326988&r1=1326987&r2=1326988&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/Login.java (original)
+++ incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/Login.java Tue Apr 17 08:26:36 2012
@@ -99,7 +99,7 @@ public class Login extends WebPage {
passwordField.setMarkupId("password");
form.add(passwordField);
- languageSelect = new LocaleDropDown("language", Arrays.asList(new Locale[] { Locale.ENGLISH, Locale.ITALIAN }));
+ languageSelect = new LocaleDropDown("language", Arrays.asList(new Locale[]{Locale.ENGLISH, Locale.ITALIAN}));
form.add(languageSelect);
@@ -141,7 +141,7 @@ public class Login extends WebPage {
if (isSelfRegistrationAllowed()) {
selfRegFrag = new Fragment("selfRegistration", "selfRegAllowed", this);
- AjaxLink selfRegLink = new IndicatingAjaxLink("link") {
+ final AjaxLink selfRegLink = new IndicatingAjaxLink("link") {
private static final long serialVersionUID = -7978723352517770644L;
@@ -154,7 +154,7 @@ public class Login extends WebPage {
@Override
public Page createPage() {
return new UserRequestModalPage(Login.this.getPageReference(), editProfileModalWin,
- new UserTO());
+ new UserTO(), UserModalPage.Mode.SELF);
}
});
@@ -174,8 +174,8 @@ public class Login extends WebPage {
private String[] authenticate(final String userId, final String password) {
// 1. Set provided credentials to check
- PreemptiveAuthHttpRequestFactory requestFactory = ((PreemptiveAuthHttpRequestFactory) restTemplate
- .getRequestFactory());
+ PreemptiveAuthHttpRequestFactory requestFactory = ((PreemptiveAuthHttpRequestFactory) restTemplate.
+ getRequestFactory());
((DefaultHttpClient) requestFactory.getHttpClient()).getCredentialsProvider().setCredentials(
requestFactory.getAuthScope(), new UsernamePasswordCredentials(userId, password));
@@ -204,8 +204,8 @@ public class Login extends WebPage {
}
private String getCoreVersion() {
- PreemptiveAuthHttpRequestFactory requestFactory = ((PreemptiveAuthHttpRequestFactory) restTemplate
- .getRequestFactory());
+ PreemptiveAuthHttpRequestFactory requestFactory = ((PreemptiveAuthHttpRequestFactory) restTemplate.
+ getRequestFactory());
String version = "";
try {
Modified: incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/Todo.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/Todo.java?rev=1326988&r1=1326987&r2=1326988&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/Todo.java (original)
+++ incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/Todo.java Tue Apr 17 08:26:36 2012
@@ -202,8 +202,8 @@ public class Todo extends BasePage {
@Override
protected void onUpdate(final AjaxRequestTarget target) {
- prefMan.set(getRequest(), getResponse(), Constants.PREF_APPROVAL_PAGINATOR_ROWS, String
- .valueOf(approvalPaginatorRows));
+ prefMan.set(getRequest(), getResponse(), Constants.PREF_APPROVAL_PAGINATOR_ROWS, String.valueOf(
+ approvalPaginatorRows));
approvalTable.setItemsPerPage(approvalPaginatorRows);
target.add(approvalContainer);
@@ -262,8 +262,8 @@ public class Todo extends BasePage {
@Override
public Page createPage() {
- return new UserRequestModalPage(Todo.this.getPageReference(), editUserRequestWin, model
- .getObject());
+ return new UserRequestModalPage(Todo.this.getPageReference(), editUserRequestWin,
+ model.getObject(), UserModalPage.Mode.ADMIN);
}
});
@@ -330,8 +330,8 @@ public class Todo extends BasePage {
Form userRequestPaginatorForm = new Form("userRequestPaginatorForm");
- MetaDataRoleAuthorizationStrategy.authorize(userRequestPaginatorForm, RENDER, xmlRolesReader
- .getAllAllowedRoles("UserRequest", "list"));
+ MetaDataRoleAuthorizationStrategy.authorize(userRequestPaginatorForm, RENDER, xmlRolesReader.getAllAllowedRoles(
+ "UserRequest", "list"));
final DropDownChoice rowsChooser = new DropDownChoice("rowsChooser", new PropertyModel(this,
"userRequestPaginatorRows"), prefMan.getPaginatorChoices());
@@ -342,8 +342,8 @@ public class Todo extends BasePage {
@Override
protected void onUpdate(final AjaxRequestTarget target) {
- prefMan.set(getRequest(), getResponse(), Constants.PREF_USER_REQUEST_PAGINATOR_ROWS, String
- .valueOf(userRequestPaginatorRows));
+ prefMan.set(getRequest(), getResponse(), Constants.PREF_USER_REQUEST_PAGINATOR_ROWS, String.valueOf(
+ userRequestPaginatorRows));
userRequestTable.setItemsPerPage(userRequestPaginatorRows);
target.add(userRequestContainer);
Modified: incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/UserModalPage.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/UserModalPage.java?rev=1326988&r1=1326987&r2=1326988&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/UserModalPage.java (original)
+++ incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/UserModalPage.java Tue Apr 17 08:26:36 2012
@@ -49,6 +49,7 @@ public abstract class UserModalPage exte
ADMIN,
SELF,
TEMPLATE;
+
}
private static final long serialVersionUID = 5002005009737457667L;
@@ -59,7 +60,7 @@ public abstract class UserModalPage exte
protected UserTO userTO;
- private final Mode mode;
+ protected final Mode mode;
private Fragment fragment = null;
@@ -194,7 +195,6 @@ public abstract class UserModalPage exte
}
closeAction(target, form);
-
} catch (Exception e) {
LOG.error("While creating or updating user", e);
error(getString("error") + ":" + e.getMessage());
Modified: incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/UserRequestModalPage.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/UserRequestModalPage.java?rev=1326988&r1=1326987&r2=1326988&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/UserRequestModalPage.java (original)
+++ incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/UserRequestModalPage.java Tue Apr 17 08:26:36 2012
@@ -47,19 +47,19 @@ public class UserRequestModalPage extend
private UserRequestTO userRequestTO;
- public UserRequestModalPage(final PageReference callerPageRef, final ModalWindow window, final UserTO userTO) {
+ public UserRequestModalPage(final PageReference callerPageRef, final ModalWindow window, final UserTO userTO,
+ final Mode mode) {
- super(callerPageRef, window, userTO, Mode.SELF, false);
+ super(callerPageRef, window, userTO, mode, false);
setupEditPanel();
}
public UserRequestModalPage(final PageReference callerPageRef, final ModalWindow window,
- final UserRequestTO userRequestTO) {
+ final UserRequestTO userRequestTO, final Mode mode) {
- super(callerPageRef, window, null, Mode.SELF, false);
+ super(callerPageRef, window, null, mode, false);
- // evaluate userTO ...
switch (userRequestTO.getType()) {
case CREATE:
userTO = userRequestTO.getUserTO();
@@ -81,9 +81,9 @@ public class UserRequestModalPage extend
setupEditPanel();
}
- public UserRequestModalPage(final ModalWindow window, final UserTO userTO) {
+ public UserRequestModalPage(final ModalWindow window, final UserTO userTO, final Mode mode) {
- super(window, userTO, Mode.SELF);
+ super(window, userTO, mode);
}
@Override
@@ -91,20 +91,48 @@ public class UserRequestModalPage extend
final UserTO updatedUserTO = (UserTO) form.getModelObject();
if (updatedUserTO.getId() == 0) {
- requestRestClient.requestCreate(updatedUserTO);
+ switch (mode) {
+ case SELF:
+ requestRestClient.requestCreate(updatedUserTO);
+ break;
+
+ case ADMIN:
+ userRestClient.create(updatedUserTO);
+ if (userRequestTO != null) {
+ requestRestClient.delete(userRequestTO.getId());
+ }
+ break;
+
+ default:
+ LOG.warn("Invalid mode specified for {}: {}", getClass().getName(), mode);
+ }
} else {
- final UserMod userMod = AttributableOperations.diff(updatedUserTO, userRestClient.read(updatedUserTO
- .getId()));
+ final UserMod userMod = AttributableOperations.diff(updatedUserTO,
+ userRestClient.read(updatedUserTO.getId()));
- // update user just if it is changed
+ // update user only if it has changed
if (!userMod.isEmpty()) {
- requestRestClient.requestUpdate(userMod);
+ switch (mode) {
+ case SELF:
+ requestRestClient.requestUpdate(userMod);
+ break;
+
+ case ADMIN:
+ userRestClient.update(userMod);
+ if (userRequestTO != null) {
+ requestRestClient.delete(userRequestTO.getId());
+ }
+ break;
+
+ default:
+ LOG.warn("Invalid mode specified for {}: {}", getClass().getName(), mode);
+ }
}
}
}
@Override
protected void closeAction(final AjaxRequestTarget target, final Form form) {
- setResponsePage(new UserRequestModalPage(window, userTO));
+ setResponsePage(new UserRequestModalPage(window, userTO, mode));
}
}