Merge pull request #70 from maximthomas/master

Fix policy saving in XUI issue
OpenIdentityPlatform · Aug 7, 2018 · 1ce1bdd · 1ce1bdd
2 parents 25fcc38 + 880ac9d
commit 1ce1bdd
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 11 deletions.
diff --git a/openam-ui/openam-ui-ria/pom.xml b/openam-ui/openam-ui-ria/pom.xml
@@ -79,8 +79,8 @@
         </dependency>
         <dependency>
             <groupId>org.forgerock.commons.ui.libs</groupId>
-            <artifactId>jquery-nestingSortable</artifactId>
-            <version>0.9.12</version>
+            <artifactId>jquery-sortable</artifactId>
+            <version>0.9.13</version>
             <type>js</type>
         </dependency>
         <dependency>

diff --git a/openam-ui/openam-ui-ria/src/main/js/main.js b/openam-ui/openam-ui-ria/src/main/js/main.js
@@ -71,7 +71,7 @@ require.config({
         "redux"            : "libs/redux-3.5.2-min",
         "selectize"        : "libs/selectize-non-standalone-0.12.1-min",
         "sifter"           : "libs/sifter-0.4.1-min",
-        "sortable"         : "libs/jquery-nestingSortable-0.9.12",
+        "sortable"         : "libs/jquery-sortable-0.9.13",
         "spin"             : "libs/spin-2.0.1-min",
         "text"             : "libs/text-2.0.15",
         "xdate"            : "libs/xdate-0.8-min"

diff --git a/...main/js/org/forgerock/openam/ui/admin/views/realms/authentication/chains/EditChainView.js b/...main/js/org/forgerock/openam/ui/admin/views/realms/authentication/chains/EditChainView.js
@@ -65,7 +65,7 @@ define([
 
         initSortable = function (self) {
 
-            self.$el.find("ol#sortableAuthChain").nestingSortable({
+            self.$el.find("ol#sortableAuthChain").sortable({
                 exclude: "li:not(.chain-link)",
                 delay: 100,
                 vertical: true,

diff --git a/...rgerock/openam/ui/admin/views/realms/authorization/policies/conditions/ManageRulesView.js b/...rgerock/openam/ui/admin/views/realms/authorization/policies/conditions/ManageRulesView.js
@@ -146,7 +146,7 @@ define([
 
             this.groupCounter++;
 
-            this.$el.find("ol#dropbox").nestingSortable({
+            this.$el.find("ol#dropbox").sortable({
                 group: `${self.element}rule-creation-group${self.groupCounter}`,
                 exclude: ".item-button-panel, li.editing",
                 delay: 100,
@@ -244,7 +244,7 @@ define([
                     }
 
                     delete result.subContainers;
-                    delete result.nestingSortable;
+                    delete result.nestedSortable;
                     return result;
                 }
             });
@@ -323,7 +323,7 @@ define([
             editRuleView.render(this.getProperties(), this.droppableParent, this.idCount, null,
                 function onRuleRender () {
                     self.editStart(editRuleView.$el);
-                    self.$el.find("ol#dropbox").nestingSortable("refresh");
+                    self.$el.find("ol#dropbox").sortable("refresh");
                 });
 
             this.idCount++;
@@ -404,7 +404,7 @@ define([
                 return;
             }
 
-            var rules = this.$el.find("ol#dropbox").nestingSortable("serialize").get(),
+            var rules = this.$el.find("ol#dropbox").sortable("serialize").get(),
                 operatorData = this.$el.find(`#operator${this.idPrefix}0`).data().itemData;
 
             // Removing any obsolete root logicals.

diff --git a/openam-ui/pom.xml b/openam-ui/pom.xml
@@ -94,11 +94,11 @@
                         	</artifactItem>
                         	<artifactItem>
 							<groupId>org.forgerock.commons.ui.libs</groupId>
-			                <artifactId>jquery-nestingSortable</artifactId>
-			                <version>0.9.12</version>
+			                <artifactId>jquery-sortable</artifactId>
+			                <version>0.9.13</version>
 			                <packaging>js</packaging>
 							<downloadUrl>
-								https://raw.githubusercontent.com/ilikenwf/nestedSortable/v1.3.3/jquery.ui.nestedSortable.js
+								https://raw.githubusercontent.com/johnny/jquery-sortable/master/source/js/jquery-sortable.js
                         		</downloadUrl>
                         	</artifactItem>
                         	<artifactItem>