Skip to content

Commit

Permalink
Merge branch 'feature/PB-28679-fix-password-expiry-settings-entity' i…
Browse files Browse the repository at this point in the history
…nto 'feature/PB-28018_EPIC---Password-expiry'

PB-28679: fix createFromDefault method for the CE version of the PasswordExpirySettingsEntity

See merge request passbolt/passbolt-styleguide!1425
  • Loading branch information
Gamabunta57 committed Dec 1, 2023
2 parents 02bd24b + 55c285d commit 682fe95
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 7 deletions.
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "passbolt-styleguide",
"version": "4.5.0-alpha.1",
"version": "4.5.0-alpha.2",
"license": "AGPL-3.0",
"copyright": "Copyright 2023 Passbolt SA",
"description": "Passbolt styleguide contains common styling assets used by the different sites, plugin, etc.",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -111,10 +111,6 @@ class PasswordExpirySettingsEntity extends Entity {
};

const dto = {...defaultData, ...data};
for (const key in dto) {
dto[key] ??= defaultData[key];
}

return new PasswordExpirySettingsEntity(dto);
}
}
Expand Down

0 comments on commit 682fe95

Please sign in to comment.