Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

kick #417

Merged
merged 1 commit into from
Jan 14, 2025
Merged

kick #417

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion client/wfprev-war/src/main/angular/src/app/utils/messages.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@ export const Messages = {
projectCreatedSuccess: 'Project Created Successfully',
projectCreatedFailure: 'Create project failed',
projectUpdatedSuccess: 'Project Updated Successfully',
projectUpdatedFailure: 'Create Updated failed',
projectUpdatedFailure: 'Project Updated failed',
confirmCancel: 'Are you sure you want to cancel?',
};
7 changes: 6 additions & 1 deletion ...prev-api/src/main/java/ca/bc/gov/nrs/wfprev/data/assemblers/ProjectResourceAssembler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,12 @@ public ProjectEntity updateEntity(ProjectModel model, ProjectEntity existingEnti
entity.setRevisionCount(nonNullOrDefault(model.getRevisionCount(), existingEntity.getRevisionCount()));
entity.setProjectStatusCode(existingEntity.getProjectStatusCode());
entity.setSiteUnitName(nonNullOrDefault(model.getSiteUnitName(), existingEntity.getSiteUnitName()));
entity.setProgramAreaGuid((UUID) nonNullOrDefault(model.getProgramAreaGuid(), existingEntity.getProgramAreaGuid()));
entity.setProgramAreaGuid(
nonNullOrDefault(
model.getProgramAreaGuid() != null ? UUID.fromString(model.getProgramAreaGuid()) : null,
existingEntity.getProgramAreaGuid()
)
);
entity.setForestRegionOrgUnitId(nonNullOrDefault(model.getForestRegionOrgUnitId(), existingEntity.getForestRegionOrgUnitId()));
entity.setForestDistrictOrgUnitId(nonNullOrDefault(model.getForestDistrictOrgUnitId(), existingEntity.getForestDistrictOrgUnitId()));
entity.setFireCentreOrgUnitId(nonNullOrDefault(model.getFireCentreOrgUnitId(), existingEntity.getFireCentreOrgUnitId()));
Expand Down
Loading