You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by an...@apache.org on 2014/06/25 10:57:51 UTC
svn commit: r1605296 - in
/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages:
AbstractSyncTaskModalPage.java PushTaskModalPage.java SyncTaskModalPage.java
Author: andreapatricelli
Date: Wed Jun 25 08:57:51 2014
New Revision: 1605296
URL: http://svn.apache.org/r1605296
Log:
[SYNCOPE-473] changed default Unmatching rule for sync task to PROVISION
Modified:
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/AbstractSyncTaskModalPage.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/PushTaskModalPage.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/SyncTaskModalPage.java
Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/AbstractSyncTaskModalPage.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/AbstractSyncTaskModalPage.java?rev=1605296&r1=1605295&r2=1605296&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/AbstractSyncTaskModalPage.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/AbstractSyncTaskModalPage.java Wed Jun 25 08:57:51 2014
@@ -53,6 +53,10 @@ public abstract class AbstractSyncTaskMo
private static final long serialVersionUID = 2148403203517274669L;
+ protected AjaxDropDownChoicePanel<MatchingRule> matchingRule;
+
+ protected AjaxDropDownChoicePanel<UnmatchingRule> unmatchingRule;
+
public AbstractSyncTaskModalPage(final ModalWindow window, final AbstractSyncTaskTO taskTO,
final PageReference pageRef) {
@@ -77,7 +81,7 @@ public abstract class AbstractSyncTaskMo
final AjaxDropDownChoicePanel<String> resource = new AjaxDropDownChoicePanel<String>("resource",
getString("resourceName"), new PropertyModel<String>(taskTO, "resource"));
resource.setChoices(allResources.getObject());
- resource.setChoiceRenderer(new SelectChoiceRenderer());
+ resource.setChoiceRenderer(new SelectChoiceRenderer<String>());
resource.addRequiredLabel();
resource.setEnabled(taskTO.getId() == 0);
resource.setStyleSheet("ui-widget-content ui-corner-all long_dynamicsize");
@@ -180,22 +184,14 @@ public abstract class AbstractSyncTaskMo
new PropertyModel<Boolean>(taskTO, "syncStatus"));
profile.add(syncStatus);
- final AjaxDropDownChoicePanel<MatchingRule> matchingRule = new AjaxDropDownChoicePanel<MatchingRule>(
+ matchingRule = new AjaxDropDownChoicePanel<MatchingRule>(
"matchingRule", "matchingRule", new PropertyModel<MatchingRule>(taskTO, "matchigRule"));
matchingRule.setChoices(Arrays.asList(MatchingRule.values()));
((DropDownChoice) matchingRule.getField()).setNullValid(false);
- ((DropDownChoice) matchingRule.getField()).setDefaultModelObject(taskTO.getMatchigRule() == null
- ? MatchingRule.UPDATE
- : taskTO.getMatchigRule());
- profile.add(matchingRule);
- final AjaxDropDownChoicePanel<UnmatchingRule> unmatchingRule = new AjaxDropDownChoicePanel<UnmatchingRule>(
+ unmatchingRule = new AjaxDropDownChoicePanel<UnmatchingRule>(
"unmatchingRule", "unmatchingRule", new PropertyModel<UnmatchingRule>(taskTO, "unmatchigRule"));
unmatchingRule.setChoices(Arrays.asList(UnmatchingRule.values()));
((DropDownChoice) unmatchingRule.getField()).setNullValid(false);
- ((DropDownChoice) unmatchingRule.getField()).setDefaultModelObject(taskTO.getUnmatchigRule() == null
- ? UnmatchingRule.ASSIGN
- : taskTO.getUnmatchigRule());
- profile.add(unmatchingRule);
}
}
Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/PushTaskModalPage.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/PushTaskModalPage.java?rev=1605296&r1=1605295&r2=1605296&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/PushTaskModalPage.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/PushTaskModalPage.java Wed Jun 25 08:57:51 2014
@@ -18,18 +18,24 @@
*/
package org.apache.syncope.console.pages;
+import java.util.Arrays;
import org.apache.syncope.common.to.PushTaskTO;
import org.apache.syncope.common.to.SchedTaskTO;
+import org.apache.syncope.common.types.MatchingRule;
+import org.apache.syncope.common.types.UnmatchingRule;
import org.apache.syncope.console.commons.Constants;
import org.apache.syncope.console.pages.panels.RoleSearchPanel;
import org.apache.syncope.console.pages.panels.UserSearchPanel;
import org.apache.syncope.console.wicket.markup.html.form.AjaxCheckBoxPanel;
+import org.apache.syncope.console.wicket.markup.html.form.AjaxDropDownChoicePanel;
import org.apache.wicket.PageReference;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;
import org.apache.wicket.extensions.ajax.markup.html.modal.ModalWindow;
import org.apache.wicket.markup.html.WebMarkupContainer;
+import org.apache.wicket.markup.html.form.DropDownChoice;
import org.apache.wicket.model.Model;
+import org.apache.wicket.model.PropertyModel;
/**
* Modal window with Push Task form.
@@ -38,18 +44,30 @@ public class PushTaskModalPage extends A
private static final long serialVersionUID = 2148403203517274669L;
- final UserSearchPanel userFilter;
+ private final UserSearchPanel userFilter;
- final RoleSearchPanel roleFilter;
+ private final RoleSearchPanel roleFilter;
- final AjaxCheckBoxPanel checkUserFilter;
+ private final AjaxCheckBoxPanel checkUserFilter;
- final AjaxCheckBoxPanel checkRoleFilter;
+ private final AjaxCheckBoxPanel checkRoleFilter;
public PushTaskModalPage(final ModalWindow window, final PushTaskTO taskTO, final PageReference pageRef) {
super(window, taskTO, pageRef);
+ // set default Matching rule
+ ((DropDownChoice) matchingRule.getField()).setDefaultModelObject(taskTO.getMatchigRule() == null
+ ? MatchingRule.UPDATE
+ : taskTO.getMatchigRule());
+ profile.add(matchingRule);
+
+ // set default Unmatching rule
+ ((DropDownChoice) unmatchingRule.getField()).setDefaultModelObject(taskTO.getUnmatchigRule() == null
+ ? UnmatchingRule.ASSIGN
+ : taskTO.getUnmatchigRule());
+ profile.add(unmatchingRule);
+
final WebMarkupContainer filterContainer = new WebMarkupContainer("filterContainer");
filterContainer.setOutputMarkupId(true);
Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/SyncTaskModalPage.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/SyncTaskModalPage.java?rev=1605296&r1=1605295&r2=1605296&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/SyncTaskModalPage.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/SyncTaskModalPage.java Wed Jun 25 08:57:51 2014
@@ -20,9 +20,12 @@ package org.apache.syncope.console.pages
import org.apache.syncope.common.to.SchedTaskTO;
import org.apache.syncope.common.to.SyncTaskTO;
+import org.apache.syncope.common.types.MatchingRule;
+import org.apache.syncope.common.types.UnmatchingRule;
import org.apache.syncope.console.wicket.markup.html.form.AjaxCheckBoxPanel;
import org.apache.wicket.PageReference;
import org.apache.wicket.extensions.ajax.markup.html.modal.ModalWindow;
+import org.apache.wicket.markup.html.form.DropDownChoice;
import org.apache.wicket.model.PropertyModel;
/**
@@ -36,6 +39,18 @@ public class SyncTaskModalPage extends A
super(window, taskTO, pageRef);
+ // set default Matching rule
+ ((DropDownChoice) matchingRule.getField()).setDefaultModelObject(taskTO.getMatchigRule() == null
+ ? MatchingRule.UPDATE
+ : taskTO.getMatchigRule());
+ profile.add(matchingRule);
+
+ // set default Unmatching rule
+ ((DropDownChoice) unmatchingRule.getField()).setDefaultModelObject(taskTO.getUnmatchigRule() == null
+ ? UnmatchingRule.PROVISION
+ : taskTO.getUnmatchigRule());
+ profile.add(unmatchingRule);
+
final AjaxCheckBoxPanel fullReconciliation = new AjaxCheckBoxPanel("fullReconciliation",
getString("fullReconciliation"), new PropertyModel<Boolean>(taskTO, "fullReconciliation"));
profile.add(fullReconciliation);