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

RM-796 (Add Scanned Record Metadata results in properties error)

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@53729 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Tuna Aksoy
2013-08-07 15:04:46 +00:00
parent c4553665e2
commit edb1f02fec
2 changed files with 6 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
rm-server/config/alfresco/module/org_alfresco_module_rm/module-context.xml
View File

@@ -113,7 +113,7 @@
<!-- Import workflows --> <!-- Import workflows -->
<import resource="classpath:alfresco/module/org_alfresco_module_rm/rm-workflow-context.xml"/> <import resource="classpath:alfresco/module/org_alfresco_module_rm/rm-workflow-context.xml"/>
<!-- Import record service --> <!-- Import record service -->
<import resource="classpath:alfresco/module/org_alfresco_module_rm/rm-report-context.xml"/> <import resource="classpath:alfresco/module/org_alfresco_module_rm/rm-report-context.xml"/>
@@ -209,7 +209,6 @@
parent="baseRMFormFilter" parent="baseRMFormFilter"
class="org.alfresco.module.org_alfresco_module_rm.forms.RecordsManagementNodeFormFilter"> class="org.alfresco.module.org_alfresco_module_rm.forms.RecordsManagementNodeFormFilter">
<property name="filterRegistry" ref="nodeFilterRegistry" /> <property name="filterRegistry" ref="nodeFilterRegistry" />
<property name="dictionaryService" ref="DictionaryService" />
<property name="dispositionService" ref="dispositionService"/> <property name="dispositionService" ref="dispositionService"/>
<property name="filePlanService" ref="FilePlanService" /> <property name="filePlanService" ref="FilePlanService" />
</bean> </bean>
@@ -242,8 +241,8 @@
<!-- Import the RM webscript's --> <!-- Import the RM webscript's -->
<import resource="classpath:alfresco/module/org_alfresco_module_rm/rm-webscript-context.xml"/> <import resource="classpath:alfresco/module/org_alfresco_module_rm/rm-webscript-context.xml"/>
<!-- Import of installed demos --> <!-- Import of installed demos -->
<import resource="classpath*:alfresco/module/org_alfresco_module_rm/demo/*/demo-context.xml"/> <import resource="classpath*:alfresco/module/org_alfresco_module_rm/demo/*/demo-context.xml"/>
</beans> </beans>

20
rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/forms/RecordsManagementNodeFormFilter.java
View File

@@ -41,7 +41,6 @@ import org.alfresco.repo.forms.processor.node.FieldUtils;
import org.alfresco.repo.forms.processor.node.FormFieldConstants; import org.alfresco.repo.forms.processor.node.FormFieldConstants;
import org.alfresco.repo.security.authentication.AuthenticationUtil; import org.alfresco.repo.security.authentication.AuthenticationUtil;
import org.alfresco.service.cmr.dictionary.DataTypeDefinition; import org.alfresco.service.cmr.dictionary.DataTypeDefinition;
import org.alfresco.service.cmr.dictionary.DictionaryService;
import org.alfresco.service.cmr.dictionary.PropertyDefinition; import org.alfresco.service.cmr.dictionary.PropertyDefinition;
import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.namespace.QName; import org.alfresco.service.namespace.QName;
@@ -67,25 +66,12 @@ public class RecordsManagementNodeFormFilter extends RecordsManagementFormFilter
protected static final String TRANSIENT_CATEGORY_ID = "rmCategoryIdentifier"; protected static final String TRANSIENT_CATEGORY_ID = "rmCategoryIdentifier";
protected static final String TRANSIENT_DISPOSITION_INSTRUCTIONS = "rmDispositionInstructions"; protected static final String TRANSIENT_DISPOSITION_INSTRUCTIONS = "rmDispositionInstructions";
/** Dictionary service */
protected DictionaryService dictionaryService;
/** Disposition service */ /** Disposition service */
protected DispositionService dispositionService; protected DispositionService dispositionService;
/** File Plan Service */ /** File Plan Service */
protected FilePlanService filePlanService; protected FilePlanService filePlanService;
/**
* Sets the data dictionary service
*
* @param dictionaryService The DictionaryService instance
*/
public void setDictionaryService(DictionaryService dictionaryService)
{
this.dictionaryService = dictionaryService;
}
/** /**
* Sets the disposition service * Sets the disposition service
* *
@@ -95,11 +81,11 @@ public class RecordsManagementNodeFormFilter extends RecordsManagementFormFilter
{ {
this.dispositionService = dispositionService; this.dispositionService = dispositionService;
} }
/** /**
* @param filePlanService file plan service * @param filePlanService file plan service
*/ */
public void setFilePlanService(FilePlanService filePlanService) public void setFilePlanService(FilePlanService filePlanService)
{ {
this.filePlanService = filePlanService; this.filePlanService = filePlanService;
} }