This is an automated email from the ASF dual-hosted git repository.

skylark17 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/syncope.git


The following commit(s) were added to refs/heads/master by this push:
     new 58976e0  [SYNCOPE-1431] Fixed Connector and Resource history comparison
58976e0 is described below

commit 58976e0280a4e47584d0f9cb8235676c92851d02
Author: skylark17 <matteo.alessandr...@tirasa.net>
AuthorDate: Tue Feb 5 17:24:40 2019 +0100

    [SYNCOPE-1431] Fixed Connector and Resource history comparison
---
 .../org/apache/syncope/client/console/panels/HistoryConfDetails.java | 5 +++--
 pom.xml                                                              | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git 
a/client/idm/console/src/main/java/org/apache/syncope/client/console/panels/HistoryConfDetails.java
 
b/client/idm/console/src/main/java/org/apache/syncope/client/console/panels/HistoryConfDetails.java
index 7afb0c6..d5a06f4 100644
--- 
a/client/idm/console/src/main/java/org/apache/syncope/client/console/panels/HistoryConfDetails.java
+++ 
b/client/idm/console/src/main/java/org/apache/syncope/client/console/panels/HistoryConfDetails.java
@@ -27,6 +27,7 @@ import java.util.Map;
 import java.util.stream.Collectors;
 import org.apache.commons.lang3.tuple.Pair;
 import org.apache.syncope.client.console.SyncopeConsoleSession;
+import org.apache.syncope.client.console.commons.Constants;
 import org.apache.syncope.client.console.rest.ConnectorRestClient;
 import org.apache.syncope.client.console.rest.ResourceRestClient;
 import 
org.apache.syncope.client.console.wicket.markup.html.bootstrap.dialog.BaseModal;
@@ -65,7 +66,7 @@ public class HistoryConfDetails<T extends 
AbstractHistoryConf> extends Multileve
 
         // remove selected conf from list
         this.availableHistoryConfTOs = availableHistoryConfTOs.stream().
-                filter(object -> 
object.getKey().equals(selectedHistoryConfTO.getKey())).collect(Collectors.toList());
+                filter(object -> 
!object.getKey().equals(selectedHistoryConfTO.getKey())).collect(Collectors.toList());
         this.selectedHistoryConfTO = selectedHistoryConfTO;
 
         // add current conf to list
@@ -193,7 +194,7 @@ public class HistoryConfDetails<T extends 
AbstractHistoryConf> extends Multileve
             }
         });
         dropdownElem.setNullValid(true);
-        dropdownElem.getField().add(new 
AjaxFormComponentUpdatingBehavior("onchange") {
+        dropdownElem.getField().add(new 
AjaxFormComponentUpdatingBehavior(Constants.ON_CHANGE) {
 
             private static final long serialVersionUID = -1107858522700306810L;
 
diff --git a/pom.xml b/pom.xml
index 04f9f87..2bdd558 100644
--- a/pom.xml
+++ b/pom.xml
@@ -462,7 +462,7 @@ under the License.
     <ionicons.version>2.0.1</ionicons.version>
     <highlightjs.version>9.8.0</highlightjs.version>
     <codemirror.version>5.41.0</codemirror.version>
-    <googlediffmatchpath.version>20121119-1</googlediffmatchpath.version>
+    <googlediffmatchpath.version>895a9512bb</googlediffmatchpath.version>
     <jsplumb.version>2.0.7</jsplumb.version>
     <chartjs.version>1.0.2</chartjs.version>
     

Reply via email to