Code tidy up

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@84078 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Tuna Aksoy
2014-09-13 19:40:49 +00:00
parent a185d11877
commit 1a7aa49248
3 changed files with 7 additions and 73 deletions

View File

@@ -33,7 +33,6 @@
<ref bean="rmCreateRecordFolderCapability"/>
<ref bean="rmModifyRecordFolderCapability"/>
<ref bean="rmDeleteRecordFolderCapability"/>
<!-- FIXME: Move to separate capability -->
<ref bean="rmCreateUnfiledRecordsContainerFolderCapability"/>
<ref bean="rmModifyUnfiledRecordsContainerFolderCapability"/>
<ref bean="rmDeleteUnfiledRecordsContainerFolderCapability"/>
@@ -43,23 +42,6 @@
<property name="index" value="20" />
</bean>
<!-- FIXME: Will be added as a separate capability
<bean id="rmCreateModifyDestroyUnfiledRecordsContainerFolderCapability"
parent="compositeCapability">
<property name="name" value="CreateModifyDestroyUnfiledRecordsContainer"/>
<property name="permission" value="CreateModifyDestroyFolders"/>
<property name="capabilities">
<list>
<ref bean="rmCreateUnfiledRecordsContainerFolderCapability"/>
<ref bean="rmModifyUnfiledRecordsContainerFolderCapability"/>
<ref bean="rmDeleteUnfiledRecordsContainerFolderCapability"/>
</list>
</property>
<property name="group"><ref bean="folderControlGroup"/></property>
<property name="index" value="30" />
</bean>
-->
<bean id="rmReOpenFoldersCapability"
parent="declarativeCapability">
<property name="name" value="ReOpenFolders"/>

View File

@@ -30,6 +30,7 @@ import java.util.UUID;
import org.alfresco.error.AlfrescoRuntimeException;
import org.alfresco.module.org_alfresco_module_rm.admin.RecordsManagementAdminService;
import org.alfresco.module.org_alfresco_module_rm.caveat.RMListOfValuesConstraint.MatchLogic;
import org.alfresco.module.org_alfresco_module_rm.model.RecordsManagementCustomModel;
import org.alfresco.repo.security.authentication.AuthenticationUtil;
import org.alfresco.repo.security.authentication.AuthenticationUtil.RunAsWork;
import org.alfresco.service.cmr.dictionary.Constraint;
@@ -130,11 +131,14 @@ public class RMCaveatConfigServiceImpl implements RMCaveatConfigService
public RMConstraintInfo addRMConstraint(String listName, String title, String[] values, MatchLogic matchLogic)
{
if(listName == null)
if (listName == null)
{
// Generate a list name
// FIXME: hardcoded namespace
listName = "rmc:" + UUID.randomUUID().toString();
StringBuilder sb = new StringBuilder();
sb.append(RecordsManagementCustomModel.RM_CUSTOM_PREFIX);
sb.append(QName.NAMESPACE_PREFIX);
sb.append(UUID.randomUUID().toString());
listName = sb.toString();
}
List<String>allowedValues = new ArrayList<String>();

View File

@@ -34,58 +34,6 @@ import org.alfresco.module.org_alfresco_module_rm.test.util.BaseRMTestCase;
*/
public class CapabilityServiceImplTest extends BaseRMTestCase
{
public void testGetCapability() throws Exception
{
doTestInTransaction(new Test<Void>()
{
@Override
public Void run() throws Exception
{
// FIXME
return null;
}
});
}
public void testGetCapabilities() throws Exception
{
doTestInTransaction(new Test<Void>()
{
@Override
public Void run() throws Exception
{
// FIXME
return null;
}
});
}
public void testGetCapabilityAccessState() throws Exception
{
doTestInTransaction(new Test<Void>()
{
@Override
public Void run() throws Exception
{
// FIXME
return null;
}
});
}
public void testGetCapabilitiesAccessState() throws Exception
{
doTestInTransaction(new Test<Void>()
{
@Override
public Void run() throws Exception
{
// FIXME
return null;
}
});
}
public void testGetAddRemoveGroups() throws Exception
{
doTestInTransaction(new Test<Void>()