Commit 4045cb45 authored by Riri Novita's avatar Riri Novita

Merge branch 'riri' into 'master'

fix

See merge request !1307
parents b7678fc7 3d235673
......@@ -508,10 +508,10 @@ export default class OperatingIndicator extends Component {
borderColor: 'transparent'
}}
onClick={() =>
// tableMeta.rowData[4] ?
tableMeta.rowData[4] ?
this.clickDetail(tableMeta.rowData, tableMeta.rowData[1], tableMeta.rowData[3], tableMeta.rowData[2])
// :
// null
:
null
}
>
<Typography style={{ color: tableMeta.rowData[4] ? '#5198ea' : 'GrayText', fontSize: 12, }}>Detail</Typography>
......
......@@ -2137,7 +2137,7 @@ export default class OperatingIndicatorRO extends Component {
</button>
</div>
{!this.state.emptyData && (this.props.permission.create || this.props.permission.edit) && <div className="col-2" style={{ display: 'flex', justifyContent: 'flex-end', maxWidth: '100%', paddingRight: 2 }}>
{this.state.get_for == 'view' &&
{this.state.get_for == 'view' && this.state.viewOnly &&
<button
type="button"
onClick={() => {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment