Merge pull request #11 from justcoded/develop

aprokopenko · web-flow · commit a973d3813481 · 2018-04-18T18:09:47.000+03:00
Fix js to be compatible with adminlte v2.6
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',
