Reset code back to b03837b751.

rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/capability/RMAfterInvocationProvider.java

@@ -485,6 +485,7 @@ public class RMAfterInvocationProvider extends RMSecurityCommon
                                 returnedObject.getResultSetMetaData().getLimitedBy(),
                                 PermissionEvaluationMode.EAGER,
                                 returnedObject.getResultSetMetaData().getSearchParameters()));
+                filteringResultSet.setNumberFound(returnedObject.getNumberFound());
                 return filteringResultSet;
             }
             else
@@ -498,6 +499,7 @@ public class RMAfterInvocationProvider extends RMSecurityCommon
                                 returnedObject.getResultSetMetaData().getLimitedBy(),
                                 PermissionEvaluationMode.EAGER,
                                 returnedObject.getResultSetMetaData().getSearchParameters()));
+                filteringResultSet.setNumberFound(returnedObject.getNumberFound());
                 return filteringResultSet;
             }
         }

rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/disposition/DispositionScheduleImpl.java

@@ -35,6 +35,7 @@ import java.util.Map;
 import org.alfresco.model.ContentModel;
 import org.alfresco.module.org_alfresco_module_rm.RecordsManagementServiceRegistry;
 import org.alfresco.module.org_alfresco_module_rm.model.RecordsManagementModel;
+import org.alfresco.repo.security.authentication.AuthenticationUtil;
 import org.alfresco.service.cmr.repository.ChildAssociationRef;
 import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.cmr.repository.NodeService;
@@ -51,6 +52,9 @@ public class DispositionScheduleImpl implements DispositionSchedule,
     private NodeService nodeService;
     private RecordsManagementServiceRegistry services;
     private NodeRef dispositionDefinitionNodeRef;
+    /** authentication helper */
+    private AuthenticationUtil authenticationUtil;
+
 
     private List<DispositionActionDefinition> actions;
     private Map<String, DispositionActionDefinition> actionsById;
@@ -62,6 +66,11 @@ public class DispositionScheduleImpl implements DispositionSchedule,
     /** Map of disposition definitions by disposition action name */
     private Map<String, DispositionActionDefinition> actionsByDispositionActionName;
 
+    public void setAuthenticationUtil(AuthenticationUtil authenticationUtil)
+    {
+        this.authenticationUtil = authenticationUtil;
+    }
+    
     public DispositionScheduleImpl(RecordsManagementServiceRegistry services, NodeService nodeService,  NodeRef nodeRef)
     {
         // TODO check that we have a disposition definition node reference
@@ -100,13 +109,18 @@ public class DispositionScheduleImpl implements DispositionSchedule,
      */
     public boolean isRecordLevelDisposition()
     {
-        boolean result = false;
+        return authenticationUtil.runAsSystem(new AuthenticationUtil.RunAsWork<Boolean>()
-        Boolean value = (Boolean)this.nodeService.getProperty(this.dispositionDefinitionNodeRef, PROP_RECORD_LEVEL_DISPOSITION);
-        if (value != null)
         {
-            result = value.booleanValue();
+            public Boolean doWork() throws Exception
-        }            
+            {
-        return result;
+                Boolean value = (Boolean)nodeService.getProperty(dispositionDefinitionNodeRef, PROP_RECORD_LEVEL_DISPOSITION);
+                if (value != null)
+                {
+                    return value.booleanValue();
+                }
+                return null;
+            }
+        });
     }
 
     /**

rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/disposition/DispositionServiceImpl.java

@@ -348,6 +348,9 @@ public class DispositionServiceImpl extends    ServiceBaseImpl
         return ds;
     }
 
+
+
+
     /**
      * This method returns a NodeRef
      * Gets the disposition instructions
@@ -380,7 +383,7 @@ public class DispositionServiceImpl extends    ServiceBaseImpl
                 NodeRef result = getAssociatedDispositionScheduleImpl(parent);
                 if (result == null)
                 {
-                    return getOriginDispositionSchedule(parent);
+                    return null;
                 }
                 return new DispositionScheduleImpl(serviceRegistry, nodeService, result);
             }