Skip to content

Commit

Permalink
Merge branch 'master' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
andrewbrazzatti committed Oct 23, 2023
2 parents 1942cdd + e40b4cb commit 17fa8b6
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 3 deletions.
1 change: 1 addition & 0 deletions angular-legacy/shared/form/field-vocab.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -376,6 +376,7 @@ export class VocabField extends FieldBase<any> {
that.formModel.clearValidators();
}
that.formModel.updateValueAndValidity();
that.storedEventData = _.clone(that.formModel.value)
}
}
} else {
Expand Down
5 changes: 4 additions & 1 deletion typescript/api/services/RDMPService.ts
Original file line number Diff line number Diff line change
Expand Up @@ -298,7 +298,7 @@ export module Services {
return parseFloat((bytes / Math.pow(k, i)).toFixed(dm)) + ' ' + sizes[i];
}

protected addEmailToList(contributor, emailProperty, emailList) {
protected addEmailToList(contributor, emailProperty, emailList, lowerCaseEmailAddresses:boolean = true) {
let contributorEmailAddress = _.get(contributor, emailProperty, null);
if (!contributorEmailAddress) {
if (!contributor) {
Expand All @@ -312,6 +312,9 @@ export module Services {
}
if (_.isString(contributorEmailAddress)) {
sails.log.verbose(`Pushing contrib email address ${contributorEmailAddress}`);
if(lowerCaseEmailAddresses) {
contributorEmailAddress = contributorEmailAddress.toLowerCase()
}
emailList.push(contributorEmailAddress);
}
}
Expand Down
13 changes: 11 additions & 2 deletions views/default/default/apidocsapib.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -278,8 +278,6 @@ The ReDBox Portal API provides authorized access to manage functions.
- message: Failed to list attachments, please check server logs.




## Record Permission Actions [/<%= branding %>/<%= portal %>/api/records/permissions]

### Give users edit access to record [POST /<%= branding %>/<%= portal %>/api/records/permissions/edit/{oid}]
Expand Down Expand Up @@ -494,6 +492,17 @@ The ReDBox Portal API provides authorized access to manage functions.
+ Response 200 (application/json)
+ Attributes (CreateRecordAuthorization, fixed-type)

## Export Actions [/<%= branding %>/<%= portal %>/api/export]

### Export record data [POST /<%= branding %>/<%= portal %>/api/export/record/download/{format}{?recType,before,after}]
+ Parameters
+ format: `json` (string, required) - The format of the export. Valid values are 'json' or 'csv'
+ recType: `rdmp` (string) - The type of record to export
+ before: `2023-06-30T00:00:00Z` (string) - Show records updated before the date (ISO 8601 format)
+ after: `2022-07-01T00:00:00Z` (string) - Show records updated after the date (ISO 8601 format)

+ Response 200

# Group Search

## Search Actions [/<%= branding %>/<%= portal %>/api/search]
Expand Down

0 comments on commit 17fa8b6

Please sign in to comment.