Merge pull request #11 from justcoded/develop

Fix js to be compatible with adminlte v2.6
justcoded · Apr 18, 2018 · a973d38 · a973d38
2 parents 3037bcb + 8d12186
commit a973d38
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,10 @@
 CHANGELOG
 =====================
 
+v1.1.3
+---------------------
+* Bugfix: Compatibility with Adminlte v2.6.0 (conflict of $.fn.tree plugin name). @ap
+
 v1.1.2
 ---------------------
 * AccessControl filter update default regexp to ^site, in debug mode add gii and debug modules.

diff --git a/src/assets/js/jstree-double-panel.js b/src/assets/js/jstree-double-panel.js
diff --git a/src/assets/js/rbac.js b/src/assets/js/rbac.js
@@ -4,7 +4,7 @@
   })
 
   function init_role_permissions_tree() {
-    $.fn.tree({
+    $.fn.treePanels({
       dataFrom: window.allowPermissions,
       dataTo: window.denyPermissions,
       fromTreeElement:'#allowPermissions',