Merge branch 'riri' into 'master'

Riri

See merge request !1314

src/container/OprIndicator/OperatingIndicator.js

@@ -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>

src/container/RollingOutlook/OperatingIndicatorRO.js

@@ -2144,7 +2144,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={() => {