inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-07-31 17:39:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

RM-189: Search Results page: "Special Types" information isn't displayed

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.0@38604 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Roy Wetherall
2012-07-02 07:14:45 +00:00
parent 5e96d1d55e
commit 868f91bed4
3 changed files with 8 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
rm-server/build.gradle
View File

@@ -53,6 +53,7 @@ test {
include '**/CustomEMailMappingServiceServiceImplTest.class' include '**/CustomEMailMappingServiceServiceImplTest.class'
include '**/DispositionServiceImplTest.class' include '**/DispositionServiceImplTest.class'
include '**/RecordsManagementActionServiceImplTest.class' include '**/RecordsManagementActionServiceImplTest.class'
include '**/RecordsManagementAdminServiceImplTest.class'
testLogging.showStandardStreams = true testLogging.showStandardStreams = true

6
rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/slingshot/RMSearchGet.java
View File

@@ -28,7 +28,6 @@ import java.util.Map;
import org.alfresco.error.AlfrescoRuntimeException; import org.alfresco.error.AlfrescoRuntimeException;
import org.alfresco.model.ContentModel; import org.alfresco.model.ContentModel;
import org.alfresco.module.org_alfresco_module_rm.model.RecordsManagementModel;
import org.alfresco.module.org_alfresco_module_rm.search.RecordsManagementSearchParameters; import org.alfresco.module.org_alfresco_module_rm.search.RecordsManagementSearchParameters;
import org.alfresco.module.org_alfresco_module_rm.search.RecordsManagementSearchService; import org.alfresco.module.org_alfresco_module_rm.search.RecordsManagementSearchService;
import org.alfresco.module.org_alfresco_module_rm.search.SavedSearchDetailsCompatibility; import org.alfresco.module.org_alfresco_module_rm.search.SavedSearchDetailsCompatibility;
@@ -319,9 +318,8 @@ public class RMSearchGet extends DeclarativeWebScript
for (Map.Entry<QName, Serializable> entry : nodeProperties.entrySet()) for (Map.Entry<QName, Serializable> entry : nodeProperties.entrySet())
{ {
QName qName = entry.getKey().getPrefixedQName(namespaceService); QName qName = entry.getKey().getPrefixedQName(namespaceService);
if (RecordsManagementModel.RM_URI.equals(qName.getNamespaceURI()) == true || if (NamespaceService.SYSTEM_MODEL_1_0_URI.equals(qName.getNamespaceURI()) == false)
RecordsManagementModel.RM_CUSTOM_URI.equals(qName.getNamespaceURI()) == true) {
{
String prefixName = qName.getPrefixString().replace(":", "_"); String prefixName = qName.getPrefixString().replace(":", "_");
Serializable value = entry.getValue(); Serializable value = entry.getValue();
if (value instanceof NodeRef) if (value instanceof NodeRef)

29
rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/RecordsManagementAdminServiceImplTest.java
View File

@@ -50,12 +50,10 @@ import org.alfresco.service.cmr.dictionary.PropertyDefinition;
import org.alfresco.service.cmr.repository.AssociationRef; import org.alfresco.service.cmr.repository.AssociationRef;
import org.alfresco.service.cmr.repository.ChildAssociationRef; import org.alfresco.service.cmr.repository.ChildAssociationRef;
import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.namespace.InvalidQNameException;
import org.alfresco.service.namespace.NamespaceService; import org.alfresco.service.namespace.NamespaceService;
import org.alfresco.service.namespace.QName; import org.alfresco.service.namespace.QName;
import org.alfresco.service.namespace.RegexQNamePattern; import org.alfresco.service.namespace.RegexQNamePattern;
import org.alfresco.util.Pair; import org.alfresco.util.Pair;
import org.antlr.grammar.v3.ANTLRv3Parser.throwsSpec_return;
import org.springframework.util.CollectionUtils; import org.springframework.util.CollectionUtils;
/** /**
@@ -331,7 +329,8 @@ public class RecordsManagementAdminServiceImplTest extends BaseRMTestCase
// Failure: Add a property with the same name twice // Failure: Add a property with the same name twice
doTestInTransaction(new FailureTest doTestInTransaction(new FailureTest
( (
"Can not create a property with the same id twice" "Can not create a property with the same id twice",
CustomMetadataException.class
) )
{ {
@Override @Override
@@ -350,7 +349,8 @@ public class RecordsManagementAdminServiceImplTest extends BaseRMTestCase
// Failure: Try and add a property to a type that isn't customisable // Failure: Try and add a property to a type that isn't customisable
doTestInTransaction(new FailureTest doTestInTransaction(new FailureTest
( (
"Can not add a custom property to a type that isn't registered as customisable" "Can not add a custom property to a type that isn't registered as customisable",
CustomMetadataException.class
) )
{ {
@Override @Override
@@ -364,26 +364,7 @@ public class RecordsManagementAdminServiceImplTest extends BaseRMTestCase
"Title", "Title",
"Description"); "Description");
} }
}); });
// Failure: Add a property with the label twice (but no id specified)
// doTestInTransaction(new FailureTest
// (
// "Can not create a property with the same label twice if no id is specified."
// )
// {
// @Override
// public void run()
// {
// adminService.addCustomPropertyDefinition(
// null,
// ASPECT_RECORD,
// "Label1",
// DataTypeDefinition.TEXT,
// "Title",
// "Description");
// }
// });
} }
/** /**