diff --git a/config/alfresco/import-export-context.xml b/config/alfresco/import-export-context.xml index 6f7c13f623..9d25ca4878 100644 --- a/config/alfresco/import-export-context.xml +++ b/config/alfresco/import-export-context.xml @@ -589,6 +589,11 @@ /app:company_home/app:dictionary/app:transfers/app:transfer_groups/cm:default/rule:ruleFolder alfresco/bootstrap/transferTargetRule.xml + + + /${spaces.company_home.childname}/${spaces.dictionary.childname} + alfresco/bootstrap/scheduledActionsFolder.xml + diff --git a/config/alfresco/messages/patch-service.properties b/config/alfresco/messages/patch-service.properties index 6584093537..3dda18682c 100644 --- a/config/alfresco/messages/patch-service.properties +++ b/config/alfresco/messages/patch-service.properties @@ -365,3 +365,5 @@ patch.migrateAttrDelete.result=Old attributes were deleted (if any) patch.transfer.targetrulefolder.description=Creates the transfer target rule folder for the default transfer group. patch.transfer.targetrule.description=Creates the transfer target rule for the default transfer group. + +patch.actions.scheduledfolder.description=Creates the scheduled actions folder in the Data Dictionary. diff --git a/config/alfresco/patch/patch-services-context.xml b/config/alfresco/patch/patch-services-context.xml index 58972dcabd..597ac318e8 100644 --- a/config/alfresco/patch/patch-services-context.xml +++ b/config/alfresco/patch/patch-services-context.xml @@ -2409,4 +2409,25 @@ + + patch.actions.scheduledfolder + patch.actions.scheduledfolder.description + 0 + 4109 + 4110 + + + + + + /app:company_home/app:dictionary/cm:Scheduled_x0020_Actions + + + + /app:company_home/app:dictionary + alfresco/bootstrap/scheduledActionsFolder.xml + + + + diff --git a/config/alfresco/version.properties b/config/alfresco/version.properties index 743b5f6ffe..e9074da673 100644 --- a/config/alfresco/version.properties +++ b/config/alfresco/version.properties @@ -19,4 +19,4 @@ version.build=@build-number@ # Schema number -version.schema=4109 +version.schema=4110 diff --git a/source/java/org/alfresco/repo/action/actionModel.xml b/source/java/org/alfresco/repo/action/actionModel.xml index 84c1805525..7dfd586b15 100644 --- a/source/java/org/alfresco/repo/action/actionModel.xml +++ b/source/java/org/alfresco/repo/action/actionModel.xml @@ -215,9 +215,50 @@ + + Persistent Action Schedule + cm:cmobject + + + d:datetime + true + + + d:int + true + + + d:text + true + + + true + + + M + W + D + h + m + + + + + + + + + + act:action + true + false + + + + + -