From 064daa2d2ecbb92d7d4ef058315c989e54c1aa87 Mon Sep 17 00:00:00 2001 From: Luke Towers Date: Thu, 3 Jan 2019 16:26:30 -0600 Subject: [PATCH] Compiled assets, minor docblock update --- modules/backend/classes/AuthManager.php | 1 + modules/system/assets/ui/storm-min.js | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/modules/backend/classes/AuthManager.php b/modules/backend/classes/AuthManager.php index c56dc6356..8423aa38f 100644 --- a/modules/backend/classes/AuthManager.php +++ b/modules/backend/classes/AuthManager.php @@ -165,6 +165,7 @@ class AuthManager extends RainAuthManager /** * Returns an array of registered permissions belonging to a given role code * @param string $role + * @param bool $includeOrphans * @return array */ public function listPermissionsForRole($role, $includeOrphans = true) diff --git a/modules/system/assets/ui/storm-min.js b/modules/system/assets/ui/storm-min.js index 04a3ff81b..5a72acf96 100644 --- a/modules/system/assets/ui/storm-min.js +++ b/modules/system/assets/ui/storm-min.js @@ -4253,7 +4253,11 @@ this.triggerCondition=this.options.triggerCondition if(this.options.triggerCondition.indexOf('value')==0){var match=this.options.triggerCondition.match(/[^[\]]+(?=])/g) this.triggerCondition='value' this.triggerConditionValue=(match)?match:[""]} -this.triggerParent=this.options.triggerClosestParent!==undefined?$el.closest(this.options.triggerClosestParent):undefined +this.triggerParent=undefined +if(this.options.triggerClosestParent!==undefined){var closestParentElements=this.options.triggerClosestParent.split(',') +for(var i=0;i