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

Merged BRANCHES/V2.3 to HEAD:

Browse Source 
97294: RM-983 (Incorrect path to unfiled records is shown on details page or manage rules form)
   97368: RM-1954 (Problems with roles that consist of non-Latin symbols)
   97376: RM-1957 ("New Folder" button is disabled inside unfiled folder)

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@97431 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Tuna Aksoy
2015-02-18 22:54:00 +00:00
parent c7b2e8491a b4cfc739fb
commit 04c0258942
3 changed files with 27 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
rm-server/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-fileplan-context.xml
View File

@@ -71,12 +71,20 @@
</bean> </bean>
<bean id="rmCreateModifyDestroyUnfiledRecordContainerCapability" <bean id="rmCreateModifyDestroyUnfiledRecordContainerCapability"
parent="declarativeCapability"> parent="compositeCapability">
<property name="name" value="CreateModifyDestroyUnfiledRecordContainer"/> <property name="name" value="CreateModifyDestroyUnfiledRecordContainer"/>
<property name="private" value="true"/> <property name="private" value="true"/>
<property name="kinds"> <property name="kinds">
<list> <list>
<value>UNFILED_RECORD_CONTAINER</value> <value>UNFILED_RECORD_CONTAINER</value>
<value>UNFILED_RECORD_FOLDER</value>
</list>
</property>
<property name="capabilities">
<list>
<ref bean="rmCreateUnfiledRecordsContainerFolderCapability"/>
<ref bean="rmModifyUnfiledRecordsContainerFolderCapability"/>
<ref bean="rmDeleteUnfiledRecordsContainerFolderCapability"/>
</list> </list>
</property> </property>
<property name="conditions"> <property name="conditions">

3
rm-server/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-recordfolder-context.xml
View File

@@ -33,9 +33,6 @@
<ref bean="rmCreateRecordFolderCapability"/> <ref bean="rmCreateRecordFolderCapability"/>
<ref bean="rmModifyRecordFolderCapability"/> <ref bean="rmModifyRecordFolderCapability"/>
<ref bean="rmDeleteRecordFolderCapability"/> <ref bean="rmDeleteRecordFolderCapability"/>
<ref bean="rmCreateUnfiledRecordsContainerFolderCapability"/>
<ref bean="rmModifyUnfiledRecordsContainerFolderCapability"/>
<ref bean="rmDeleteUnfiledRecordsContainerFolderCapability"/>
</list> </list>
</property> </property>
<property name="group"><ref bean="folderControlGroup"/></property> <property name="group"><ref bean="folderControlGroup"/></property>

19
rm-server/config/alfresco/module/org_alfresco_module_rm/rm-ui-evaluators-context.xml
View File

@@ -633,11 +633,21 @@
<property name="kinds"> <property name="kinds">
<set> <set>
<value>RECORD_CATEGORY</value> <value>RECORD_CATEGORY</value>
</set>
</property>
<property name="capability" value ="CreateModifyDestroyFolders"/>
</bean>
<bean id="jsonConversionComponent.newUnfiledRecordsFolder"
parent="jsonConversionComponent.baseAction">
<property name="name" value="newUnfiledRecordsFolder"/>
<property name="kinds">
<set>
<value>UNFILED_RECORD_CONTAINER</value> <value>UNFILED_RECORD_CONTAINER</value>
<value>UNFILED_RECORD_FOLDER</value> <value>UNFILED_RECORD_FOLDER</value>
</set> </set>
</property> </property>
<property name="capability" value ="CreateModifyDestroyFolders"/> <property name="capability" value ="CreateModifyDestroyUnfiledRecordContainer"/>
</bean> </bean>
<bean id="jsonConversionComponent.import" <bean id="jsonConversionComponent.import"
@@ -657,6 +667,13 @@
parent="jsonConversionComponent.baseAction"> parent="jsonConversionComponent.baseAction">
<property name="name" value="export"/> <property name="name" value="export"/>
<property name="capability" value="ViewRecords"/> <property name="capability" value="ViewRecords"/>
<property name="kinds">
<set>
<value>FILE_PLAN</value>
<value>RECORD_CATEGORY</value>
<value>RECORD_FOLDER</value>
</set>
</property>
</bean> </bean>
<bean id="jsonConversionComponent.downloadZip" <bean id="jsonConversionComponent.downloadZip"