From 27c8d4410e48cb21e3a304321dbb9ce5508a7a05 Mon Sep 17 00:00:00 2001
From: j2blake <jeb228@cornell.edu>
Date: Tue, 26 Nov 2013 10:22:37 -0500
Subject: [PATCH] VIVO-530 Fix logic bug in authorization

Required actions from the DataGetters were being ignored.
---
 .../vitro/webapp/controller/freemarker/PageController.java  | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/PageController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/PageController.java
index 785bb031b..a98434bc0 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/PageController.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/PageController.java
@@ -58,10 +58,12 @@ public class PageController extends FreemarkerHttpServlet{
 
             if( pageActs == null && dgActs == null){
                 return Actions.AUTHORIZED;
-            }else if( pageActs == null && dgActs != null ){
+            }else if( pageActs == null ){
                 return dgActs;
+            }else if( dgActs == null ){
+            	return pageActs;
             }else{
-                return pageActs;
+                return pageActs.and(dgActs);
             }                
             
         } catch (Exception e) {