You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by fm...@apache.org on 2013/03/19 15:30:32 UTC
svn commit: r1458310 - in /syncope/trunk:
common/src/main/java/org/apache/syncope/common/types/
console/src/main/java/org/apache/syncope/console/pages/
console/src/main/java/org/apache/syncope/console/pages/panels/
console/src/main/java/org/apache/sync...
Author: fmartelli
Date: Tue Mar 19 14:30:32 2013
New Revision: 1458310
URL: http://svn.apache.org/r1458310
Log:
SYNCOPE-336 fixed
Modified:
syncope/trunk/common/src/main/java/org/apache/syncope/common/types/MappingPurpose.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Resources.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/ResourceMappingPanel.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/wicket/markup/html/form/AjaxTextFieldPanel.java
syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/BaseModalPage.html
syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/BasePage.html
Modified: syncope/trunk/common/src/main/java/org/apache/syncope/common/types/MappingPurpose.java
URL: http://svn.apache.org/viewvc/syncope/trunk/common/src/main/java/org/apache/syncope/common/types/MappingPurpose.java?rev=1458310&r1=1458309&r2=1458310&view=diff
==============================================================================
--- syncope/trunk/common/src/main/java/org/apache/syncope/common/types/MappingPurpose.java (original)
+++ syncope/trunk/common/src/main/java/org/apache/syncope/common/types/MappingPurpose.java Tue Mar 19 14:30:32 2013
@@ -17,8 +17,8 @@ package org.apache.syncope.common.types;
public enum MappingPurpose {
+ BOTH,
SYNCHRONIZATION,
- PROPAGATION,
- BOTH
+ PROPAGATION
}
Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Resources.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Resources.java?rev=1458310&r1=1458309&r2=1458310&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Resources.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Resources.java Tue Mar 19 14:30:32 2013
@@ -92,7 +92,7 @@ public class Resources extends BasePage
private static final int WIN_HEIGHT = 600;
- private static final int WIN_WIDTH = 950;
+ private static final int WIN_WIDTH = 1100;
private WebMarkupContainer resourceContainer;
Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/ResourceMappingPanel.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/ResourceMappingPanel.java?rev=1458310&r1=1458309&r2=1458310&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/ResourceMappingPanel.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/ResourceMappingPanel.java Tue Mar 19 14:30:32 2013
@@ -278,6 +278,9 @@ public class ResourceMappingPanel extend
@Override
protected void populateItem(final ListItem<MappingItemTO> item) {
final MappingItemTO mapItem = item.getModelObject();
+ if (mapItem.getPurpose() == null) {
+ mapItem.setPurpose(MappingPurpose.BOTH);
+ }
AttributableType entity = null;
if (mapItem.getIntMappingType() != null) {
@@ -363,22 +366,17 @@ public class ResourceMappingPanel extend
});
item.add(entitiesPanel);
- final FieldPanel extAttrName;
- if (schemaNames.isEmpty()) {
- extAttrName = new AjaxTextFieldPanel("extAttrName", new ResourceModel("extAttrNames",
- "extAttrNames").getObject(), new PropertyModel<String>(mapItem, "extAttrName"));
- } else {
- extAttrName = new AjaxDropDownChoicePanel<String>("extAttrName", new ResourceModel("extAttrNames",
- "extAttrNames").getObject(), new PropertyModel(mapItem, "extAttrName"), false);
- ((AjaxDropDownChoicePanel) extAttrName).setChoices(schemaNames);
- }
+ final FieldPanel extAttrName = new AjaxTextFieldPanel("extAttrName", new ResourceModel("extAttrNames",
+ "extAttrNames").getObject(), new PropertyModel<String>(mapItem, "extAttrName"));
+ ((AjaxTextFieldPanel) extAttrName).setChoices(schemaNames);
+
boolean required = false;
if (mapItem != null) {
boolean accountIdOrPassword = mapItem.isAccountid() || mapItem.isPassword();
if (!accountIdOrPassword) {
required = true;
} else if (accountIdOrPassword && !schemaNames.isEmpty()) {
- ((AjaxDropDownChoicePanel) extAttrName).setModelObject(null);
+ ((AjaxTextFieldPanel) extAttrName).setModelObject(null);
}
}
extAttrName.setRequired(required);
Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/wicket/markup/html/form/AjaxTextFieldPanel.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/wicket/markup/html/form/AjaxTextFieldPanel.java?rev=1458310&r1=1458309&r2=1458310&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/wicket/markup/html/form/AjaxTextFieldPanel.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/wicket/markup/html/form/AjaxTextFieldPanel.java Tue Mar 19 14:30:32 2013
@@ -26,6 +26,7 @@ import java.util.regex.Pattern;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;
+import org.apache.wicket.extensions.ajax.markup.html.autocomplete.AutoCompleteSettings;
import org.apache.wicket.extensions.ajax.markup.html.autocomplete.AutoCompleteTextField;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
@@ -41,12 +42,16 @@ public class AjaxTextFieldPanel extends
super(id, name, model);
- field = new AutoCompleteTextField<String>("textField", model) {
+ final AutoCompleteSettings settings = new AutoCompleteSettings();
+ settings.setShowCompleteListOnFocusGain(true);
+ settings.setShowListOnEmptyInput(true);
+
+ field = new AutoCompleteTextField<String>("textField", model, settings) {
private static final long serialVersionUID = -6648767303091874219L;
@Override
- protected Iterator<String> getChoices(String input) {
+ protected Iterator<String> getChoices(final String input) {
final Pattern pattern = Pattern.compile(Pattern.quote(input) + ".*", Pattern.CASE_INSENSITIVE);
final List<String> result = new ArrayList<String>();
Modified: syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/BaseModalPage.html
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/BaseModalPage.html?rev=1458310&r1=1458309&r2=1458310&view=diff
==============================================================================
--- syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/BaseModalPage.html (original)
+++ syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/BaseModalPage.html Tue Mar 19 14:30:32 2013
@@ -22,7 +22,6 @@ under the License.
<link rel="stylesheet" type="text/css" href="css/style.css" media="all"/>
<link rel="stylesheet" type="text/css" href="css/fieldstyle.css" media="all"/>
- <script type="text/javascript" src="wicket/resource/org.apache.wicket.resource.JQueryResourceReference/jquery/jquery.min.js"></script>
<script type="text/javascript" src="scripts/jquery-ui.js"></script>
<script type="text/javascript">
Modified: syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/BasePage.html
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/BasePage.html?rev=1458310&r1=1458309&r2=1458310&view=diff
==============================================================================
--- syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/BasePage.html (original)
+++ syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/BasePage.html Tue Mar 19 14:30:32 2013
@@ -36,7 +36,6 @@ under the License.
<link rel="stylesheet" type="text/css" href="css/style.css" media="all"/>
<link rel="stylesheet" type="text/css" href="css/fieldstyle.css" />
- <script type="text/javascript" src="wicket/resource/org.apache.wicket.resource.JQueryResourceReference/jquery/jquery.min.js"></script>
<script type="text/javascript" src="scripts/jquery-ui.js"></script>
<script type="text/javascript">