Skip to content
This repository has been archived by the owner on Dec 13, 2020. It is now read-only.

Commit

Permalink
Merge pull request #698 from metasfresh/dev-697
Browse files Browse the repository at this point in the history
#697 Cancel button, when isNewDoc
  • Loading branch information
damianprzygodzki committed Apr 28, 2017
2 parents 36543fa + 44af991 commit 1255d3e
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 2 deletions.
13 changes: 12 additions & 1 deletion src/components/app/Modal.js
Original file line number Diff line number Diff line change
Expand Up @@ -259,7 +259,7 @@ class Modal extends Component {
} = this.props;

const {
scrolled, pending
scrolled, pending, isNewDoc
} = this.state;

return(
Expand All @@ -277,6 +277,17 @@ class Modal extends Component {
{modalTitle ? modalTitle : layout.caption}
</span>
<div className="items-row-2">
{isNewDoc && <button
className={
`btn btn-meta-outline-secondary
btn-distance-3 btn-md `+
(pending ? 'tag-disabled disabled ' : '')
}
onClick={this.removeModal}
tabIndex={0}
>
Cancel
</button>}
<button
className={
`btn btn-meta-outline-secondary
Expand Down
2 changes: 1 addition & 1 deletion src/components/table/TableItem.js
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ class TableItem extends Component {
e.stopPropagation();
handleSelect(this.nestedSelect(elem).concat([id]));
}

getIconClassName = (huType) => {
switch(huType){
case 'LU':
Expand Down

0 comments on commit 1255d3e

Please sign in to comment.