Merge pull request #160 from ramzan/hide-birthday-collection
Hide birthday collection when creating new eventsmaster
commit
9e0b1efda9
|
@ -60,13 +60,19 @@ const itemsSelector = createSelector(
|
|||
|
||||
if (collectionInfo.type === "ADDRESS_BOOK") {
|
||||
addressBookItems = syncEntriesToItemMap(collectionInfo, syncEntries, addressBookItems);
|
||||
collectionsAddressBook.push(collectionInfo);
|
||||
if (!syncJournal.journal.readOnly) {
|
||||
collectionsAddressBook.push(collectionInfo);
|
||||
}
|
||||
} else if (collectionInfo.type === "CALENDAR") {
|
||||
calendarItems = syncEntriesToEventItemMap(collectionInfo, syncEntries, calendarItems);
|
||||
collectionsCalendar.push(collectionInfo);
|
||||
if (!syncJournal.journal.readOnly) {
|
||||
collectionsCalendar.push(collectionInfo);
|
||||
}
|
||||
} else if (collectionInfo.type === "TASKS") {
|
||||
taskListItems = syncEntriesToTaskItemMap(collectionInfo, syncEntries, taskListItems);
|
||||
collectionsTaskList.push(collectionInfo);
|
||||
if (!syncJournal.journal.readOnly) {
|
||||
collectionsTaskList.push(collectionInfo);
|
||||
}
|
||||
}
|
||||
}
|
||||
);
|
||||
|
|
|
@ -300,7 +300,7 @@ class EventEdit extends React.PureComponent<PropsType> {
|
|||
<Select
|
||||
name="journalUid"
|
||||
value={this.state.journalUid}
|
||||
disabled={this.props.item !== undefined}
|
||||
disabled={this.props.item !== undefined && !this.props.duplicate}
|
||||
onChange={this.handleInputChange}
|
||||
>
|
||||
{this.props.collections.map((x) => (
|
||||
|
|
Loading…
Reference in New Issue