Merge pull request #1014 from metasfresh/dev-942

display included view when should be displayed #942
metasfresh · Jul 13, 2017 · 65f5b07 · 65f5b07
2 parents c0e7523 + 98d9144
commit 65f5b07
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/components/app/DocumentList.js b/src/components/app/DocumentList.js
@@ -582,6 +582,7 @@ class DocumentList extends Component {
                                 queryLimitHit={data.queryLimitHit}
                                 doesSelectionExist={this.doesSelectionExist}
                                 showIncludedViewOnSelect={this.showIncludedViewOnSelect}
+                                supportIncludedViewOnSelect={layout.supportIncludedViewOnSelect}
                                 {...{isIncluded, disconnectFromState, autofocus,
                                     open, page, closeOverlays, inBackground,
                                     disablePaginationShortcuts, isModal,

diff --git a/src/components/table/Table.js b/src/components/table/Table.js
@@ -686,7 +686,7 @@ class Table extends Component {
         const {
             tabid, cols, type, docId, readonly, keyProperty, onDoubleClick,
             mainTable, newRow, tabIndex, entity, indentSupported, collapsible,
-            showIncludedViewOnSelect
+            showIncludedViewOnSelect, supportIncludedViewOnSelect
         } = this.props;
 
         const {
@@ -716,7 +716,7 @@ class Table extends Component {
                         }
                         onMouseDown={(e) => {
                             this.handleClick(e, item[keyProperty]);
-                            showIncludedViewOnSelect(item.supportIncludedViews, item.includedView)
+                            supportIncludedViewOnSelect && showIncludedViewOnSelect(item.supportIncludedViews, item.includedView)
                         }
                         }
                         handleRightClick={(e, fieldName) =>