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

Merge remote-tracking branch 'origin/feature/APPS-37_DeclareAndFileAsRecordUI' into feature/APPS-37_DeclareAndFileAsRecordUI

Browse Source
This commit is contained in:
ehardon
2020-06-23 13:49:42 +03:00
parent f92659632e af98f7c4a2
commit 80e40ba804
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/rules/RuleDefinition.java
View File

@@ -41,7 +41,7 @@ public class RuleDefinition
private boolean runInBackground = false;
private String ruleType = ConditionsOnRule.ADDED.getWhenConditionValue();
private String path;
private boolean createRecordPath = false;
private Boolean createRecordPath;
private String contentTitle;
private String contentDescription;
private String rejectReason;
@@ -145,7 +145,7 @@ public class RuleDefinition
return this;
}
public boolean isCreateRecordPath()
public Boolean getCreateRecordPath()
{
return createRecordPath;
}

5
rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/v0/RulesAPI.java
View File

@@ -257,7 +257,10 @@ public class RulesAPI extends BaseAPI
JSONObject parameters = new JSONObject();
if (ruleProperties.getPath() != null)
{
parameters.put("createRecordPath", ruleProperties.isCreateRecordPath());
if(ruleProperties.getCreateRecordPath() != null)
{
parameters.put("createRecordPath", ruleProperties.getCreateRecordPath());
}
parameters.put("path", ruleProperties.getPath());
}
if (ruleProperties.getContentTitle() != null)