Skip to content

Commit

Permalink
Merge pull request #1440 from culturecreates/develop
Browse files Browse the repository at this point in the history
Develop
  • Loading branch information
sahalali authored Nov 11, 2024
2 parents ab24835 + 66127f1 commit 3bfaf5c
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 7 deletions.
6 changes: 1 addition & 5 deletions src/pages/Dashboard/AddEvent/AddEvent.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -1248,11 +1248,7 @@ function AddEvent() {
};

const roleCheckHandler = () => {
if (
calendar[0]?.role === userRoles.EDITOR ||
calendar[0]?.role === userRoles.ADMIN ||
calendar[0]?.role === userRoles.CONTRIBUTOR
)
if ([userRoles.ADMIN, userRoles.CONTRIBUTOR, userRoles.EDITOR].includes(calendar[0]?.role) || user.isSuperAdmin)
return (
<>
<Form.Item>
Expand Down
7 changes: 5 additions & 2 deletions src/pages/Dashboard/CreateNewPlace/CreateNewPlace.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -498,7 +498,10 @@ function CreateNewPlace() {
];
}
if (values?.containedInPlace || values?.containedInPlace?.length > 0) {
if (containedInPlace?.source === sourceOptions.CMS)
if (
containedInPlace?.source === sourceOptions.CMS ||
containedInPlace?.source === externalSourceOptions.FOOTLIGHT
)
containedInPlaceObj = {
entityId: values?.containedInPlace,
};
Expand All @@ -510,7 +513,7 @@ function CreateNewPlace() {

if (values?.containsPlace) {
containsPlace = values?.containsPlace?.map((place) => {
if (place?.source === sourceOptions.CMS)
if (place?.source === sourceOptions.CMS || place?.source === externalSourceOptions.FOOTLIGHT)
return {
entityId: place?.value,
};
Expand Down

0 comments on commit 3bfaf5c

Please sign in to comment.