senaduka/old-psihologija
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add door unlock lock time column in incidents table #65

Merged
bilal.catic merged 3 commits from add-door-unlock-lock-time-column-in-incidents-table into master 2019-11-20 13:50:58 +01:00
Conversation 2 Commits 3 Files Changed 8 +60 -56
1 changed files with 60 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit eff96f9e5e - Show all commits

10
client/src/scenes/RoomOfficeNameMapping/components/SingleMapping.js
View File

@@ -76,9 +76,10 @@ class SingleMapping extends Component {
}; };
render() { render() {
const { singleMapping: { officeSlug, resourceSlug } } = this.props; try {
const { officeId, resourceId, officeOptions, allResourceOptions, pendingMappings } = this.props; const {singleMapping: {officeSlug, resourceSlug}} = this.props;
const { showDeletePrompt, newOfficeId, newResourceId } = this.state; const {officeId, resourceId, officeOptions, allResourceOptions, pendingMappings} = this.props;
const {showDeletePrompt, newOfficeId, newResourceId} = this.state;
const selectedOfficeId = newOfficeId ? newOfficeId : officeId; const selectedOfficeId = newOfficeId ? newOfficeId : officeId;
const selectedResourceId = newResourceId ? newResourceId : resourceId; const selectedResourceId = newResourceId ? newResourceId : resourceId;
@@ -137,6 +138,9 @@ class SingleMapping extends Component {
</Table.Cell> </Table.Cell>
</Table.Row> </Table.Row>
); );
}catch (e) {
return null;
}
} }
} }