From bb7988dbe9a329d342592f3858f53f848de943aa Mon Sep 17 00:00:00 2001
From: davidbairdala <david.baird.ala@gmail.com>
Date: Tue, 1 Jul 2014 05:39:56 +0000
Subject: [PATCH] Version 0.7 Fix for ALA Secured filter ignoring anyRole=true

git-svn-id: http://ala.googlecode.com/svn/trunk/ala-web-theme@247 cf76a52e-83f7-1f8e-e3a8-b8364d34af1a
---
 AlaWebThemeGrailsPlugin.groovy                          | 2 +-
 application.properties                                  | 4 ++--
 grails-app/conf/au/org/ala/web/AlaSecuredFilters.groovy | 2 +-
 plugin.xml                                              | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/AlaWebThemeGrailsPlugin.groovy b/AlaWebThemeGrailsPlugin.groovy
index d3bce60..dc088e7 100644
--- a/AlaWebThemeGrailsPlugin.groovy
+++ b/AlaWebThemeGrailsPlugin.groovy
@@ -4,7 +4,7 @@ import grails.util.Holders
 
 class AlaWebThemeGrailsPlugin {
     // the plugin version
-    def version = "0.6"
+    def version = "0.7"
     // the version or versions of Grails the plugin is designed for
     def grailsVersion = "2.1 > *"
     // the other plugins this plugin depends on
diff --git a/application.properties b/application.properties
index 4f7cd97..a9035c1 100644
--- a/application.properties
+++ b/application.properties
@@ -1,5 +1,5 @@
 #Grails Metadata file
-#Wed Feb 26 15:15:56 EST 2014
-app.grails.version=2.3.5
+#Thu May 15 09:16:05 EST 2014
+app.grails.version=2.3.8
 app.name=ala-web-theme
 app.servlet.version=2.5
diff --git a/grails-app/conf/au/org/ala/web/AlaSecuredFilters.groovy b/grails-app/conf/au/org/ala/web/AlaSecuredFilters.groovy
index c1d3e52..9ff96e5 100644
--- a/grails-app/conf/au/org/ala/web/AlaSecuredFilters.groovy
+++ b/grails-app/conf/au/org/ala/web/AlaSecuredFilters.groovy
@@ -43,7 +43,7 @@ class AlaSecuredFilters {
                             error = true
                         } else if (sa.notRoles() && !securityPrimitives.isNotGranted(roles)) {
                             error = true
-                        } else if (!securityPrimitives.isAllGranted(roles)) {
+                        } else if (!sa.anyRole() && !securityPrimitives.isAllGranted(roles)) {
                             error = true
                         }
                     } else {
diff --git a/plugin.xml b/plugin.xml
index 8a08d82..3042cab 100644
--- a/plugin.xml
+++ b/plugin.xml
@@ -1,4 +1,4 @@
-<plugin name='ala-web-theme' version='0.3-SNAPSHOT' grailsVersion='2.1 &gt; *'>
+<plugin name='ala-web-theme' version='0.7' grailsVersion='2.1 &gt; *'>
   <author>Nick dos Remedios</author>
   <authorEmail>nick.dosremedios@csiro.au</authorEmail>
   <title>Ala Web Theme Plugin</title>