Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
pmcneil committed May 6, 2015
2 parents a5f4779 + 3063522 commit 83e34c7
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions ShiroGrailsPlugin.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -467,8 +467,10 @@ Enables Grails applications to take advantage of the Apache Shiro security layer
permString << filter.controllerName << ':' << (filter.actionName ?: "index")

// Add the ID if it's in the web parameters.
if (filter.params.id) permString << ':' << filter.params.id

if (filter.params.id) {
permString << ':' << filter.params.list('id').join(',')
}

isPermitted = subject.isPermitted(permString.toString())
} else {
// Call the closure with the access control builder and
Expand Down

0 comments on commit 83e34c7

Please sign in to comment.